RUN: /usr/share/launchpad-buildd/slavebin/slave-prep ['slave-prep'] Forking launchpad-buildd slave process... Kernel version: Linux bos01-arm64-042 4.4.0-66-generic #87+buildd1-Ubuntu SMP Thu Mar 9 01:49:33 UTC 2017 aarch64 Buildd toolchain package versions: launchpad-buildd_142 python-lpbuildd_142 sbuild_0.67.0-2ubuntu7 bzr-builder_0.7.3+bzr174~ppa13~ubuntu14.10.1 bzr_2.7.0-2ubuntu3 git-build-recipe_0.3.4~git201611291343.dcee459~ubuntu16.04.1 git_1:2.7.4-0ubuntu1 dpkg-dev_1.18.4ubuntu1.1 python-debian_0.1.27ubuntu2 qemu-user-static_1:2.5+dfsg-5ubuntu10.9. Syncing the system clock with the buildd NTP service... 22 Mar 20:02:28 ntpdate[1955]: adjust time server 10.211.37.1 offset 0.019009 sec RUN: /usr/share/launchpad-buildd/slavebin/unpack-chroot ['unpack-chroot', 'PACKAGEBUILD-12321260', '/home/buildd/filecache-default/76dc409df973c3787fa3d97bbe6fa0d7ccf4bcab'] Unpacking chroot for build PACKAGEBUILD-12321260 RUN: /usr/share/launchpad-buildd/slavebin/mount-chroot ['mount-chroot', 'PACKAGEBUILD-12321260'] Mounting chroot for build PACKAGEBUILD-12321260 RUN: /usr/share/launchpad-buildd/slavebin/override-sources-list ['override-sources-list', 'PACKAGEBUILD-12321260', 'deb http://ppa.launchpad.net/ubuntu-security-proposed/ppa/ubuntu trusty main', 'deb http://ftpmaster.internal/ubuntu trusty main', 'deb http://ftpmaster.internal/ubuntu trusty-security main'] Overriding sources.list in build-PACKAGEBUILD-12321260 RUN: /usr/share/launchpad-buildd/slavebin/update-debian-chroot ['update-debian-chroot', 'PACKAGEBUILD-12321260', 'arm64'] Updating debian chroot for build PACKAGEBUILD-12321260 Ign http://ftpmaster.internal trusty InRelease Get:1 http://ppa.launchpad.net trusty InRelease [20.9 kB] Ign http://ppa.launchpad.net trusty InRelease Get:2 http://ftpmaster.internal trusty-security InRelease [65.9 kB] Get:3 http://ftpmaster.internal trusty Release.gpg [933 B] Get:4 http://ppa.launchpad.net trusty/main arm64 Packages [3371 B] Get:5 http://ppa.launchpad.net trusty/main Translation-en [3307 B] Get:6 http://ftpmaster.internal trusty-security/main arm64 Packages [420 kB] Get:7 http://ftpmaster.internal trusty-security/main Translation-en [325 kB] Get:8 http://ftpmaster.internal trusty Release [58.5 kB] Get:9 http://ftpmaster.internal trusty/main arm64 Packages [1251 kB] Get:10 http://ftpmaster.internal trusty/main Translation-en [762 kB] Fetched 2911 kB in 3s (750 kB/s) Reading package lists... W: GPG error: http://ppa.launchpad.net trusty InRelease: The following signatures couldn't be verified because the public key is not available: NO_PUBKEY ADCE2AF3A4E0014F Reading package lists... Building dependency tree... Reading state information... The following NEW packages will be installed: libitm1 The following packages will be upgraded: apt apt-transport-https bash binutils ca-certificates coreutils cpio cpp-4.8 dpkg dpkg-dev e2fslibs e2fsprogs g++-4.8 gcc-4.8 gcc-4.8-base gnupg gpgv libapt-pkg4.12 libatomic1 libc-bin libc-dev-bin libc6 libc6-dev libcgmanager0 libcomerr2 libcurl3-gnutls libdbus-1-3 libdpkg-perl libdrm2 libgcc-4.8-dev libgcrypt11 libgnutls26 libgomp1 libgssapi-krb5-2 libidn11 libjson-c2 libjson0 libk5crypto3 libkrb5-3 libkrb5support0 libldap-2.4-2 libpam-modules libpam-modules-bin libpam-runtime libpam0g libpcre3 libpng12-0 libsqlite3-0 libss2 libssl1.0.0 libstdc++-4.8-dev libstdc++6 libtasn1-6 linux-libc-dev login multiarch-support openssl optipng passwd patch perl perl-base perl-modules pkg-create-dbgsym tar tzdata 66 upgraded, 1 newly installed, 0 to remove and 0 not upgraded. Need to get 46.7 MB of archives. After this operation, 6365 kB of additional disk space will be used. WARNING: The following packages cannot be authenticated! login passwd Authentication warning overridden. Get:1 http://ftpmaster.internal/ubuntu/ trusty-security/main bash arm64 4.3-7ubuntu1.5 [510 kB] Get:2 http://ppa.launchpad.net/ubuntu-security-proposed/ppa/ubuntu/ trusty/main login arm64 1:4.1.5.1-1ubuntu9.3 [299 kB] Get:3 http://ppa.launchpad.net/ubuntu-security-proposed/ppa/ubuntu/ trusty/main passwd arm64 1:4.1.5.1-1ubuntu9.3 [727 kB] Get:4 http://ftpmaster.internal/ubuntu/ trusty-security/main coreutils arm64 8.21-1ubuntu5.1 [985 kB] Get:5 http://ftpmaster.internal/ubuntu/ trusty-security/main dpkg arm64 1.17.5ubuntu5.6 [1916 kB] Get:6 http://ftpmaster.internal/ubuntu/ trusty-security/main libc6-dev arm64 2.19-0ubuntu6.11 [1688 kB] Get:7 http://ftpmaster.internal/ubuntu/ trusty-security/main libc-dev-bin arm64 2.19-0ubuntu6.11 [60.5 kB] Get:8 http://ftpmaster.internal/ubuntu/ trusty-security/main linux-libc-dev arm64 3.13.0-112.159 [746 kB] Get:9 http://ftpmaster.internal/ubuntu/ trusty-security/main libc-bin arm64 2.19-0ubuntu6.11 [1052 kB] Get:10 http://ftpmaster.internal/ubuntu/ trusty-security/main libc6 arm64 2.19-0ubuntu6.11 [4072 kB] Get:11 http://ftpmaster.internal/ubuntu/ trusty-security/main e2fslibs arm64 1.42.9-3ubuntu1.2 [162 kB] Get:12 http://ftpmaster.internal/ubuntu/ trusty-security/main e2fsprogs arm64 1.42.9-3ubuntu1.2 [642 kB] Get:13 http://ftpmaster.internal/ubuntu/ trusty-security/main perl arm64 5.18.2-2ubuntu1.1 [2240 kB] Get:14 http://ftpmaster.internal/ubuntu/ trusty-security/main perl-base arm64 5.18.2-2ubuntu1.1 [1013 kB] Get:15 http://ftpmaster.internal/ubuntu/ trusty-security/main perl-modules all 5.18.2-2ubuntu1.1 [2673 kB] Get:16 http://ftpmaster.internal/ubuntu/ trusty-security/main tar arm64 1.27.1-1ubuntu0.1 [172 kB] Get:17 http://ftpmaster.internal/ubuntu/ trusty-security/main libgomp1 arm64 4.8.4-2ubuntu1~14.04.3 [19.3 kB] Get:18 http://ftpmaster.internal/ubuntu/ trusty-security/main libitm1 arm64 4.8.4-2ubuntu1~14.04.3 [24.8 kB] Get:19 http://ftpmaster.internal/ubuntu/ trusty-security/main libatomic1 arm64 4.8.4-2ubuntu1~14.04.3 [6278 B] Get:20 http://ftpmaster.internal/ubuntu/ trusty-security/main g++-4.8 arm64 4.8.4-2ubuntu1~14.04.3 [10.1 MB] Get:21 http://ftpmaster.internal/ubuntu/ trusty-security/main gcc-4.8 arm64 4.8.4-2ubuntu1~14.04.3 [4099 kB] Get:22 http://ftpmaster.internal/ubuntu/ trusty-security/main cpp-4.8 arm64 4.8.4-2ubuntu1~14.04.3 [3607 kB] Get:23 http://ftpmaster.internal/ubuntu/ trusty-security/main binutils arm64 2.24-5ubuntu14.1 [1047 kB] Get:24 http://ftpmaster.internal/ubuntu/ trusty-security/main libstdc++-4.8-dev arm64 4.8.4-2ubuntu1~14.04.3 [1055 kB] Get:25 http://ftpmaster.internal/ubuntu/ trusty-security/main libgcc-4.8-dev arm64 4.8.4-2ubuntu1~14.04.3 [162 kB] Get:26 http://ftpmaster.internal/ubuntu/ trusty-security/main gcc-4.8-base arm64 4.8.4-2ubuntu1~14.04.3 [16.4 kB] Get:27 http://ftpmaster.internal/ubuntu/ trusty-security/main libstdc++6 arm64 4.8.4-2ubuntu1~14.04.3 [241 kB] Get:28 http://ftpmaster.internal/ubuntu/ trusty-security/main libapt-pkg4.12 arm64 1.0.1ubuntu2.17 [588 kB] Get:29 http://ftpmaster.internal/ubuntu/ trusty-security/main gpgv arm64 1.4.16-1ubuntu2.4 [137 kB] Get:30 http://ftpmaster.internal/ubuntu/ trusty-security/main gnupg arm64 1.4.16-1ubuntu2.4 [554 kB] Get:31 http://ftpmaster.internal/ubuntu/ trusty-security/main apt arm64 1.0.1ubuntu2.17 [948 kB] Get:32 http://ftpmaster.internal/ubuntu/ trusty-security/main libcomerr2 arm64 1.42.9-3ubuntu1.2 [62.2 kB] Get:33 http://ftpmaster.internal/ubuntu/ trusty-security/main libpam0g arm64 1.1.8-1ubuntu2.2 [50.8 kB] Get:34 http://ftpmaster.internal/ubuntu/ trusty-security/main libpam-modules-bin arm64 1.1.8-1ubuntu2.2 [28.7 kB] Get:35 http://ftpmaster.internal/ubuntu/ trusty-security/main libpam-modules arm64 1.1.8-1ubuntu2.2 [214 kB] Get:36 http://ftpmaster.internal/ubuntu/ trusty-security/main libpcre3 arm64 1:8.31-2ubuntu2.2 [134 kB] Get:37 http://ftpmaster.internal/ubuntu/ trusty-security/main libss2 arm64 1.42.9-3ubuntu1.2 [65.7 kB] Get:38 http://ftpmaster.internal/ubuntu/ trusty-security/main libgcrypt11 arm64 1.5.3-2ubuntu4.4 [221 kB] Get:39 http://ftpmaster.internal/ubuntu/ trusty-security/main libtasn1-6 arm64 3.4-3ubuntu0.4 [37.8 kB] Get:40 http://ftpmaster.internal/ubuntu/ trusty-security/main libgnutls26 arm64 2.12.23-12ubuntu2.7 [330 kB] Get:41 http://ftpmaster.internal/ubuntu/ trusty-security/main libsqlite3-0 arm64 3.8.2-1ubuntu2.1 [286 kB] Get:42 http://ftpmaster.internal/ubuntu/ trusty-security/main libssl1.0.0 arm64 1.0.1f-1ubuntu2.22 [663 kB] Get:43 http://ftpmaster.internal/ubuntu/ trusty-security/main libdbus-1-3 arm64 1.6.18-0ubuntu4.4 [108 kB] Get:44 http://ftpmaster.internal/ubuntu/ trusty-security/main libdrm2 arm64 2.4.56-1~ubuntu2 [19.3 kB] Get:45 http://ftpmaster.internal/ubuntu/ trusty-security/main libjson-c2 arm64 0.11-3ubuntu1.2 [19.6 kB] Get:46 http://ftpmaster.internal/ubuntu/ trusty-security/main libpng12-0 arm64 1.2.50-1ubuntu2.14.04.2 [106 kB] Get:47 http://ftpmaster.internal/ubuntu/ trusty-security/main libk5crypto3 arm64 1.12+dfsg-2ubuntu5.2 [73.3 kB] Get:48 http://ftpmaster.internal/ubuntu/ trusty-security/main libgssapi-krb5-2 arm64 1.12+dfsg-2ubuntu5.2 [92.9 kB] Get:49 http://ftpmaster.internal/ubuntu/ trusty-security/main libkrb5-3 arm64 1.12+dfsg-2ubuntu5.2 [216 kB] Get:50 http://ftpmaster.internal/ubuntu/ trusty-security/main libkrb5support0 arm64 1.12+dfsg-2ubuntu5.2 [27.5 kB] Get:51 http://ftpmaster.internal/ubuntu/ trusty-security/main libidn11 arm64 1.28-1ubuntu2.1 [90.9 kB] Get:52 http://ftpmaster.internal/ubuntu/ trusty-security/main libldap-2.4-2 arm64 2.4.31-1+nmu2ubuntu8.2 [126 kB] Get:53 http://ftpmaster.internal/ubuntu/ trusty-security/main libcurl3-gnutls arm64 7.35.0-1ubuntu2.10 [136 kB] Get:54 http://ftpmaster.internal/ubuntu/ trusty-security/main libpam-runtime all 1.1.8-1ubuntu2.2 [37.8 kB] Get:55 http://ftpmaster.internal/ubuntu/ trusty-security/main multiarch-support arm64 2.19-0ubuntu6.11 [4484 B] Get:56 http://ftpmaster.internal/ubuntu/ trusty-security/main tzdata all 2016j-0ubuntu0.14.04 [166 kB] Get:57 http://ftpmaster.internal/ubuntu/ trusty-security/main cpio arm64 2.11+dfsg-1ubuntu1.2 [62.8 kB] Get:58 http://ftpmaster.internal/ubuntu/ trusty-security/main libcgmanager0 arm64 0.24-0ubuntu7.1 [23.1 kB] Get:59 http://ftpmaster.internal/ubuntu/ trusty-security/main libjson0 arm64 0.11-3ubuntu1.2 [1078 B] Get:60 http://ftpmaster.internal/ubuntu/ trusty-security/main apt-transport-https arm64 1.0.1ubuntu2.17 [24.7 kB] Get:61 http://ftpmaster.internal/ubuntu/ trusty-security/main openssl arm64 1.0.1f-1ubuntu2.22 [477 kB] Get:62 http://ftpmaster.internal/ubuntu/ trusty-security/main ca-certificates all 20160104ubuntu0.14.04.1 [190 kB] Get:63 http://ftpmaster.internal/ubuntu/ trusty-security/main dpkg-dev all 1.17.5ubuntu5.6 [726 kB] Get:64 http://ftpmaster.internal/ubuntu/ trusty-security/main libdpkg-perl all 1.17.5ubuntu5.6 [179 kB] Get:65 http://ftpmaster.internal/ubuntu/ trusty-security/main patch arm64 2.7.1-4ubuntu2.3 [77.5 kB] Get:66 http://ftpmaster.internal/ubuntu/ trusty-security/main optipng arm64 0.6.4-1ubuntu0.14.04.1 [75.4 kB] Get:67 http://ftpmaster.internal/ubuntu/ trusty-security/main pkg-create-dbgsym all 0.67~trusty [8844 B] debconf: delaying package configuration, since apt-utils is not installed Fetched 46.7 MB in 5s (8608 kB/s) (Reading database ... 11723 files and directories currently installed.) Preparing to unpack .../bash_4.3-7ubuntu1.5_arm64.deb ... Unpacking bash (4.3-7ubuntu1.5) over (4.3-6ubuntu1) ... Setting up bash (4.3-7ubuntu1.5) ... update-alternatives: using /usr/share/man/man7/bash-builtins.7.gz to provide /usr/share/man/man7/builtins.7.gz (builtins.7.gz) in auto mode (Reading database ... 11723 files and directories currently installed.) Preparing to unpack .../coreutils_8.21-1ubuntu5.1_arm64.deb ... Unpacking coreutils (8.21-1ubuntu5.1) over (8.21-1ubuntu5) ... Setting up coreutils (8.21-1ubuntu5.1) ... (Reading database ... 11723 files and directories currently installed.) Preparing to unpack .../dpkg_1.17.5ubuntu5.6_arm64.deb ... Unpacking dpkg (1.17.5ubuntu5.6) over (1.17.5ubuntu5) ... Setting up dpkg (1.17.5ubuntu5.6) ... (Reading database ... 11723 files and directories currently installed.) Preparing to unpack .../libc6-dev_2.19-0ubuntu6.11_arm64.deb ... Unpacking libc6-dev:arm64 (2.19-0ubuntu6.11) over (2.19-0ubuntu6) ... Preparing to unpack .../libc-dev-bin_2.19-0ubuntu6.11_arm64.deb ... Unpacking libc-dev-bin (2.19-0ubuntu6.11) over (2.19-0ubuntu6) ... Preparing to unpack .../linux-libc-dev_3.13.0-112.159_arm64.deb ... Unpacking linux-libc-dev:arm64 (3.13.0-112.159) over (3.13.0-24.46) ... Preparing to unpack .../libc-bin_2.19-0ubuntu6.11_arm64.deb ... Unpacking libc-bin (2.19-0ubuntu6.11) over (2.19-0ubuntu6) ... Preparing to unpack .../libc6_2.19-0ubuntu6.11_arm64.deb ... Unpacking libc6:arm64 (2.19-0ubuntu6.11) over (2.19-0ubuntu6) ... Setting up libc6:arm64 (2.19-0ubuntu6.11) ... Setting up libc-bin (2.19-0ubuntu6.11) ... (Reading database ... 11723 files and directories currently installed.) Preparing to unpack .../e2fslibs_1.42.9-3ubuntu1.2_arm64.deb ... Unpacking e2fslibs:arm64 (1.42.9-3ubuntu1.2) over (1.42.9-3ubuntu1) ... Setting up e2fslibs:arm64 (1.42.9-3ubuntu1.2) ... Processing triggers for libc-bin (2.19-0ubuntu6.11) ... (Reading database ... 11723 files and directories currently installed.) Preparing to unpack .../e2fsprogs_1.42.9-3ubuntu1.2_arm64.deb ... Unpacking e2fsprogs (1.42.9-3ubuntu1.2) over (1.42.9-3ubuntu1) ... Setting up e2fsprogs (1.42.9-3ubuntu1.2) ... (Reading database ... 11723 files and directories currently installed.) Preparing to unpack .../login_1%3a4.1.5.1-1ubuntu9.3_arm64.deb ... Unpacking login (1:4.1.5.1-1ubuntu9.3) over (1:4.1.5.1-1ubuntu9) ... Setting up login (1:4.1.5.1-1ubuntu9.3) ... (Reading database ... 11723 files and directories currently installed.) Preparing to unpack .../perl_5.18.2-2ubuntu1.1_arm64.deb ... Unpacking perl (5.18.2-2ubuntu1.1) over (5.18.2-2ubuntu1) ... Preparing to unpack .../perl-base_5.18.2-2ubuntu1.1_arm64.deb ... Unpacking perl-base (5.18.2-2ubuntu1.1) over (5.18.2-2ubuntu1) ... Setting up perl-base (5.18.2-2ubuntu1.1) ... (Reading database ... 11723 files and directories currently installed.) Preparing to unpack .../perl-modules_5.18.2-2ubuntu1.1_all.deb ... Unpacking perl-modules (5.18.2-2ubuntu1.1) over (5.18.2-2ubuntu1) ... Preparing to unpack .../tar_1.27.1-1ubuntu0.1_arm64.deb ... Unpacking tar (1.27.1-1ubuntu0.1) over (1.27.1-1) ... Setting up tar (1.27.1-1ubuntu0.1) ... (Reading database ... 11723 files and directories currently installed.) Preparing to unpack .../libgomp1_4.8.4-2ubuntu1~14.04.3_arm64.deb ... Unpacking libgomp1:arm64 (4.8.4-2ubuntu1~14.04.3) over (4.8.2-19ubuntu1) ... Selecting previously unselected package libitm1:arm64. Preparing to unpack .../libitm1_4.8.4-2ubuntu1~14.04.3_arm64.deb ... Unpacking libitm1:arm64 (4.8.4-2ubuntu1~14.04.3) ... Preparing to unpack .../libatomic1_4.8.4-2ubuntu1~14.04.3_arm64.deb ... Unpacking libatomic1:arm64 (4.8.4-2ubuntu1~14.04.3) over (4.8.2-19ubuntu1) ... Preparing to unpack .../g++-4.8_4.8.4-2ubuntu1~14.04.3_arm64.deb ... Unpacking g++-4.8 (4.8.4-2ubuntu1~14.04.3) over (4.8.2-19ubuntu1) ... Preparing to unpack .../gcc-4.8_4.8.4-2ubuntu1~14.04.3_arm64.deb ... Unpacking gcc-4.8 (4.8.4-2ubuntu1~14.04.3) over (4.8.2-19ubuntu1) ... Preparing to unpack .../cpp-4.8_4.8.4-2ubuntu1~14.04.3_arm64.deb ... Unpacking cpp-4.8 (4.8.4-2ubuntu1~14.04.3) over (4.8.2-19ubuntu1) ... Preparing to unpack .../binutils_2.24-5ubuntu14.1_arm64.deb ... Unpacking binutils (2.24-5ubuntu14.1) over (2.24-5ubuntu3) ... Preparing to unpack .../libstdc++-4.8-dev_4.8.4-2ubuntu1~14.04.3_arm64.deb ... Unpacking libstdc++-4.8-dev:arm64 (4.8.4-2ubuntu1~14.04.3) over (4.8.2-19ubuntu1) ... Preparing to unpack .../libgcc-4.8-dev_4.8.4-2ubuntu1~14.04.3_arm64.deb ... Unpacking libgcc-4.8-dev:arm64 (4.8.4-2ubuntu1~14.04.3) over (4.8.2-19ubuntu1) ... Preparing to unpack .../gcc-4.8-base_4.8.4-2ubuntu1~14.04.3_arm64.deb ... Unpacking gcc-4.8-base:arm64 (4.8.4-2ubuntu1~14.04.3) over (4.8.2-19ubuntu1) ... Setting up gcc-4.8-base:arm64 (4.8.4-2ubuntu1~14.04.3) ... (Reading database ... 11745 files and directories currently installed.) Preparing to unpack .../libstdc++6_4.8.4-2ubuntu1~14.04.3_arm64.deb ... Unpacking libstdc++6:arm64 (4.8.4-2ubuntu1~14.04.3) over (4.8.2-19ubuntu1) ... Setting up libstdc++6:arm64 (4.8.4-2ubuntu1~14.04.3) ... Processing triggers for libc-bin (2.19-0ubuntu6.11) ... (Reading database ... 11758 files and directories currently installed.) Preparing to unpack .../libapt-pkg4.12_1.0.1ubuntu2.17_arm64.deb ... Unpacking libapt-pkg4.12:arm64 (1.0.1ubuntu2.17) over (1.0.1ubuntu2) ... Setting up libapt-pkg4.12:arm64 (1.0.1ubuntu2.17) ... Processing triggers for libc-bin (2.19-0ubuntu6.11) ... (Reading database ... 11758 files and directories currently installed.) Preparing to unpack .../gpgv_1.4.16-1ubuntu2.4_arm64.deb ... Unpacking gpgv (1.4.16-1ubuntu2.4) over (1.4.16-1ubuntu2) ... Setting up gpgv (1.4.16-1ubuntu2.4) ... (Reading database ... 11758 files and directories currently installed.) Preparing to unpack .../gnupg_1.4.16-1ubuntu2.4_arm64.deb ... Unpacking gnupg (1.4.16-1ubuntu2.4) over (1.4.16-1ubuntu2) ... Setting up gnupg (1.4.16-1ubuntu2.4) ... (Reading database ... 11758 files and directories currently installed.) Preparing to unpack .../apt_1.0.1ubuntu2.17_arm64.deb ... Unpacking apt (1.0.1ubuntu2.17) over (1.0.1ubuntu2) ... Setting up apt (1.0.1ubuntu2.17) ... Processing triggers for libc-bin (2.19-0ubuntu6.11) ... (Reading database ... 11758 files and directories currently installed.) Preparing to unpack .../libcomerr2_1.42.9-3ubuntu1.2_arm64.deb ... Unpacking libcomerr2:arm64 (1.42.9-3ubuntu1.2) over (1.42.9-3ubuntu1) ... Setting up libcomerr2:arm64 (1.42.9-3ubuntu1.2) ... Processing triggers for libc-bin (2.19-0ubuntu6.11) ... (Reading database ... 11758 files and directories currently installed.) Preparing to unpack .../libpam0g_1.1.8-1ubuntu2.2_arm64.deb ... Unpacking libpam0g:arm64 (1.1.8-1ubuntu2.2) over (1.1.8-1ubuntu2) ... Setting up libpam0g:arm64 (1.1.8-1ubuntu2.2) ... Processing triggers for libc-bin (2.19-0ubuntu6.11) ... (Reading database ... 11758 files and directories currently installed.) Preparing to unpack .../libpam-modules-bin_1.1.8-1ubuntu2.2_arm64.deb ... Unpacking libpam-modules-bin (1.1.8-1ubuntu2.2) over (1.1.8-1ubuntu2) ... Setting up libpam-modules-bin (1.1.8-1ubuntu2.2) ... (Reading database ... 11758 files and directories currently installed.) Preparing to unpack .../libpam-modules_1.1.8-1ubuntu2.2_arm64.deb ... Unpacking libpam-modules:arm64 (1.1.8-1ubuntu2.2) over (1.1.8-1ubuntu2) ... Setting up libpam-modules:arm64 (1.1.8-1ubuntu2.2) ... (Reading database ... 11758 files and directories currently installed.) Preparing to unpack .../libpcre3_1%3a8.31-2ubuntu2.2_arm64.deb ... Unpacking libpcre3:arm64 (1:8.31-2ubuntu2.2) over (1:8.31-2ubuntu2) ... Setting up libpcre3:arm64 (1:8.31-2ubuntu2.2) ... Processing triggers for libc-bin (2.19-0ubuntu6.11) ... (Reading database ... 11758 files and directories currently installed.) Preparing to unpack .../libss2_1.42.9-3ubuntu1.2_arm64.deb ... Unpacking libss2:arm64 (1.42.9-3ubuntu1.2) over (1.42.9-3ubuntu1) ... Setting up libss2:arm64 (1.42.9-3ubuntu1.2) ... Processing triggers for libc-bin (2.19-0ubuntu6.11) ... (Reading database ... 11758 files and directories currently installed.) Preparing to unpack .../libgcrypt11_1.5.3-2ubuntu4.4_arm64.deb ... Unpacking libgcrypt11:arm64 (1.5.3-2ubuntu4.4) over (1.5.3-2ubuntu4) ... Preparing to unpack .../libtasn1-6_3.4-3ubuntu0.4_arm64.deb ... Unpacking libtasn1-6:arm64 (3.4-3ubuntu0.4) over (3.4-3) ... Preparing to unpack .../libgnutls26_2.12.23-12ubuntu2.7_arm64.deb ... Unpacking libgnutls26:arm64 (2.12.23-12ubuntu2.7) over (2.12.23-12ubuntu2) ... Preparing to unpack .../libsqlite3-0_3.8.2-1ubuntu2.1_arm64.deb ... Unpacking libsqlite3-0:arm64 (3.8.2-1ubuntu2.1) over (3.8.2-1ubuntu2) ... Preparing to unpack .../libssl1.0.0_1.0.1f-1ubuntu2.22_arm64.deb ... Unpacking libssl1.0.0:arm64 (1.0.1f-1ubuntu2.22) over (1.0.1f-1ubuntu2) ... Preparing to unpack .../libdbus-1-3_1.6.18-0ubuntu4.4_arm64.deb ... Unpacking libdbus-1-3:arm64 (1.6.18-0ubuntu4.4) over (1.6.18-0ubuntu4) ... Preparing to unpack .../libdrm2_2.4.56-1~ubuntu2_arm64.deb ... Unpacking libdrm2:arm64 (2.4.56-1~ubuntu2) over (2.4.52-1) ... Preparing to unpack .../libjson-c2_0.11-3ubuntu1.2_arm64.deb ... Unpacking libjson-c2:arm64 (0.11-3ubuntu1.2) over (0.11-3ubuntu1) ... Preparing to unpack .../libpng12-0_1.2.50-1ubuntu2.14.04.2_arm64.deb ... Unpacking libpng12-0:arm64 (1.2.50-1ubuntu2.14.04.2) over (1.2.50-1ubuntu2) ... Preparing to unpack .../libk5crypto3_1.12+dfsg-2ubuntu5.2_arm64.deb ... Unpacking libk5crypto3:arm64 (1.12+dfsg-2ubuntu5.2) over (1.12+dfsg-2ubuntu4) ... Preparing to unpack .../libgssapi-krb5-2_1.12+dfsg-2ubuntu5.2_arm64.deb ... Unpacking libgssapi-krb5-2:arm64 (1.12+dfsg-2ubuntu5.2) over (1.12+dfsg-2ubuntu4) ... Preparing to unpack .../libkrb5-3_1.12+dfsg-2ubuntu5.2_arm64.deb ... Unpacking libkrb5-3:arm64 (1.12+dfsg-2ubuntu5.2) over (1.12+dfsg-2ubuntu4) ... Preparing to unpack .../libkrb5support0_1.12+dfsg-2ubuntu5.2_arm64.deb ... Unpacking libkrb5support0:arm64 (1.12+dfsg-2ubuntu5.2) over (1.12+dfsg-2ubuntu4) ... Preparing to unpack .../libidn11_1.28-1ubuntu2.1_arm64.deb ... Unpacking libidn11:arm64 (1.28-1ubuntu2.1) over (1.28-1ubuntu2) ... Preparing to unpack .../libldap-2.4-2_2.4.31-1+nmu2ubuntu8.2_arm64.deb ... Unpacking libldap-2.4-2:arm64 (2.4.31-1+nmu2ubuntu8.2) over (2.4.31-1+nmu2ubuntu8) ... Preparing to unpack .../libcurl3-gnutls_7.35.0-1ubuntu2.10_arm64.deb ... Unpacking libcurl3-gnutls:arm64 (7.35.0-1ubuntu2.10) over (7.35.0-1ubuntu2) ... Preparing to unpack .../libpam-runtime_1.1.8-1ubuntu2.2_all.deb ... Unpacking libpam-runtime (1.1.8-1ubuntu2.2) over (1.1.8-1ubuntu2) ... Setting up libpam-runtime (1.1.8-1ubuntu2.2) ... (Reading database ... 11758 files and directories currently installed.) Preparing to unpack .../multiarch-support_2.19-0ubuntu6.11_arm64.deb ... Unpacking multiarch-support (2.19-0ubuntu6.11) over (2.19-0ubuntu6) ... Setting up multiarch-support (2.19-0ubuntu6.11) ... (Reading database ... 11758 files and directories currently installed.) Preparing to unpack .../passwd_1%3a4.1.5.1-1ubuntu9.3_arm64.deb ... Unpacking passwd (1:4.1.5.1-1ubuntu9.3) over (1:4.1.5.1-1ubuntu9) ... Setting up passwd (1:4.1.5.1-1ubuntu9.3) ... (Reading database ... 11758 files and directories currently installed.) Preparing to unpack .../tzdata_2016j-0ubuntu0.14.04_all.deb ... Unpacking tzdata (2016j-0ubuntu0.14.04) over (2014b-1) ... Setting up tzdata (2016j-0ubuntu0.14.04) ... Current default time zone: 'Etc/UTC' Local time is now: Wed Mar 22 20:03:37 UTC 2017. Universal Time is now: Wed Mar 22 20:03:37 UTC 2017. Run 'dpkg-reconfigure tzdata' if you wish to change it. (Reading database ... 11798 files and directories currently installed.) Preparing to unpack .../cpio_2.11+dfsg-1ubuntu1.2_arm64.deb ... Unpacking cpio (2.11+dfsg-1ubuntu1.2) over (2.11+dfsg-1ubuntu1) ... Preparing to unpack .../libcgmanager0_0.24-0ubuntu7.1_arm64.deb ... Unpacking libcgmanager0:arm64 (0.24-0ubuntu7.1) over (0.24-0ubuntu5) ... Preparing to unpack .../libjson0_0.11-3ubuntu1.2_arm64.deb ... Unpacking libjson0:arm64 (0.11-3ubuntu1.2) over (0.11-3ubuntu1) ... Preparing to unpack .../apt-transport-https_1.0.1ubuntu2.17_arm64.deb ... Unpacking apt-transport-https (1.0.1ubuntu2.17) over (1.0.1ubuntu2) ... Preparing to unpack .../openssl_1.0.1f-1ubuntu2.22_arm64.deb ... Unpacking openssl (1.0.1f-1ubuntu2.22) over (1.0.1f-1ubuntu2) ... Preparing to unpack .../ca-certificates_20160104ubuntu0.14.04.1_all.deb ... Unpacking ca-certificates (20160104ubuntu0.14.04.1) over (20130906ubuntu2) ... Preparing to unpack .../dpkg-dev_1.17.5ubuntu5.6_all.deb ... Unpacking dpkg-dev (1.17.5ubuntu5.6) over (1.17.5ubuntu5) ... Preparing to unpack .../libdpkg-perl_1.17.5ubuntu5.6_all.deb ... Unpacking libdpkg-perl (1.17.5ubuntu5.6) over (1.17.5ubuntu5) ... Preparing to unpack .../patch_2.7.1-4ubuntu2.3_arm64.deb ... Unpacking patch (2.7.1-4ubuntu2.3) over (2.7.1-4) ... Preparing to unpack .../optipng_0.6.4-1ubuntu0.14.04.1_arm64.deb ... Unpacking optipng (0.6.4-1ubuntu0.14.04.1) over (0.6.4-1build1) ... Preparing to unpack .../pkg-create-dbgsym_0.67~trusty_all.deb ... Unpacking pkg-create-dbgsym (0.67~trusty) over (0.64) ... Setting up libc-dev-bin (2.19-0ubuntu6.11) ... Setting up linux-libc-dev:arm64 (3.13.0-112.159) ... Setting up libc6-dev:arm64 (2.19-0ubuntu6.11) ... Setting up libgomp1:arm64 (4.8.4-2ubuntu1~14.04.3) ... Setting up libitm1:arm64 (4.8.4-2ubuntu1~14.04.3) ... Setting up libatomic1:arm64 (4.8.4-2ubuntu1~14.04.3) ... Setting up cpp-4.8 (4.8.4-2ubuntu1~14.04.3) ... Setting up binutils (2.24-5ubuntu14.1) ... Setting up libgcc-4.8-dev:arm64 (4.8.4-2ubuntu1~14.04.3) ... Setting up gcc-4.8 (4.8.4-2ubuntu1~14.04.3) ... Setting up libstdc++-4.8-dev:arm64 (4.8.4-2ubuntu1~14.04.3) ... Setting up g++-4.8 (4.8.4-2ubuntu1~14.04.3) ... Setting up libgcrypt11:arm64 (1.5.3-2ubuntu4.4) ... Setting up libtasn1-6:arm64 (3.4-3ubuntu0.4) ... Setting up libgnutls26:arm64 (2.12.23-12ubuntu2.7) ... Setting up libsqlite3-0:arm64 (3.8.2-1ubuntu2.1) ... Setting up libssl1.0.0:arm64 (1.0.1f-1ubuntu2.22) ... Setting up libdbus-1-3:arm64 (1.6.18-0ubuntu4.4) ... Setting up libdrm2:arm64 (2.4.56-1~ubuntu2) ... Setting up libjson-c2:arm64 (0.11-3ubuntu1.2) ... Setting up libpng12-0:arm64 (1.2.50-1ubuntu2.14.04.2) ... Setting up libkrb5support0:arm64 (1.12+dfsg-2ubuntu5.2) ... Setting up libk5crypto3:arm64 (1.12+dfsg-2ubuntu5.2) ... Setting up libkrb5-3:arm64 (1.12+dfsg-2ubuntu5.2) ... Setting up libgssapi-krb5-2:arm64 (1.12+dfsg-2ubuntu5.2) ... Setting up libidn11:arm64 (1.28-1ubuntu2.1) ... Setting up libldap-2.4-2:arm64 (2.4.31-1+nmu2ubuntu8.2) ... Setting up libcurl3-gnutls:arm64 (7.35.0-1ubuntu2.10) ... Setting up cpio (2.11+dfsg-1ubuntu1.2) ... Setting up libcgmanager0:arm64 (0.24-0ubuntu7.1) ... Setting up libjson0:arm64 (0.11-3ubuntu1.2) ... Setting up apt-transport-https (1.0.1ubuntu2.17) ... Setting up openssl (1.0.1f-1ubuntu2.22) ... Setting up ca-certificates (20160104ubuntu0.14.04.1) ... Setting up patch (2.7.1-4ubuntu2.3) ... Setting up optipng (0.6.4-1ubuntu0.14.04.1) ... Setting up pkg-create-dbgsym (0.67~trusty) ... Setting up perl-modules (5.18.2-2ubuntu1.1) ... Setting up perl (5.18.2-2ubuntu1.1) ... Setting up libdpkg-perl (1.17.5ubuntu5.6) ... Setting up dpkg-dev (1.17.5ubuntu5.6) ... Processing triggers for libc-bin (2.19-0ubuntu6.11) ... Processing triggers for ca-certificates (20160104ubuntu0.14.04.1) ... Updating certificates in /etc/ssl/certs... 35 added, 26 removed; done. Running hooks in /etc/ca-certificates/update.d....done. RUN: /usr/share/launchpad-buildd/slavebin/sbuild-package ['sbuild-package', 'PACKAGEBUILD-12321260', 'arm64', 'trusty', '-c', 'chroot:autobuild', '--arch=arm64', '--dist=trusty', '--purge=never', '--nolog', 'git_1.9.1-1ubuntu0.4.dsc'] Initiating build PACKAGEBUILD-12321260 with 4 jobs across 4 processor cores. Kernel reported to sbuild: 4.4.0-66-generic #87+buildd1-Ubuntu SMP Thu Mar 9 01:49:33 UTC 2017 aarch64 sbuild (Debian sbuild) 0.67.0 (26 Dec 2015) on bos01-arm64-042.buildd +==============================================================================+ | git 1:1.9.1-1ubuntu0.4 (arm64) 22 Mar 2017 20:04 | +==============================================================================+ Package: git Version: 1:1.9.1-1ubuntu0.4 Source Version: 1:1.9.1-1ubuntu0.4 Distribution: trusty Machine Architecture: arm64 Host Architecture: arm64 Build Architecture: arm64 I: NOTICE: Log filtering will replace 'build/git-w9KUVg/git-1.9.1' with '<>' I: NOTICE: Log filtering will replace 'build/git-w9KUVg' with '<>' I: NOTICE: Log filtering will replace 'home/buildd/build-PACKAGEBUILD-12321260/chroot-autobuild' with '<>' +------------------------------------------------------------------------------+ | Fetch source files | +------------------------------------------------------------------------------+ Local sources ------------- git_1.9.1-1ubuntu0.4.dsc exists in .; copying to chroot Check architectures ------------------- Check dependencies ------------------ Merged Build-Depends: build-essential, fakeroot Filtered Build-Depends: build-essential, fakeroot dpkg-deb: building package `sbuild-build-depends-core-dummy' in `/<>/resolver-bKe5AR/apt_archive/sbuild-build-depends-core-dummy.deb'. Ign copy: ./ InRelease Ign copy: ./ Release.gpg Get:1 copy: ./ Release [2119 B] Get:2 copy: ./ Sources [214 B] Get:3 copy: ./ Packages [527 B] Ign copy: ./ Translation-en Fetched 2860 B in 0s (57.0 kB/s) Reading package lists... Reading package lists... +------------------------------------------------------------------------------+ | Install core build dependencies (apt-based resolver) | +------------------------------------------------------------------------------+ Installing build dependencies Reading package lists... Building dependency tree... Reading state information... The following NEW packages will be installed: sbuild-build-depends-core-dummy 0 upgraded, 1 newly installed, 0 to remove and 0 not upgraded. Need to get 766 B of archives. After this operation, 0 B of additional disk space will be used. Get:1 copy:/<>/resolver-bKe5AR/apt_archive/ ./ sbuild-build-depends-core-dummy 0.invalid.0 [766 B] debconf: delaying package configuration, since apt-utils is not installed Fetched 766 B in 0s (0 B/s) Selecting previously unselected package sbuild-build-depends-core-dummy. (Reading database ... 11808 files and directories currently installed.) Preparing to unpack .../sbuild-build-depends-core-dummy_0.invalid.0_arm64.deb ... Unpacking sbuild-build-depends-core-dummy (0.invalid.0) ... Setting up sbuild-build-depends-core-dummy (0.invalid.0) ... Merged Build-Depends: libz-dev, libpcre3-dev, gettext, libcurl4-gnutls-dev, libexpat1-dev, subversion, libsvn-perl, libyaml-perl, tcl, libhttp-date-perl | libtime-modules-perl, bzr, python, python-bzrlib, cvs, cvsps, libdbd-sqlite3-perl, unzip, libio-pty-perl, dpkg-dev (>= 1.16.2~) Filtered Build-Depends: libz-dev, libpcre3-dev, gettext, libcurl4-gnutls-dev, libexpat1-dev, subversion, libsvn-perl, libyaml-perl, tcl, libhttp-date-perl | libtime-modules-perl, bzr, python, python-bzrlib, cvs, cvsps, libdbd-sqlite3-perl, unzip, libio-pty-perl, dpkg-dev (>= 1.16.2~) dpkg-deb: building package `sbuild-build-depends-git-dummy' in `/<>/resolver-x5PfsB/apt_archive/sbuild-build-depends-git-dummy.deb'. Ign copy: ./ InRelease Ign copy: ./ Release.gpg Get:1 copy: ./ Release [2119 B] Get:2 copy: ./ Sources [331 B] Get:3 copy: ./ Packages [656 B] Ign copy: ./ Translation-en Fetched 3106 B in 0s (67.4 kB/s) Reading package lists... Reading package lists... +------------------------------------------------------------------------------+ | Install git build dependencies (apt-based resolver) | +------------------------------------------------------------------------------+ Installing build dependencies Reading package lists... Building dependency tree... Reading state information... The following extra packages will be installed: bzr comerr-dev cvs cvsps gettext gettext-base krb5-multidev libapr1 libaprutil1 libasprintf0c2 libbsd0 libcroco3 libcurl4-gnutls-dev libdbd-sqlite3-perl libdbi-perl libexpat1 libexpat1-dev libgcrypt11-dev libglib2.0-0 libgnutls-dev libgnutls-openssl27 libgnutlsxx27 libgpg-error-dev libgssrpc4 libhttp-date-perl libidn11-dev libio-pty-perl libkadm5clnt-mit9 libkadm5srv-mit9 libkdb5-7 libkrb5-dev libldap2-dev libp11-kit-dev libpcre3-dev libpcrecpp0 libpopt0 libpython-stdlib libpython2.7-minimal libpython2.7-stdlib librtmp-dev libserf-1-1 libsvn-perl libsvn1 libtasn1-6-dev libtcl8.6 libunistring0 libxml2 libyaml-perl mime-support pkg-config python python-bzrlib python-configobj python-minimal python2.7 python2.7-minimal subversion tcl tcl8.6 unzip zlib1g-dev Suggested packages: bzr-doc bzrtools python-bzrlib.tests doc-base mksh rcs gettext-doc krb5-doc libcurl4-doc libcurl3-dbg libclone-perl libmldbm-perl libnet-daemon-perl libplrpc-perl libsql-statement-perl libgcrypt11-doc gnutls26-doc gnutls-bin krb5-user libyaml-shell-perl python-doc python-tk python-bzrlib-dbg python-kerberos python-pycurl xdg-utils python2.7-doc binfmt-support subversion-tools db5.3-util tcl-tclreadline zip Recommended packages: python-gpgme openssh-client curl wget lynx-cur libasprintf-dev libgettextpo-dev libglib2.0-data shared-mime-info xml-core libyaml-libyaml-perl libyaml-syck-perl file python-launchpadlib python-paramiko The following NEW packages will be installed: bzr comerr-dev cvs cvsps gettext gettext-base krb5-multidev libapr1 libaprutil1 libasprintf0c2 libbsd0 libcroco3 libcurl4-gnutls-dev libdbd-sqlite3-perl libdbi-perl libexpat1 libexpat1-dev libgcrypt11-dev libglib2.0-0 libgnutls-dev libgnutls-openssl27 libgnutlsxx27 libgpg-error-dev libgssrpc4 libhttp-date-perl libidn11-dev libio-pty-perl libkadm5clnt-mit9 libkadm5srv-mit9 libkdb5-7 libkrb5-dev libldap2-dev libp11-kit-dev libpcre3-dev libpcrecpp0 libpopt0 libpython-stdlib libpython2.7-minimal libpython2.7-stdlib librtmp-dev libserf-1-1 libsvn-perl libsvn1 libtasn1-6-dev libtcl8.6 libunistring0 libxml2 libyaml-perl mime-support pkg-config python python-bzrlib python-configobj python-minimal python2.7 python2.7-minimal sbuild-build-depends-git-dummy subversion tcl tcl8.6 unzip zlib1g-dev 0 upgraded, 62 newly installed, 0 to remove and 0 not upgraded. Need to get 16.5 MB of archives. After this operation, 71.3 MB of additional disk space will be used. Get:1 copy:/<>/resolver-x5PfsB/apt_archive/ ./ sbuild-build-depends-git-dummy 0.invalid.0 [894 B] Get:2 http://ftpmaster.internal/ubuntu/ trusty/main libbsd0 arm64 0.6.0-2ubuntu1 [28.0 kB] Get:3 http://ftpmaster.internal/ubuntu/ trusty-security/main libexpat1 arm64 2.1.0-4ubuntu1.3 [58.4 kB] Get:4 http://ftpmaster.internal/ubuntu/ trusty-security/main libgnutls-openssl27 arm64 2.12.23-12ubuntu2.7 [15.5 kB] Get:5 http://ftpmaster.internal/ubuntu/ trusty/main libpopt0 arm64 1.16-8ubuntu1 [21.6 kB] Get:6 http://ftpmaster.internal/ubuntu/ trusty/main libasprintf0c2 arm64 0.18.3.1-1ubuntu2 [6604 B] Get:7 http://ftpmaster.internal/ubuntu/ trusty/main libglib2.0-0 arm64 2.40.0-2 [869 kB] Get:8 http://ftpmaster.internal/ubuntu/ trusty-security/main libxml2 arm64 2.9.1+dfsg1-3ubuntu4.9 [463 kB] Get:9 http://ftpmaster.internal/ubuntu/ trusty/main libapr1 arm64 1.5.0-1 [68.3 kB] Get:10 http://ftpmaster.internal/ubuntu/ trusty/main libaprutil1 arm64 1.5.3-1 [64.7 kB] Get:11 http://ftpmaster.internal/ubuntu/ trusty/main libcroco3 arm64 0.6.8-2ubuntu1 [65.1 kB] Get:12 http://ftpmaster.internal/ubuntu/ trusty-security/main libgssrpc4 arm64 1.12+dfsg-2ubuntu5.2 [45.0 kB] Get:13 http://ftpmaster.internal/ubuntu/ trusty-security/main libkadm5clnt-mit9 arm64 1.12+dfsg-2ubuntu5.2 [31.2 kB] Get:14 http://ftpmaster.internal/ubuntu/ trusty-security/main libkdb5-7 arm64 1.12+dfsg-2ubuntu5.2 [30.7 kB] Get:15 http://ftpmaster.internal/ubuntu/ trusty-security/main libkadm5srv-mit9 arm64 1.12+dfsg-2ubuntu5.2 [42.9 kB] Get:16 http://ftpmaster.internal/ubuntu/ trusty-security/main libpcrecpp0 arm64 1:8.31-2ubuntu2.2 [14.0 kB] Get:17 http://ftpmaster.internal/ubuntu/ trusty-security/main libserf-1-1 arm64 1.3.3-1ubuntu0.1 [35.0 kB] Get:18 http://ftpmaster.internal/ubuntu/ trusty-security/main libsvn1 arm64 1.8.8-1ubuntu3.2 [733 kB] Get:19 http://ftpmaster.internal/ubuntu/ trusty-security/main libsvn-perl arm64 1.8.8-1ubuntu3.2 [663 kB] Get:20 http://ftpmaster.internal/ubuntu/ trusty/main libtcl8.6 arm64 8.6.1-4ubuntu1 [718 kB] Get:21 http://ftpmaster.internal/ubuntu/ trusty/main libunistring0 arm64 0.9.3-5ubuntu3 [255 kB] Get:22 http://ftpmaster.internal/ubuntu/ trusty-security/main libpython2.7-minimal arm64 2.7.6-8ubuntu0.3 [309 kB] Get:23 http://ftpmaster.internal/ubuntu/ trusty-security/main python2.7-minimal arm64 2.7.6-8ubuntu0.3 [885 kB] Get:24 http://ftpmaster.internal/ubuntu/ trusty-security/main libgnutlsxx27 arm64 2.12.23-12ubuntu2.7 [16.1 kB] Get:25 http://ftpmaster.internal/ubuntu/ trusty-security/main mime-support all 3.54ubuntu1.1 [29.3 kB] Get:26 http://ftpmaster.internal/ubuntu/ trusty/main gettext-base arm64 0.18.3.1-1ubuntu2 [45.7 kB] Get:27 http://ftpmaster.internal/ubuntu/ trusty-security/main libpython2.7-stdlib arm64 2.7.6-8ubuntu0.3 [1739 kB] Get:28 http://ftpmaster.internal/ubuntu/ trusty-security/main python2.7 arm64 2.7.6-8ubuntu0.3 [196 kB] Get:29 http://ftpmaster.internal/ubuntu/ trusty/main python-minimal arm64 2.7.5-5ubuntu3 [27.5 kB] Get:30 http://ftpmaster.internal/ubuntu/ trusty/main libpython-stdlib arm64 2.7.5-5ubuntu3 [6988 B] Get:31 http://ftpmaster.internal/ubuntu/ trusty/main python arm64 2.7.5-5ubuntu3 [133 kB] Get:32 http://ftpmaster.internal/ubuntu/ trusty/main python-configobj all 4.7.2+ds-5build1 [174 kB] Get:33 http://ftpmaster.internal/ubuntu/ trusty/main python-bzrlib arm64 2.6.0+bzr6593-1ubuntu1 [1301 kB] Get:34 http://ftpmaster.internal/ubuntu/ trusty/main bzr all 2.6.0+bzr6593-1ubuntu1 [37.4 kB] Get:35 http://ftpmaster.internal/ubuntu/ trusty/main cvs arm64 2:1.12.13+real-12 [2264 kB] Get:36 http://ftpmaster.internal/ubuntu/ trusty/main cvsps arm64 2.1-6build1 [43.5 kB] Get:37 http://ftpmaster.internal/ubuntu/ trusty/main gettext arm64 0.18.3.1-1ubuntu2 [769 kB] Get:38 http://ftpmaster.internal/ubuntu/ trusty-security/main comerr-dev arm64 2.1-1.42.9-3ubuntu1.2 [37.9 kB] Get:39 http://ftpmaster.internal/ubuntu/ trusty-security/main krb5-multidev arm64 1.12+dfsg-2ubuntu5.2 [111 kB] Get:40 http://ftpmaster.internal/ubuntu/ trusty/main libgpg-error-dev arm64 1.12-0.2ubuntu1 [19.7 kB] Get:41 http://ftpmaster.internal/ubuntu/ trusty-security/main libgcrypt11-dev arm64 1.5.3-2ubuntu4.4 [264 kB] Get:42 http://ftpmaster.internal/ubuntu/ trusty/main zlib1g-dev arm64 1:1.2.8.dfsg-1ubuntu1 [179 kB] Get:43 http://ftpmaster.internal/ubuntu/ trusty-security/main libtasn1-6-dev arm64 3.4-3ubuntu0.4 [380 kB] Get:44 http://ftpmaster.internal/ubuntu/ trusty/main libp11-kit-dev arm64 0.20.2-2ubuntu2 [56.4 kB] Get:45 http://ftpmaster.internal/ubuntu/ trusty-security/main libgnutls-dev arm64 2.12.23-12ubuntu2.7 [358 kB] Get:46 http://ftpmaster.internal/ubuntu/ trusty/main pkg-config arm64 0.26-1ubuntu4 [39.7 kB] Get:47 http://ftpmaster.internal/ubuntu/ trusty-security/main libidn11-dev arm64 1.28-1ubuntu2.1 [517 kB] Get:48 http://ftpmaster.internal/ubuntu/ trusty-security/main libkrb5-dev arm64 1.12+dfsg-2ubuntu5.2 [14.4 kB] Get:49 http://ftpmaster.internal/ubuntu/ trusty-security/main libldap2-dev arm64 2.4.31-1+nmu2ubuntu8.2 [238 kB] Get:50 http://ftpmaster.internal/ubuntu/ trusty/main librtmp-dev arm64 2.4+20121230.gitdf6c518-1 [62.8 kB] Get:51 http://ftpmaster.internal/ubuntu/ trusty-security/main libcurl4-gnutls-dev arm64 7.35.0-1ubuntu2.10 [211 kB] Get:52 http://ftpmaster.internal/ubuntu/ trusty/main libdbi-perl arm64 1.630-1 [876 kB] Get:53 http://ftpmaster.internal/ubuntu/ trusty/main libdbd-sqlite3-perl arm64 1.40-3 [86.4 kB] Get:54 http://ftpmaster.internal/ubuntu/ trusty-security/main libexpat1-dev arm64 2.1.0-4ubuntu1.3 [103 kB] Get:55 http://ftpmaster.internal/ubuntu/ trusty/main libhttp-date-perl all 6.02-1 [10.4 kB] Get:56 http://ftpmaster.internal/ubuntu/ trusty/main libio-pty-perl arm64 1:1.08-1build4 [35.5 kB] Get:57 http://ftpmaster.internal/ubuntu/ trusty-security/main libpcre3-dev arm64 1:8.31-2ubuntu2.2 [227 kB] Get:58 http://ftpmaster.internal/ubuntu/ trusty/main libyaml-perl all 0.84-1 [68.3 kB] Get:59 http://ftpmaster.internal/ubuntu/ trusty-security/main subversion arm64 1.8.8-1ubuntu3.2 [266 kB] Get:60 http://ftpmaster.internal/ubuntu/ trusty/main tcl8.6 arm64 8.6.1-4ubuntu1 [14.1 kB] Get:61 http://ftpmaster.internal/ubuntu/ trusty/main tcl arm64 8.6.0+6ubuntu3 [4908 B] Get:62 http://ftpmaster.internal/ubuntu/ trusty-security/main unzip arm64 6.0-9ubuntu1.5 [149 kB] debconf: delaying package configuration, since apt-utils is not installed Fetched 16.5 MB in 6s (2472 kB/s) Selecting previously unselected package libbsd0:arm64. (Reading database ... 11808 files and directories currently installed.) Preparing to unpack .../libbsd0_0.6.0-2ubuntu1_arm64.deb ... Unpacking libbsd0:arm64 (0.6.0-2ubuntu1) ... Selecting previously unselected package libexpat1:arm64. Preparing to unpack .../libexpat1_2.1.0-4ubuntu1.3_arm64.deb ... Unpacking libexpat1:arm64 (2.1.0-4ubuntu1.3) ... Selecting previously unselected package libgnutls-openssl27:arm64. Preparing to unpack .../libgnutls-openssl27_2.12.23-12ubuntu2.7_arm64.deb ... Unpacking libgnutls-openssl27:arm64 (2.12.23-12ubuntu2.7) ... Selecting previously unselected package libpopt0:arm64. Preparing to unpack .../libpopt0_1.16-8ubuntu1_arm64.deb ... Unpacking libpopt0:arm64 (1.16-8ubuntu1) ... Selecting previously unselected package libasprintf0c2:arm64. Preparing to unpack .../libasprintf0c2_0.18.3.1-1ubuntu2_arm64.deb ... Unpacking libasprintf0c2:arm64 (0.18.3.1-1ubuntu2) ... Selecting previously unselected package libglib2.0-0:arm64. Preparing to unpack .../libglib2.0-0_2.40.0-2_arm64.deb ... Unpacking libglib2.0-0:arm64 (2.40.0-2) ... Selecting previously unselected package libxml2:arm64. Preparing to unpack .../libxml2_2.9.1+dfsg1-3ubuntu4.9_arm64.deb ... Unpacking libxml2:arm64 (2.9.1+dfsg1-3ubuntu4.9) ... Selecting previously unselected package libapr1:arm64. Preparing to unpack .../libapr1_1.5.0-1_arm64.deb ... Unpacking libapr1:arm64 (1.5.0-1) ... Selecting previously unselected package libaprutil1:arm64. Preparing to unpack .../libaprutil1_1.5.3-1_arm64.deb ... Unpacking libaprutil1:arm64 (1.5.3-1) ... Selecting previously unselected package libcroco3:arm64. Preparing to unpack .../libcroco3_0.6.8-2ubuntu1_arm64.deb ... Unpacking libcroco3:arm64 (0.6.8-2ubuntu1) ... Selecting previously unselected package libgssrpc4:arm64. Preparing to unpack .../libgssrpc4_1.12+dfsg-2ubuntu5.2_arm64.deb ... Unpacking libgssrpc4:arm64 (1.12+dfsg-2ubuntu5.2) ... Selecting previously unselected package libkadm5clnt-mit9:arm64. Preparing to unpack .../libkadm5clnt-mit9_1.12+dfsg-2ubuntu5.2_arm64.deb ... Unpacking libkadm5clnt-mit9:arm64 (1.12+dfsg-2ubuntu5.2) ... Selecting previously unselected package libkdb5-7:arm64. Preparing to unpack .../libkdb5-7_1.12+dfsg-2ubuntu5.2_arm64.deb ... Unpacking libkdb5-7:arm64 (1.12+dfsg-2ubuntu5.2) ... Selecting previously unselected package libkadm5srv-mit9:arm64. Preparing to unpack .../libkadm5srv-mit9_1.12+dfsg-2ubuntu5.2_arm64.deb ... Unpacking libkadm5srv-mit9:arm64 (1.12+dfsg-2ubuntu5.2) ... Selecting previously unselected package libpcrecpp0:arm64. Preparing to unpack .../libpcrecpp0_1%3a8.31-2ubuntu2.2_arm64.deb ... Unpacking libpcrecpp0:arm64 (1:8.31-2ubuntu2.2) ... Selecting previously unselected package libserf-1-1:arm64. Preparing to unpack .../libserf-1-1_1.3.3-1ubuntu0.1_arm64.deb ... Unpacking libserf-1-1:arm64 (1.3.3-1ubuntu0.1) ... Selecting previously unselected package libsvn1:arm64. Preparing to unpack .../libsvn1_1.8.8-1ubuntu3.2_arm64.deb ... Unpacking libsvn1:arm64 (1.8.8-1ubuntu3.2) ... Selecting previously unselected package libsvn-perl. Preparing to unpack .../libsvn-perl_1.8.8-1ubuntu3.2_arm64.deb ... Unpacking libsvn-perl (1.8.8-1ubuntu3.2) ... Selecting previously unselected package libtcl8.6:arm64. Preparing to unpack .../libtcl8.6_8.6.1-4ubuntu1_arm64.deb ... Unpacking libtcl8.6:arm64 (8.6.1-4ubuntu1) ... Selecting previously unselected package libunistring0:arm64. Preparing to unpack .../libunistring0_0.9.3-5ubuntu3_arm64.deb ... Unpacking libunistring0:arm64 (0.9.3-5ubuntu3) ... Selecting previously unselected package libpython2.7-minimal:arm64. Preparing to unpack .../libpython2.7-minimal_2.7.6-8ubuntu0.3_arm64.deb ... Unpacking libpython2.7-minimal:arm64 (2.7.6-8ubuntu0.3) ... Selecting previously unselected package python2.7-minimal. Preparing to unpack .../python2.7-minimal_2.7.6-8ubuntu0.3_arm64.deb ... Unpacking python2.7-minimal (2.7.6-8ubuntu0.3) ... Selecting previously unselected package libgnutlsxx27:arm64. Preparing to unpack .../libgnutlsxx27_2.12.23-12ubuntu2.7_arm64.deb ... Unpacking libgnutlsxx27:arm64 (2.12.23-12ubuntu2.7) ... Selecting previously unselected package mime-support. Preparing to unpack .../mime-support_3.54ubuntu1.1_all.deb ... Unpacking mime-support (3.54ubuntu1.1) ... Selecting previously unselected package gettext-base. Preparing to unpack .../gettext-base_0.18.3.1-1ubuntu2_arm64.deb ... Unpacking gettext-base (0.18.3.1-1ubuntu2) ... Selecting previously unselected package libpython2.7-stdlib:arm64. Preparing to unpack .../libpython2.7-stdlib_2.7.6-8ubuntu0.3_arm64.deb ... Unpacking libpython2.7-stdlib:arm64 (2.7.6-8ubuntu0.3) ... Selecting previously unselected package python2.7. Preparing to unpack .../python2.7_2.7.6-8ubuntu0.3_arm64.deb ... Unpacking python2.7 (2.7.6-8ubuntu0.3) ... Selecting previously unselected package python-minimal. Preparing to unpack .../python-minimal_2.7.5-5ubuntu3_arm64.deb ... Unpacking python-minimal (2.7.5-5ubuntu3) ... Selecting previously unselected package libpython-stdlib:arm64. Preparing to unpack .../libpython-stdlib_2.7.5-5ubuntu3_arm64.deb ... Unpacking libpython-stdlib:arm64 (2.7.5-5ubuntu3) ... Selecting previously unselected package python. Preparing to unpack .../python_2.7.5-5ubuntu3_arm64.deb ... Unpacking python (2.7.5-5ubuntu3) ... Selecting previously unselected package python-configobj. Preparing to unpack .../python-configobj_4.7.2+ds-5build1_all.deb ... Unpacking python-configobj (4.7.2+ds-5build1) ... Selecting previously unselected package python-bzrlib. Preparing to unpack .../python-bzrlib_2.6.0+bzr6593-1ubuntu1_arm64.deb ... Unpacking python-bzrlib (2.6.0+bzr6593-1ubuntu1) ... Selecting previously unselected package bzr. Preparing to unpack .../bzr_2.6.0+bzr6593-1ubuntu1_all.deb ... Unpacking bzr (2.6.0+bzr6593-1ubuntu1) ... Selecting previously unselected package cvs. Preparing to unpack .../cvs_2%3a1.12.13+real-12_arm64.deb ... Unpacking cvs (2:1.12.13+real-12) ... Selecting previously unselected package cvsps. Preparing to unpack .../cvsps_2.1-6build1_arm64.deb ... Unpacking cvsps (2.1-6build1) ... Selecting previously unselected package gettext. Preparing to unpack .../gettext_0.18.3.1-1ubuntu2_arm64.deb ... Unpacking gettext (0.18.3.1-1ubuntu2) ... Selecting previously unselected package comerr-dev. Preparing to unpack .../comerr-dev_2.1-1.42.9-3ubuntu1.2_arm64.deb ... Unpacking comerr-dev (2.1-1.42.9-3ubuntu1.2) ... Selecting previously unselected package krb5-multidev. Preparing to unpack .../krb5-multidev_1.12+dfsg-2ubuntu5.2_arm64.deb ... Unpacking krb5-multidev (1.12+dfsg-2ubuntu5.2) ... Selecting previously unselected package libgpg-error-dev. Preparing to unpack .../libgpg-error-dev_1.12-0.2ubuntu1_arm64.deb ... Unpacking libgpg-error-dev (1.12-0.2ubuntu1) ... Selecting previously unselected package libgcrypt11-dev. Preparing to unpack .../libgcrypt11-dev_1.5.3-2ubuntu4.4_arm64.deb ... Unpacking libgcrypt11-dev (1.5.3-2ubuntu4.4) ... Selecting previously unselected package zlib1g-dev:arm64. Preparing to unpack .../zlib1g-dev_1%3a1.2.8.dfsg-1ubuntu1_arm64.deb ... Unpacking zlib1g-dev:arm64 (1:1.2.8.dfsg-1ubuntu1) ... Selecting previously unselected package libtasn1-6-dev. Preparing to unpack .../libtasn1-6-dev_3.4-3ubuntu0.4_arm64.deb ... Unpacking libtasn1-6-dev (3.4-3ubuntu0.4) ... Selecting previously unselected package libp11-kit-dev. Preparing to unpack .../libp11-kit-dev_0.20.2-2ubuntu2_arm64.deb ... Unpacking libp11-kit-dev (0.20.2-2ubuntu2) ... Selecting previously unselected package libgnutls-dev. Preparing to unpack .../libgnutls-dev_2.12.23-12ubuntu2.7_arm64.deb ... Unpacking libgnutls-dev (2.12.23-12ubuntu2.7) ... Selecting previously unselected package pkg-config. Preparing to unpack .../pkg-config_0.26-1ubuntu4_arm64.deb ... Unpacking pkg-config (0.26-1ubuntu4) ... Selecting previously unselected package libidn11-dev. Preparing to unpack .../libidn11-dev_1.28-1ubuntu2.1_arm64.deb ... Unpacking libidn11-dev (1.28-1ubuntu2.1) ... Selecting previously unselected package libkrb5-dev. Preparing to unpack .../libkrb5-dev_1.12+dfsg-2ubuntu5.2_arm64.deb ... Unpacking libkrb5-dev (1.12+dfsg-2ubuntu5.2) ... Selecting previously unselected package libldap2-dev:arm64. Preparing to unpack .../libldap2-dev_2.4.31-1+nmu2ubuntu8.2_arm64.deb ... Unpacking libldap2-dev:arm64 (2.4.31-1+nmu2ubuntu8.2) ... Selecting previously unselected package librtmp-dev. Preparing to unpack .../librtmp-dev_2.4+20121230.gitdf6c518-1_arm64.deb ... Unpacking librtmp-dev (2.4+20121230.gitdf6c518-1) ... Selecting previously unselected package libcurl4-gnutls-dev:arm64. Preparing to unpack .../libcurl4-gnutls-dev_7.35.0-1ubuntu2.10_arm64.deb ... Unpacking libcurl4-gnutls-dev:arm64 (7.35.0-1ubuntu2.10) ... Selecting previously unselected package libdbi-perl. Preparing to unpack .../libdbi-perl_1.630-1_arm64.deb ... Unpacking libdbi-perl (1.630-1) ... Selecting previously unselected package libdbd-sqlite3-perl. Preparing to unpack .../libdbd-sqlite3-perl_1.40-3_arm64.deb ... Unpacking libdbd-sqlite3-perl (1.40-3) ... Selecting previously unselected package libexpat1-dev:arm64. Preparing to unpack .../libexpat1-dev_2.1.0-4ubuntu1.3_arm64.deb ... Unpacking libexpat1-dev:arm64 (2.1.0-4ubuntu1.3) ... Selecting previously unselected package libhttp-date-perl. Preparing to unpack .../libhttp-date-perl_6.02-1_all.deb ... Unpacking libhttp-date-perl (6.02-1) ... Selecting previously unselected package libio-pty-perl. Preparing to unpack .../libio-pty-perl_1%3a1.08-1build4_arm64.deb ... Unpacking libio-pty-perl (1:1.08-1build4) ... Selecting previously unselected package libpcre3-dev:arm64. Preparing to unpack .../libpcre3-dev_1%3a8.31-2ubuntu2.2_arm64.deb ... Unpacking libpcre3-dev:arm64 (1:8.31-2ubuntu2.2) ... Selecting previously unselected package libyaml-perl. Preparing to unpack .../libyaml-perl_0.84-1_all.deb ... Unpacking libyaml-perl (0.84-1) ... Selecting previously unselected package subversion. Preparing to unpack .../subversion_1.8.8-1ubuntu3.2_arm64.deb ... Unpacking subversion (1.8.8-1ubuntu3.2) ... Selecting previously unselected package tcl8.6. Preparing to unpack .../tcl8.6_8.6.1-4ubuntu1_arm64.deb ... Unpacking tcl8.6 (8.6.1-4ubuntu1) ... Selecting previously unselected package tcl. Preparing to unpack .../tcl_8.6.0+6ubuntu3_arm64.deb ... Unpacking tcl (8.6.0+6ubuntu3) ... Selecting previously unselected package unzip. Preparing to unpack .../unzip_6.0-9ubuntu1.5_arm64.deb ... Unpacking unzip (6.0-9ubuntu1.5) ... Selecting previously unselected package sbuild-build-depends-git-dummy. Preparing to unpack .../sbuild-build-depends-git-dummy_0.invalid.0_arm64.deb ... Unpacking sbuild-build-depends-git-dummy (0.invalid.0) ... Setting up libbsd0:arm64 (0.6.0-2ubuntu1) ... Setting up libexpat1:arm64 (2.1.0-4ubuntu1.3) ... Setting up libgnutls-openssl27:arm64 (2.12.23-12ubuntu2.7) ... Setting up libpopt0:arm64 (1.16-8ubuntu1) ... Setting up libasprintf0c2:arm64 (0.18.3.1-1ubuntu2) ... Setting up libglib2.0-0:arm64 (2.40.0-2) ... No schema files found: doing nothing. Setting up libxml2:arm64 (2.9.1+dfsg1-3ubuntu4.9) ... Setting up libapr1:arm64 (1.5.0-1) ... Setting up libaprutil1:arm64 (1.5.3-1) ... Setting up libcroco3:arm64 (0.6.8-2ubuntu1) ... Setting up libgssrpc4:arm64 (1.12+dfsg-2ubuntu5.2) ... Setting up libkadm5clnt-mit9:arm64 (1.12+dfsg-2ubuntu5.2) ... Setting up libkdb5-7:arm64 (1.12+dfsg-2ubuntu5.2) ... Setting up libkadm5srv-mit9:arm64 (1.12+dfsg-2ubuntu5.2) ... Setting up libpcrecpp0:arm64 (1:8.31-2ubuntu2.2) ... Setting up libserf-1-1:arm64 (1.3.3-1ubuntu0.1) ... Setting up libsvn1:arm64 (1.8.8-1ubuntu3.2) ... Setting up libsvn-perl (1.8.8-1ubuntu3.2) ... Setting up libtcl8.6:arm64 (8.6.1-4ubuntu1) ... Setting up libunistring0:arm64 (0.9.3-5ubuntu3) ... Setting up libpython2.7-minimal:arm64 (2.7.6-8ubuntu0.3) ... Setting up python2.7-minimal (2.7.6-8ubuntu0.3) ... Setting up libgnutlsxx27:arm64 (2.12.23-12ubuntu2.7) ... Setting up mime-support (3.54ubuntu1.1) ... update-alternatives: using /usr/bin/see to provide /usr/bin/view (view) in auto mode Setting up gettext-base (0.18.3.1-1ubuntu2) ... Setting up libpython2.7-stdlib:arm64 (2.7.6-8ubuntu0.3) ... Setting up python2.7 (2.7.6-8ubuntu0.3) ... Setting up python-minimal (2.7.5-5ubuntu3) ... Setting up libpython-stdlib:arm64 (2.7.5-5ubuntu3) ... Setting up python (2.7.5-5ubuntu3) ... Setting up python-configobj (4.7.2+ds-5build1) ... Setting up python-bzrlib (2.6.0+bzr6593-1ubuntu1) ... Setting up bzr (2.6.0+bzr6593-1ubuntu1) ... Setting up cvs (2:1.12.13+real-12) ... Allowing use of questionable username. Adding group `_cvsadmin' (GID 103) ... Done. Setting up cvsps (2.1-6build1) ... Setting up gettext (0.18.3.1-1ubuntu2) ... Setting up comerr-dev (2.1-1.42.9-3ubuntu1.2) ... Setting up krb5-multidev (1.12+dfsg-2ubuntu5.2) ... Setting up libgpg-error-dev (1.12-0.2ubuntu1) ... Setting up libgcrypt11-dev (1.5.3-2ubuntu4.4) ... Setting up zlib1g-dev:arm64 (1:1.2.8.dfsg-1ubuntu1) ... Setting up libtasn1-6-dev (3.4-3ubuntu0.4) ... Setting up libp11-kit-dev (0.20.2-2ubuntu2) ... Setting up libgnutls-dev (2.12.23-12ubuntu2.7) ... Setting up pkg-config (0.26-1ubuntu4) ... Setting up libidn11-dev (1.28-1ubuntu2.1) ... Setting up libkrb5-dev (1.12+dfsg-2ubuntu5.2) ... Setting up libldap2-dev:arm64 (2.4.31-1+nmu2ubuntu8.2) ... Setting up librtmp-dev (2.4+20121230.gitdf6c518-1) ... Setting up libcurl4-gnutls-dev:arm64 (7.35.0-1ubuntu2.10) ... Setting up libdbi-perl (1.630-1) ... Setting up libdbd-sqlite3-perl (1.40-3) ... Setting up libexpat1-dev:arm64 (2.1.0-4ubuntu1.3) ... Setting up libhttp-date-perl (6.02-1) ... Setting up libio-pty-perl (1:1.08-1build4) ... Setting up libpcre3-dev:arm64 (1:8.31-2ubuntu2.2) ... Setting up libyaml-perl (0.84-1) ... Setting up subversion (1.8.8-1ubuntu3.2) ... Setting up tcl8.6 (8.6.1-4ubuntu1) ... Setting up tcl (8.6.0+6ubuntu3) ... Setting up unzip (6.0-9ubuntu1.5) ... Setting up sbuild-build-depends-git-dummy (0.invalid.0) ... Processing triggers for libc-bin (2.19-0ubuntu6.11) ... +------------------------------------------------------------------------------+ | Build environment | +------------------------------------------------------------------------------+ Kernel: Linux 4.4.0-66-generic arm64 (aarch64) Toolchain package versions: binutils_2.24-5ubuntu14.1 dpkg-dev_1.17.5ubuntu5.6 g++-4.8_4.8.4-2ubuntu1~14.04.3 gcc-4.8_4.8.4-2ubuntu1~14.04.3 libc6-dev_2.19-0ubuntu6.11 libstdc++-4.8-dev_4.8.4-2ubuntu1~14.04.3 libstdc++6_4.8.4-2ubuntu1~14.04.3 linux-libc-dev_3.13.0-112.159 Package versions: adduser_3.113+nmu3ubuntu3 advancecomp_1.18-1 apt_1.0.1ubuntu2.17 apt-transport-https_1.0.1ubuntu2.17 base-files_7.2ubuntu5 base-passwd_3.5.33 bash_4.3-7ubuntu1.5 binutils_2.24-5ubuntu14.1 bsdutils_1:2.20.1-5.1ubuntu20 build-essential_11.6ubuntu6 busybox-initramfs_1:1.21.0-1ubuntu1 bzip2_1.0.6-5 bzr_2.6.0+bzr6593-1ubuntu1 ca-certificates_20160104ubuntu0.14.04.1 comerr-dev_2.1-1.42.9-3ubuntu1.2 coreutils_8.21-1ubuntu5.1 cpio_2.11+dfsg-1ubuntu1.2 cpp_4:4.8.2-1ubuntu6 cpp-4.8_4.8.4-2ubuntu1~14.04.3 cvs_2:1.12.13+real-12 cvsps_2.1-6build1 dash_0.5.7-4ubuntu1 debconf_1.5.51ubuntu2 debianutils_4.4 diffutils_1:3.3-1 dpkg_1.17.5ubuntu5.6 dpkg-dev_1.17.5ubuntu5.6 e2fslibs_1.42.9-3ubuntu1.2 e2fsprogs_1.42.9-3ubuntu1.2 fakeroot_1.20-3ubuntu2 findutils_4.4.2-7 g++_4:4.8.2-1ubuntu6 g++-4.8_4.8.4-2ubuntu1~14.04.3 gcc_4:4.8.2-1ubuntu6 gcc-4.8_4.8.4-2ubuntu1~14.04.3 gcc-4.8-base_4.8.4-2ubuntu1~14.04.3 gcc-4.9-base_4.9-20140406-0ubuntu1 gettext_0.18.3.1-1ubuntu2 gettext-base_0.18.3.1-1ubuntu2 gnupg_1.4.16-1ubuntu2.4 gpgv_1.4.16-1ubuntu2.4 grep_2.16-1 gzip_1.6-3ubuntu1 hostname_3.15ubuntu1 ifupdown_0.7.47.2ubuntu4 initramfs-tools_0.103ubuntu4 initramfs-tools-bin_0.103ubuntu4 initscripts_2.88dsf-41ubuntu6 insserv_1.14.0-5ubuntu2 iproute2_3.12.0-2 klibc-utils_2.0.3-0ubuntu1 kmod_15-0ubuntu6 krb5-multidev_1.12+dfsg-2ubuntu5.2 libacl1_2.2.52-1 libapr1_1.5.0-1 libaprutil1_1.5.3-1 libapt-pkg4.12_1.0.1ubuntu2.17 libasn1-8-heimdal_1.6~git20131207+dfsg-1ubuntu1 libasprintf0c2_0.18.3.1-1ubuntu2 libatomic1_4.8.4-2ubuntu1~14.04.3 libattr1_1:2.4.47-1ubuntu1 libaudit-common_1:2.3.2-2ubuntu1 libaudit1_1:2.3.2-2ubuntu1 libblkid1_2.20.1-5.1ubuntu20 libbsd0_0.6.0-2ubuntu1 libbz2-1.0_1.0.6-5 libc-bin_2.19-0ubuntu6.11 libc-dev-bin_2.19-0ubuntu6.11 libc6_2.19-0ubuntu6.11 libc6-dev_2.19-0ubuntu6.11 libcap2_1:2.24-0ubuntu2 libcgmanager0_0.24-0ubuntu7.1 libcloog-isl4_0.18.2-1 libcomerr2_1.42.9-3ubuntu1.2 libcroco3_0.6.8-2ubuntu1 libcurl3-gnutls_7.35.0-1ubuntu2.10 libcurl4-gnutls-dev_7.35.0-1ubuntu2.10 libdb5.3_5.3.28-3ubuntu3 libdbd-sqlite3-perl_1.40-3 libdbi-perl_1.630-1 libdbus-1-3_1.6.18-0ubuntu4.4 libdebconfclient0_0.187ubuntu1 libdpkg-perl_1.17.5ubuntu5.6 libdrm2_2.4.56-1~ubuntu2 libexpat1_2.1.0-4ubuntu1.3 libexpat1-dev_2.1.0-4ubuntu1.3 libfakeroot_1.20-3ubuntu2 libffi6_3.1~rc1+r3.0.13-12 libgcc-4.8-dev_4.8.4-2ubuntu1~14.04.3 libgcc1_1:4.9-20140406-0ubuntu1 libgcrypt11_1.5.3-2ubuntu4.4 libgcrypt11-dev_1.5.3-2ubuntu4.4 libgdbm3_1.8.3-12build1 libglib2.0-0_2.40.0-2 libgmp10_2:5.1.3+dfsg-1ubuntu1 libgnutls-dev_2.12.23-12ubuntu2.7 libgnutls-openssl27_2.12.23-12ubuntu2.7 libgnutls26_2.12.23-12ubuntu2.7 libgnutlsxx27_2.12.23-12ubuntu2.7 libgomp1_4.8.4-2ubuntu1~14.04.3 libgpg-error-dev_1.12-0.2ubuntu1 libgpg-error0_1.12-0.2ubuntu1 libgssapi-krb5-2_1.12+dfsg-2ubuntu5.2 libgssapi3-heimdal_1.6~git20131207+dfsg-1ubuntu1 libgssrpc4_1.12+dfsg-2ubuntu5.2 libhcrypto4-heimdal_1.6~git20131207+dfsg-1ubuntu1 libheimbase1-heimdal_1.6~git20131207+dfsg-1ubuntu1 libheimntlm0-heimdal_1.6~git20131207+dfsg-1ubuntu1 libhttp-date-perl_6.02-1 libhx509-5-heimdal_1.6~git20131207+dfsg-1ubuntu1 libidn11_1.28-1ubuntu2.1 libidn11-dev_1.28-1ubuntu2.1 libio-pty-perl_1:1.08-1build4 libisl10_0.12.2-1 libitm1_4.8.4-2ubuntu1~14.04.3 libjson-c2_0.11-3ubuntu1.2 libjson0_0.11-3ubuntu1.2 libk5crypto3_1.12+dfsg-2ubuntu5.2 libkadm5clnt-mit9_1.12+dfsg-2ubuntu5.2 libkadm5srv-mit9_1.12+dfsg-2ubuntu5.2 libkdb5-7_1.12+dfsg-2ubuntu5.2 libkeyutils1_1.5.6-1 libklibc_2.0.3-0ubuntu1 libkmod2_15-0ubuntu6 libkrb5-26-heimdal_1.6~git20131207+dfsg-1ubuntu1 libkrb5-3_1.12+dfsg-2ubuntu5.2 libkrb5-dev_1.12+dfsg-2ubuntu5.2 libkrb5support0_1.12+dfsg-2ubuntu5.2 libldap-2.4-2_2.4.31-1+nmu2ubuntu8.2 libldap2-dev_2.4.31-1+nmu2ubuntu8.2 liblockfile-bin_1.09-6ubuntu1 liblockfile1_1.09-6ubuntu1 liblzma5_5.1.1alpha+20120614-2ubuntu2 libmount1_2.20.1-5.1ubuntu20 libmpc3_1.0.1-1ubuntu1 libmpfr4_3.1.2-1 libncurses5_5.9+20140118-1ubuntu1 libncursesw5_5.9+20140118-1ubuntu1 libnih-dbus1_1.0.3-4ubuntu25 libnih1_1.0.3-4ubuntu25 libp11-kit-dev_0.20.2-2ubuntu2 libp11-kit0_0.20.2-2ubuntu2 libpam-modules_1.1.8-1ubuntu2.2 libpam-modules-bin_1.1.8-1ubuntu2.2 libpam-runtime_1.1.8-1ubuntu2.2 libpam0g_1.1.8-1ubuntu2.2 libpcre3_1:8.31-2ubuntu2.2 libpcre3-dev_1:8.31-2ubuntu2.2 libpcrecpp0_1:8.31-2ubuntu2.2 libplymouth2_0.8.8-0ubuntu17 libpng12-0_1.2.50-1ubuntu2.14.04.2 libpopt0_1.16-8ubuntu1 libprocps3_1:3.3.9-1ubuntu2 libpython-stdlib_2.7.5-5ubuntu3 libpython2.7-minimal_2.7.6-8ubuntu0.3 libpython2.7-stdlib_2.7.6-8ubuntu0.3 libreadline6_6.3-4ubuntu2 libroken18-heimdal_1.6~git20131207+dfsg-1ubuntu1 librtmp-dev_2.4+20121230.gitdf6c518-1 librtmp0_2.4+20121230.gitdf6c518-1 libsasl2-2_2.1.25.dfsg1-17build1 libsasl2-modules-db_2.1.25.dfsg1-17build1 libselinux1_2.2.2-1 libsemanage-common_2.2-1 libsemanage1_2.2-1 libsepol1_2.2-1 libserf-1-1_1.3.3-1ubuntu0.1 libslang2_2.2.4-15ubuntu1 libsqlite3-0_3.8.2-1ubuntu2.1 libss2_1.42.9-3ubuntu1.2 libssl1.0.0_1.0.1f-1ubuntu2.22 libstdc++-4.8-dev_4.8.4-2ubuntu1~14.04.3 libstdc++6_4.8.4-2ubuntu1~14.04.3 libsvn-perl_1.8.8-1ubuntu3.2 libsvn1_1.8.8-1ubuntu3.2 libtasn1-6_3.4-3ubuntu0.4 libtasn1-6-dev_3.4-3ubuntu0.4 libtcl8.6_8.6.1-4ubuntu1 libtimedate-perl_2.3000-1 libtinfo5_5.9+20140118-1ubuntu1 libudev1_204-5ubuntu20 libunistring0_0.9.3-5ubuntu3 libusb-0.1-4_2:0.1.12-23.3ubuntu1 libustr-1.0-1_1.0.4-3ubuntu2 libuuid1_2.20.1-5.1ubuntu20 libwind0-heimdal_1.6~git20131207+dfsg-1ubuntu1 libxml2_2.9.1+dfsg1-3ubuntu4.9 libyaml-perl_0.84-1 linux-libc-dev_3.13.0-112.159 lockfile-progs_0.1.17 login_1:4.1.5.1-1ubuntu9.3 lsb-base_4.1+Debian11ubuntu6 make_3.81-8.2ubuntu3 makedev_2.3.1-93ubuntu1 mawk_1.3.3-17ubuntu2 mime-support_3.54ubuntu1.1 module-init-tools_15-0ubuntu6 mount_2.20.1-5.1ubuntu20 mountall_2.53 multiarch-support_2.19-0ubuntu6.11 ncurses-base_5.9+20140118-1ubuntu1 ncurses-bin_5.9+20140118-1ubuntu1 openssl_1.0.1f-1ubuntu2.22 optipng_0.6.4-1ubuntu0.14.04.1 passwd_1:4.1.5.1-1ubuntu9.3 patch_2.7.1-4ubuntu2.3 perl_5.18.2-2ubuntu1.1 perl-base_5.18.2-2ubuntu1.1 perl-modules_5.18.2-2ubuntu1.1 pkg-config_0.26-1ubuntu4 pkg-create-dbgsym_0.67~trusty pkgbinarymangler_121 plymouth_0.8.8-0ubuntu17 policyrcd-script-zg2_0.1-2 procps_1:3.3.9-1ubuntu2 python_2.7.5-5ubuntu3 python-bzrlib_2.6.0+bzr6593-1ubuntu1 python-configobj_4.7.2+ds-5build1 python-minimal_2.7.5-5ubuntu3 python2.7_2.7.6-8ubuntu0.3 python2.7-minimal_2.7.6-8ubuntu0.3 readline-common_6.3-4ubuntu2 sbuild-build-depends-core-dummy_0.invalid.0 sbuild-build-depends-git-dummy_0.invalid.0 sed_4.2.2-4ubuntu1 sensible-utils_0.0.9 subversion_1.8.8-1ubuntu3.2 sysv-rc_2.88dsf-41ubuntu6 sysvinit-utils_2.88dsf-41ubuntu6 tar_1.27.1-1ubuntu0.1 tcl_8.6.0+6ubuntu3 tcl8.6_8.6.1-4ubuntu1 tzdata_2016j-0ubuntu0.14.04 ubuntu-keyring_2012.05.19 udev_204-5ubuntu20 unzip_6.0-9ubuntu1.5 upstart_1.12.1-0ubuntu4 util-linux_2.20.1-5.1ubuntu20 xz-utils_5.1.1alpha+20120614-2ubuntu2 zlib1g_1:1.2.8.dfsg-1ubuntu1 zlib1g-dev_1:1.2.8.dfsg-1ubuntu1 +------------------------------------------------------------------------------+ | Build | +------------------------------------------------------------------------------+ Unpack source ------------- gpgv: Signature made Wed 22 Mar 2017 07:58:02 PM UTC using RSA key ID A744BE93 gpgv: Can't check signature: public key not found dpkg-source: warning: failed to verify signature on ./git_1.9.1-1ubuntu0.4.dsc dpkg-source: info: extracting git in git-1.9.1 dpkg-source: info: unpacking git_1.9.1.orig.tar.xz dpkg-source: info: unpacking git_1.9.1-1ubuntu0.4.debian.tar.gz Check disc space ---------------- Sufficient free space for build User Environment ---------------- APT_CONFIG=/var/lib/sbuild/apt.conf DEB_BUILD_OPTIONS=parallel=4 HOME=/home/buildd LANG=C.UTF-8 LC_ALL=C.UTF-8 LOGNAME=buildd MAIL=/var/mail/buildd OLDPWD=/ PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games PWD=/<> SHELL=/bin/sh SUDO_COMMAND=/usr/sbin/chroot /<> su buildd -s /bin/sh -c cd '/<>' && 'env' SUDO_GID=2501 SUDO_UID=2001 SUDO_USER=buildd TERM=unknown USER=buildd USERNAME=root dpkg-buildpackage ----------------- dpkg-buildpackage: source package git dpkg-buildpackage: source version 1:1.9.1-1ubuntu0.4 dpkg-buildpackage: source distribution trusty-security dpkg-source --before-build git-1.9.1 dpkg-buildpackage: host architecture arm64 fakeroot debian/rules clean rm -f debian/git-remote-bzr debian/test-bzr.sh rm -f debian/git-remote-bzr.xml debian/git-remote-bzr.html rm -f Documentation/git-remote-bzr.1 /usr/bin/make clean 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 NO_PYTHON=1 USE_SRV_RR=1 USE_LIBPCRE=1 THREADED_DELTA_SEARCH=1 NO_CROSS_DIRECTORY_HARDLINKS=1 NO_INSTALL_HARDLINKS=1 DEFAULT_PAGER=pager DEFAULT_EDITOR=editor CC='gcc' CFLAGS='-Wall -g -O2 -fstack-protector --param=ssp-buffer-size=4 -Wformat -Werror=format-security -D_FORTIFY_SOURCE=2' LDFLAGS='-Wl,-Bsymbolic-functions -Wl,-z,relro' make[1]: Entering directory `/<>' GIT_VERSION = 1.9.1 make[1]: Leaving directory `/<>' make[1]: Entering directory `/<>' rm -f /<>/./*.gcda /<>/block-sha1/*.gcda /<>/builtin/*.gcda /<>/compat/*.gcda /<>/vcs-svn/*.gcda /<>/xdiff/*.gcda rm -f ./*.gcov block-sha1/*.gcov builtin/*.gcov compat/*.gcov vcs-svn/*.gcov xdiff/*.gcov rm -f /<>/./*.gcno /<>/block-sha1/*.gcno /<>/builtin/*.gcno /<>/compat/*.gcno /<>/vcs-svn/*.gcno /<>/xdiff/*.gcno rm -f ./*.gcda block-sha1/*.gcda builtin/*.gcda compat/*.gcda vcs-svn/*.gcda xdiff/*.gcda rm -f coverage-untested-functions rm -f -r cover_db/ rm -f -r cover_db_html/ rm -f ./*.gcno block-sha1/*.gcno builtin/*.gcno compat/*.gcno vcs-svn/*.gcno xdiff/*.gcno rm -f *.o *.res block-sha1/*.o ppc/*.o compat/*.o compat/*/*.o xdiff/*.o vcs-svn/*.o \ builtin/*.o libgit.a xdiff/lib.a vcs-svn/lib.a rm -f git-credential-store git-daemon git-fast-import git-http-backend git-imap-send git-sh-i18n--envsubst git-shell git-show-index git-upload-pack 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-am git-bisect git-difftool--helper git-filter-branch git-merge-octopus git-merge-one-file git-merge-resolve git-mergetool git-pull git-quiltimport git-rebase git-request-pull git-stash git-submodule git-web--browse git-add--interactive git-difftool git-archimport git-cvsexportcommit git-cvsimport git-cvsserver git-relink git-send-email git-svn git-p4 git-instaweb git-mergetool--lib git-parse-remote git-rebase--am git-rebase--interactive git-rebase--merge git-sh-setup git-sh-i18n git-add git-annotate git-apply git-archive git-bisect--helper git-blame git-branch git-bundle git-cat-file git-check-attr git-check-ignore git-check-mailmap git-check-ref-format git-checkout-index git-checkout git-clean git-clone git-column git-commit-tree git-commit git-config git-count-objects git-credential git-describe git-diff-files git-diff-index git-diff-tree git-diff git-fast-export git-fetch-pack git-fetch git-fmt-merge-msg git-for-each-ref git-fsck git-gc git-get-tar-commit-id git-grep git-hash-object git-help git-index-pack git-init-db git-log git-ls-files git-ls-remote git-ls-tree git-mailinfo git-mailsplit git-merge git-merge-base git-merge-file git-merge-index git-merge-ours git-merge-recursive git-merge-tree git-mktag git-mktree git-mv git-name-rev git-notes git-pack-objects git-pack-redundant git-pack-refs git-patch-id git-prune-packed git-prune git-push git-read-tree git-receive-pack git-reflog git-remote git-remote-ext git-remote-fd git-repack git-replace git-rerere git-reset git-rev-list git-rev-parse git-revert git-rm git-send-pack git-shortlog git-show-branch git-show-ref git-stripspace git-symbolic-ref git-tag git-unpack-file git-unpack-objects git-update-index git-update-ref git-update-server-info git-upload-archive git-var git-verify-pack git-verify-tag git-write-tree git-cherry git-cherry-pick git-format-patch git-fsck-objects git-init git-merge-subtree git-show git-stage git-status git-whatchanged git rm -f test-chmtime test-ctype test-date test-delta test-dump-cache-tree test-genrandom test-index-version test-line-buffer test-match-trees test-mergesort test-mktemp test-parse-options test-path-utils test-prio-queue test-read-cache test-regex test-revision-walking test-run-command test-scrap-cache-tree test-sha1 test-sigchain test-string-list test-subprocess test-svn-fe test-urlmatch-normalization test-wildmatch git-remote-testgit rm -f -r bin-wrappers ./.depend block-sha1/.depend builtin/.depend compat/.depend vcs-svn/.depend xdiff/.depend rm -f -r po/build/ rm -f *.spec *.pyc *.pyo */*.pyc */*.pyo common-cmds.h TAGS tags cscope* rm -f -r git-1.9.1 .doc-tmp-dir rm -f git-1.9.1.tar.gz git-core_1.9.1-*.tar.gz rm -f git-htmldocs-1.9.1.tar.gz git-manpages-1.9.1.tar.gz /usr/bin/make -C Documentation/ clean make[2]: Entering directory `/<>/Documentation' GEN mergetools-list.made GEN cmd-list.made GEN doc.dep make[3]: Entering directory `/<>' make[3]: `GIT-VERSION-FILE' is up to date. make[3]: Leaving directory `/<>' make[2]: Leaving directory `/<>/Documentation' make[2]: Entering directory `/<>/Documentation' make[3]: Entering directory `/<>' make[3]: `GIT-VERSION-FILE' is up to date. make[3]: Leaving directory `/<>' rm -f *.xml *.xml+ *.html *.html+ *.1 *.5 *.7 rm -f *.texi *.texi+ *.texi++ git.info gitman.info rm -f *.pdf rm -f howto-index.txt howto/*.html doc.dep rm -f technical/*.html technical/api-index.txt rm -f cmds-ancillaryinterrogators.txt cmds-ancillarymanipulators.txt cmds-mainporcelain.txt cmds-plumbinginterrogators.txt cmds-plumbingmanipulators.txt cmds-synchingrepositories.txt cmds-synchelpers.txt cmds-purehelpers.txt cmds-foreignscminterface.txt mergetools-diff.txt mergetools-merge.txt *.made rm -f manpage-base-url.xsl make[2]: Leaving directory `/<>/Documentation' /usr/bin/make -C gitweb clean make[2]: Entering directory `/<>/gitweb' make[3]: Entering directory `/<>' make[3]: `GIT-VERSION-FILE' is up to date. make[3]: Leaving directory `/<>' rm -f gitweb.cgi static/gitweb.js \ static/gitweb.min.js static/gitweb.min.css \ GITWEB-BUILD-OPTIONS make[2]: Leaving directory `/<>/gitweb' /usr/bin/make -C perl clean make[2]: Entering directory `/<>/perl' rm -f ppport.h rm -f perl.mak rm -f perl.mak.old rm -f PM.stamp make[2]: Leaving directory `/<>/perl' /usr/bin/make -C templates/ clean make[2]: Entering directory `/<>/templates' rm -f -r blt boilerplates.made make[2]: Leaving directory `/<>/templates' /usr/bin/make -C t/ clean make[2]: Entering directory `/<>/t' rm -f -r 'trash directory'.* 'test-results' rm -f -r valgrind/bin rm -f .prove make[2]: Leaving directory `/<>/t' /usr/bin/make -C gitk-git clean make[2]: Entering directory `/<>/gitk-git' rm -f gitk-wish po/*.msg GIT-TCLTK-VARS make[2]: Leaving directory `/<>/gitk-git' /usr/bin/make -C git-gui clean make[2]: Entering directory `/<>/git-gui' GITGUI_VERSION = 0.18.0.14.g1b2c7 make[2]: Leaving directory `/<>/git-gui' make[2]: Entering directory `/<>/git-gui' rm -rf git-gui lib/tclIndex po/*.msg rm -rf GIT-VERSION-FILE GIT-GUI-VARS make[2]: Leaving directory `/<>/git-gui' rm -f GIT-VERSION-FILE GIT-CFLAGS GIT-LDFLAGS GIT-BUILD-OPTIONS rm -f GIT-USER-AGENT GIT-PREFIX rm -f GIT-SCRIPT-DEFINES GIT-PERL-DEFINES GIT-PYTHON-VARS make[1]: Leaving directory `/<>' ! test -e patch-stamp || \ { \ set -e; \ /usr/bin/make -Ccontrib/mw-to-git clean 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 NO_PYTHON=1 USE_SRV_RR=1 USE_LIBPCRE=1 THREADED_DELTA_SEARCH=1 NO_CROSS_DIRECTORY_HARDLINKS=1 NO_INSTALL_HARDLINKS=1 DEFAULT_PAGER=pager DEFAULT_EDITOR=editor CC='gcc' CFLAGS='-Wall -g -O2 -fstack-protector --param=ssp-buffer-size=4 -Wformat -Werror=format-security -D_FORTIFY_SOURCE=2' LDFLAGS='-Wl,-Bsymbolic-functions -Wl,-z,relro'; \ for i in `ls -1r debian/diff/*.diff debian/diff/*.patch \ 2>/dev/null || :`; do \ patch -p1 -NR -r- <$i || test $? = 1 || exit 1; \ done; \ } rm -rf '/<>/tmp' rm -f patch-stamp build-arch-stamp build-indep-stamp set -e; \ for i in '' -doc -arch -bzr -cvs -svn -mediawiki -daemon-run -daemon-sysvinit -email -gui k web -all -el -man -core; do \ rm -rf '/<>/debian/git'$i; \ done rm -f debian/files debian/substvars rm -f git-subtree debian/rules build-arch for i in `ls -1 debian/diff/*.diff debian/diff/*.patch \ 2>/dev/null || :`; do \ patch -p1 -N -r- <$i || test $? = 1 || exit 1; \ done patching file templates/hooks--pre-rebase.sample patching file Makefile patching file connect.c patching file tcp.c patching file tcp.h patching file daemon.c patching file daemon.c patching file tcp.c patching file tcp.h patching file Makefile patching file dns-ipv4.c patching file dns-ipv4.h patching file dns-ipv6.c patching file dns-ipv6.h patching file tcp.c patching file dns-ipv4.h patching file dns-ipv6.c patching file tcp.c patching file Makefile patching file srv.c patching file srv.h patching file tcp.c patching file srv.c patching file contrib/subtree/git-subtree.sh patching file Documentation/config.txt patching file cache.h patching file config.c patching file config.mak.uname patching file environment.c patching file fsck.c patching file path.c patching file read-cache.c patching file t/t1014-read-tree-confusing.sh patching file t/t1450-fsck.sh patching file t/test-lib.sh patching file unpack-trees.c patching file utf8.c patching file utf8.h patching file Documentation/git.txt patching file connect.c patching file t/lib-proto-disable.sh patching file t/t5810-proto-disable-local.sh patching file t/t5811-proto-disable-git.sh patching file t/t5812-proto-disable-http.sh patching file t/t5813-proto-disable-ssh.sh patching file t/t5814-proto-disable-ext.sh patching file transport-helper.c patching file transport.c patching file transport.h patching file git-submodule.sh patching file t/t5815-submodule-protos.sh patching file transport.c patching file transport.h patching file Documentation/git.txt patching file http.c patching file t/lib-httpd/apache.conf patching file t/t5812-proto-disable-http.sh patching file http.c patching file t/lib-httpd/apache.conf patching file t/t5812-proto-disable-http.sh patching file compat/nedmalloc/nedmalloc.c patching file fast-import.c patching file revision.c patching file builtin/pack-objects.c patching file revision.c patching file contrib/completion/git-prompt.sh patching file t/t9903-bash-prompt.sh # Set executable bit on new test files since patch can't set it chmod a+x t/*.sh touch patch-stamp gcc -v Using built-in specs. COLLECT_GCC=gcc COLLECT_LTO_WRAPPER=/usr/lib/gcc/aarch64-linux-gnu/4.8/lto-wrapper Target: aarch64-linux-gnu Configured with: ../src/configure -v --with-pkgversion='Ubuntu/Linaro 4.8.4-2ubuntu1~14.04.3' --with-bugurl=file:///usr/share/doc/gcc-4.8/README.Bugs --enable-languages=c,c++,java,go,d,fortran,objc,obj-c++ --prefix=/usr --program-suffix=-4.8 --enable-shared --enable-linker-build-id --libexecdir=/usr/lib --without-included-gettext --enable-threads=posix --with-gxx-include-dir=/usr/include/c++/4.8 --libdir=/usr/lib --enable-nls --with-sysroot=/ --enable-clocale=gnu --enable-libstdcxx-debug --enable-libstdcxx-time=yes --enable-gnu-unique-object --disable-libmudflap --disable-libsanitizer --disable-libquadmath --enable-plugin --with-system-zlib --disable-browser-plugin --enable-java-awt=gtk --enable-gtk-cairo --with-java-home=/usr/lib/jvm/java-1.5.0-gcj-4.8-arm64/jre --enable-java-home --with-jvm-root-dir=/usr/lib/jvm/java-1.5.0-gcj-4.8-arm64 --with-jvm-jar-dir=/usr/lib/jvm-exports/java-1.5.0-gcj-4.8-arm64 --with-arch-directory=arm64 --with-ecj-jar=/usr/share/java/eclipse-ecj.jar --enable-multiarch --disable-werror --enable-checking=release --build=aarch64-linux-gnu --host=aarch64-linux-gnu --target=aarch64-linux-gnu Thread model: posix gcc version 4.8.4 (Ubuntu/Linaro 4.8.4-2ubuntu1~14.04.3) DESTDIR='/<>/debian/git' /usr/bin/make all 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 NO_PYTHON=1 USE_SRV_RR=1 USE_LIBPCRE=1 THREADED_DELTA_SEARCH=1 NO_CROSS_DIRECTORY_HARDLINKS=1 NO_INSTALL_HARDLINKS=1 DEFAULT_PAGER=pager DEFAULT_EDITOR=editor CC='gcc' CFLAGS='-Wall -g -O2 -fstack-protector --param=ssp-buffer-size=4 -Wformat -Werror=format-security -D_FORTIFY_SOURCE=2' LDFLAGS='-Wl,-Bsymbolic-functions -Wl,-z,relro' make[1]: Entering directory `/<>' GIT_VERSION = 1.9.1 make[1]: Leaving directory `/<>' make[1]: Entering directory `/<>' * new build flags * new link flags * new prefix flags GEN common-cmds.h CC ident.o CC kwset.o CC hex.o CC levenshtein.o CC line-log.o CC line-range.o CC list-objects.o CC ll-merge.o CC lockfile.o CC log-tree.o CC mailmap.o CC match-trees.o CC merge.o CC merge-blobs.o CC merge-recursive.o CC mergesort.o CC name-hash.o CC notes.o CC notes-cache.o CC notes-merge.o CC notes-utils.o CC object.o CC pack-check.o CC pack-revindex.o CC pack-write.o CC pager.o CC parse-options.o CC parse-options-cb.o CC patch-delta.o CC patch-ids.o CC path.o CC pathspec.o CC pkt-line.o CC preload-index.o CC pretty.o CC prio-queue.o CC progress.o CC prompt.o CC quote.o CC reachable.o CC read-cache.o CC reflog-walk.o CC refs.o CC remote.o CC replace_object.o CC rerere.o CC resolve-undo.o CC revision.o CC run-command.o CC send-pack.o CC sequencer.o CC server-info.o CC setup.o CC sha1-array.o CC sha1-lookup.o CC sha1_file.o CC sha1_name.o CC shallow.o CC sideband.o CC sigchain.o CC strbuf.o CC streaming.o CC string-list.o CC submodule.o CC symlinks.o CC tag.o CC tcp.o CC trace.o CC transport.o CC transport-helper.o CC tree-diff.o CC tree.o CC tree-walk.o CC unpack-trees.o CC url.o CC urlmatch.o CC usage.o CC userdiff.o CC utf8.o CC varint.o CC walker.o CC wildmatch.o CC wrapper.o CC write_or_die.o CC ws.o CC wt-status.o CC xdiff-interface.o wt-status.c: In function ‘wt_status_print_unmerged_header’: wt-status.c:191:2: warning: zero-length gnu_printf format string [-Wformat-zero-length] status_printf_ln(s, c, ""); ^ wt-status.c: In function ‘wt_status_print_cached_header’: wt-status.c:207:2: warning: zero-length gnu_printf format string [-Wformat-zero-length] status_printf_ln(s, c, ""); ^ wt-status.c: In function ‘wt_status_print_dirty_header’: wt-status.c:226:2: warning: zero-length gnu_printf format string [-Wformat-zero-length] status_printf_ln(s, c, ""); ^ wt-status.c: In function ‘wt_status_print_other_header’: wt-status.c:238:2: warning: zero-length gnu_printf format string [-Wformat-zero-length] status_printf_ln(s, c, ""); ^ wt-status.c: In function ‘wt_status_print_trailer’: wt-status.c:243:2: warning: zero-length gnu_printf format string [-Wformat-zero-length] status_printf_ln(s, color(WT_STATUS_HEADER, s), ""); ^ wt-status.c: In function ‘wt_status_print_other’: wt-status.c:796:2: warning: zero-length gnu_printf format string [-Wformat-zero-length] status_printf_ln(s, GIT_COLOR_NORMAL, ""); ^ wt-status.c: In function ‘wt_status_print_tracking’: wt-status.c:878:3: warning: zero-length gnu_printf format string [-Wformat-zero-length] fprintf_ln(s->fp, ""); ^ wt-status.c: In function ‘wt_status_print’: wt-status.c:1294:3: warning: zero-length gnu_printf format string [-Wformat-zero-length] status_printf(s, color(WT_STATUS_HEADER, s), ""); ^ wt-status.c:1307:3: warning: zero-length gnu_printf format string [-Wformat-zero-length] status_printf_ln(s, color(WT_STATUS_HEADER, s), ""); ^ wt-status.c:1309:3: warning: zero-length gnu_printf format string [-Wformat-zero-length] status_printf_ln(s, color(WT_STATUS_HEADER, s), ""); ^ wt-status.c:1326:4: warning: zero-length gnu_printf format string [-Wformat-zero-length] status_printf_ln(s, GIT_COLOR_NORMAL, ""); ^ CC zlib.o CC srv.o CC dns-ipv6.o CC unix-socket.o CC block-sha1/sha1.o CC thread-utils.o CC compat/strlcpy.o CC xdiff/xdiffi.o CC xdiff/xprepare.o CC xdiff/xutils.o CC xdiff/xemit.o CC xdiff/xmerge.o CC xdiff/xhistogram.o CC xdiff/xpatience.o CC daemon.o CC fast-import.o CC http-backend.o CC imap-send.o CC sh-i18n--envsubst.o CC shell.o CC show-index.o CC upload-pack.o CC remote-testsvn.o CC vcs-svn/line_buffer.o CC vcs-svn/sliding_window.o CC vcs-svn/repo_tree.o CC vcs-svn/fast_export.o CC vcs-svn/svndiff.o CC vcs-svn/svndump.o CC http.o CC http-walker.o CC http-fetch.o CC http-push.o CC credential-cache.o CC credential-cache--daemon.o CC remote-curl.o * new script parameters GEN perl/PM.stamp * new perl-specific parameters GEN git-p4 make[2]: Entering directory `/<>/gitweb' make[3]: Entering directory `/<>' make[3]: `GIT-VERSION-FILE' is up to date. make[3]: Leaving directory `/<>' GEN static/gitweb.js GEN gitweb.cgi make[2]: Leaving directory `/<>/gitweb' GEN git-mergetool--lib GEN git-parse-remote GEN git-rebase--am GEN git-rebase--interactive GEN git-rebase--merge GEN git-sh-setup GEN git-sh-i18n CC git.o CC builtin/add.o CC builtin/annotate.o CC builtin/apply.o CC builtin/archive.o CC builtin/bisect--helper.o CC builtin/blame.o CC builtin/branch.o CC builtin/bundle.o CC builtin/cat-file.o CC builtin/check-attr.o CC builtin/check-ignore.o CC builtin/check-mailmap.o CC builtin/check-ref-format.o CC builtin/checkout-index.o CC builtin/checkout.o CC builtin/clean.o CC builtin/clone.o CC builtin/column.o CC builtin/commit-tree.o CC builtin/commit.o CC builtin/config.o builtin/commit.c: In function ‘prepare_to_commit’: CC builtin/count-objects.o builtin/commit.c:808:4: warning: zero-length gnu_printf format string [-Wformat-zero-length] status_printf_ln(s, GIT_COLOR_NORMAL, ""); ^ CC builtin/credential.o CC builtin/describe.o CC builtin/diff-files.o CC builtin/diff-index.o CC builtin/diff-tree.o CC builtin/diff.o CC builtin/fast-export.o CC builtin/fetch-pack.o CC builtin/fetch.o CC builtin/fmt-merge-msg.o CC builtin/for-each-ref.o CC builtin/fsck.o CC builtin/gc.o CC builtin/get-tar-commit-id.o CC builtin/grep.o CC builtin/hash-object.o CC builtin/help.o CC builtin/index-pack.o CC builtin/init-db.o CC builtin/log.o CC builtin/ls-files.o CC builtin/ls-remote.o CC builtin/ls-tree.o CC builtin/mailinfo.o CC builtin/mailsplit.o CC builtin/merge.o CC builtin/merge-base.o CC builtin/merge-file.o CC builtin/merge-index.o CC builtin/merge-ours.o CC builtin/merge-recursive.o CC builtin/merge-tree.o CC builtin/mktag.o CC builtin/mktree.o CC builtin/mv.o CC builtin/name-rev.o CC builtin/notes.o CC builtin/pack-objects.o CC builtin/pack-redundant.o CC builtin/pack-refs.o CC builtin/patch-id.o CC builtin/prune-packed.o CC builtin/prune.o CC builtin/push.o CC builtin/read-tree.o CC builtin/receive-pack.o CC builtin/reflog.o CC builtin/remote.o CC builtin/remote-ext.o CC builtin/remote-fd.o CC builtin/repack.o CC builtin/replace.o CC builtin/rerere.o CC builtin/reset.o CC builtin/rev-list.o CC builtin/rev-parse.o CC builtin/revert.o CC builtin/rm.o CC builtin/send-pack.o CC builtin/shortlog.o CC builtin/show-branch.o CC builtin/show-ref.o CC builtin/stripspace.o CC builtin/symbolic-ref.o CC builtin/tag.o CC builtin/unpack-file.o CC builtin/unpack-objects.o CC builtin/update-index.o CC builtin/update-ref.o CC builtin/update-server-info.o CC builtin/upload-archive.o CC builtin/var.o CC builtin/verify-pack.o CC builtin/verify-tag.o CC builtin/write-tree.o MSGFMT po/build/locale/bg/LC_MESSAGES/git.mo MSGFMT po/build/locale/de/LC_MESSAGES/git.mo 222 translated messages, 21 fuzzy translations, 1967 untranslated messages. MSGFMT po/build/locale/fr/LC_MESSAGES/git.mo 2209 translated messages, 2 untranslated messages. MSGFMT po/build/locale/is/LC_MESSAGES/git.mo 14 translated messages. MSGFMT po/build/locale/it/LC_MESSAGES/git.mo MSGFMT po/build/locale/pt_PT/LC_MESSAGES/git.mo 716 translated messages, 350 untranslated messages. MSGFMT po/build/locale/sv/LC_MESSAGES/git.mo 2211 translated messages. MSGFMT po/build/locale/vi/LC_MESSAGES/git.mo 306 translated messages, 687 untranslated messages. MSGFMT po/build/locale/zh_CN/LC_MESSAGES/git.mo 2211 translated messages. CC test-chmtime.o 2211 translated messages. CC test-ctype.o 2211 translated messages. CC test-date.o CC test-delta.o CC test-dump-cache-tree.o CC test-genrandom.o CC test-index-version.o CC test-line-buffer.o CC test-match-trees.o CC test-mergesort.o CC test-mktemp.o CC test-parse-options.o CC test-path-utils.o CC test-prio-queue.o CC test-read-cache.o CC test-regex.o CC test-revision-walking.o CC test-run-command.o CC test-scrap-cache-tree.o CC test-sha1.o CC test-sigchain.o CC test-string-list.o CC test-subprocess.o CC test-svn-fe.o CC test-urlmatch-normalization.o CC test-wildmatch.o GEN bin-wrappers/git GEN bin-wrappers/git-upload-pack GEN bin-wrappers/git-receive-pack GEN bin-wrappers/git-upload-archive GEN bin-wrappers/git-shell GEN bin-wrappers/git-cvsserver GEN bin-wrappers/test-chmtime GEN bin-wrappers/test-ctype GEN bin-wrappers/test-date GEN bin-wrappers/test-delta GEN bin-wrappers/test-dump-cache-tree GEN bin-wrappers/test-genrandom GEN bin-wrappers/test-index-version GEN bin-wrappers/test-line-buffer GEN bin-wrappers/test-match-trees GEN bin-wrappers/test-mergesort GEN bin-wrappers/test-mktemp GEN bin-wrappers/test-parse-options GEN bin-wrappers/test-prio-queue GEN bin-wrappers/test-path-utils GEN bin-wrappers/test-read-cache GEN bin-wrappers/test-regex GEN bin-wrappers/test-revision-walking GEN bin-wrappers/test-run-command GEN bin-wrappers/test-scrap-cache-tree GEN bin-wrappers/test-sha1 GEN bin-wrappers/test-sigchain GEN bin-wrappers/test-string-list GEN bin-wrappers/test-svn-fe GEN bin-wrappers/test-subprocess GEN bin-wrappers/test-urlmatch-normalization GEN bin-wrappers/test-wildmatch GEN git-remote-testgit CC credential-store.o CC abspath.o CC advice.o CC alias.o CC alloc.o CC archive.o CC archive-tar.o CC archive-zip.o CC argv-array.o CC attr.o CC base85.o CC bisect.o CC blob.o CC branch.o CC bulk-checkin.o CC bundle.o CC cache-tree.o CC color.o CC column.o CC combine-diff.o CC commit.o CC compat/obstack.o CC compat/terminal.o CC config.o CC connect.o CC connected.o CC convert.o CC copy.o CC credential.o CC csum-file.o CC ctype.o CC date.o CC decorate.o CC diffcore-break.o CC diffcore-delta.o CC diffcore-order.o CC diffcore-pickaxe.o CC diffcore-rename.o CC diff-delta.o CC diff-lib.o CC diff-no-index.o CC diff.o CC dir.o CC editor.o CC entry.o CC environment.o CC exec_cmd.o CC fetch-pack.o CC fsck.o CC gettext.o CC gpg-interface.o CC graph.o CC grep.o CC hash.o CC help.o CC version.o AR xdiff/lib.a AR vcs-svn/lib.a GEN git-am GEN git-bisect GEN git-difftool--helper GEN git-filter-branch GEN git-merge-octopus GEN git-merge-one-file GEN git-merge-resolve GEN git-mergetool GEN git-pull GEN git-quiltimport GEN git-rebase GEN git-request-pull GEN git-stash GEN git-submodule GEN git-web--browse make[2]: Entering directory `/<>/perl' /usr/bin/perl Makefile.PL PREFIX='/usr' INSTALL_BASE='' --localedir='/usr/share/locale' GEN git-instaweb Writing perl.mak for Git Writing MYMETA.yml and MYMETA.json make[2]: Leaving directory `/<>/perl' GEN git-add--interactive GEN git-difftool GEN git-archimport GEN git-cvsexportcommit GEN git-cvsimport GEN git-cvsserver GEN git-relink GEN git-send-email GEN git-svn AR libgit.a LINK git-credential-store LINK git-daemon LINK git-fast-import LINK git-http-backend LINK git-imap-send LINK git-sh-i18n--envsubst LINK git-shell LINK git-show-index LINK git-upload-pack LINK git-remote-testsvn LINK git-http-fetch LINK git-http-push LINK git-credential-cache LINK git-credential-cache--daemon LINK git-remote-http LINK git LINK test-chmtime LINK test-ctype LINK test-date LINK test-delta LINK test-dump-cache-tree LINK test-genrandom LINK test-index-version LINK test-line-buffer LINK test-match-trees LINK test-mergesort LINK test-mktemp LINK test-parse-options LINK test-path-utils LINK test-prio-queue LINK test-read-cache LINK test-regex LINK test-revision-walking LINK test-run-command LINK test-scrap-cache-tree LINK test-sha1 LINK test-sigchain LINK test-string-list LINK test-subprocess LINK test-svn-fe LINK test-urlmatch-normalization LINK test-wildmatch LN/CP git-remote-https LN/CP git-remote-ftp LN/CP git-remote-ftps BUILTIN git-add BUILTIN git-annotate BUILTIN git-apply BUILTIN git-archive BUILTIN git-bisect--helper BUILTIN git-blame BUILTIN git-branch BUILTIN git-bundle BUILTIN git-cat-file BUILTIN git-check-attr BUILTIN git-check-ignore BUILTIN git-check-mailmap BUILTIN git-check-ref-format BUILTIN git-checkout-index BUILTIN git-checkout BUILTIN git-clean BUILTIN git-clone BUILTIN git-column BUILTIN git-commit-tree BUILTIN git-commit BUILTIN git-config BUILTIN git-count-objects BUILTIN git-credential BUILTIN git-describe BUILTIN git-diff-files BUILTIN git-diff-index BUILTIN git-diff-tree BUILTIN git-diff BUILTIN git-fast-export BUILTIN git-fetch-pack BUILTIN git-fetch BUILTIN git-fmt-merge-msg BUILTIN git-fsck BUILTIN git-gc BUILTIN git-for-each-ref BUILTIN git-get-tar-commit-id BUILTIN git-grep BUILTIN git-hash-object BUILTIN git-help BUILTIN git-index-pack BUILTIN git-init-db BUILTIN git-log BUILTIN git-ls-files BUILTIN git-ls-remote BUILTIN git-ls-tree BUILTIN git-mailinfo BUILTIN git-mailsplit BUILTIN git-merge BUILTIN git-merge-base BUILTIN git-merge-file BUILTIN git-merge-index BUILTIN git-merge-ours BUILTIN git-merge-recursive BUILTIN git-merge-tree BUILTIN git-mktag BUILTIN git-mktree BUILTIN git-mv BUILTIN git-name-rev BUILTIN git-notes BUILTIN git-pack-objects BUILTIN git-pack-redundant BUILTIN git-pack-refs BUILTIN git-patch-id BUILTIN git-prune-packed BUILTIN git-prune BUILTIN git-push BUILTIN git-read-tree BUILTIN git-receive-pack BUILTIN git-reflog BUILTIN git-remote-ext BUILTIN git-remote BUILTIN git-remote-fd BUILTIN git-repack BUILTIN git-replace BUILTIN git-rerere BUILTIN git-reset BUILTIN git-rev-list BUILTIN git-rev-parse BUILTIN git-revert BUILTIN git-rm BUILTIN git-send-pack BUILTIN git-shortlog BUILTIN git-show-branch BUILTIN git-show-ref BUILTIN git-stripspace BUILTIN git-symbolic-ref BUILTIN git-tag BUILTIN git-unpack-file BUILTIN git-unpack-objects BUILTIN git-update-index BUILTIN git-update-ref BUILTIN git-update-server-info BUILTIN git-upload-archive BUILTIN git-var BUILTIN git-verify-pack BUILTIN git-verify-tag BUILTIN git-cherry BUILTIN git-write-tree BUILTIN git-cherry-pick BUILTIN git-format-patch BUILTIN git-fsck-objects BUILTIN git-init BUILTIN git-merge-subtree BUILTIN git-show BUILTIN git-stage BUILTIN git-status BUILTIN git-whatchanged make[2]: Entering directory `/<>/git-gui' GITGUI_VERSION = 0.18.0.14.g1b2c7 make[2]: Leaving directory `/<>/git-gui' make[2]: Entering directory `/<>/git-gui' * new locations or Tcl/Tk interpreter MSGFMT po/bg.msg MSGFMT po/de.msg MSGFMT po/el.msg MSGFMT po/fr.msg 520 translated. 381 translated, 4 fuzzy, 6 untranslated. MSGFMT po/hu.msg MSGFMT po/it.msg 543 translated. 520 translated. MSGFMT po/ja.msg MSGFMT po/nb.msg 514 translated. MSGFMT po/pt_br.msg 520 translated. MSGFMT po/ru.msg 519 translated, 1 untranslated. MSGFMT po/sv.msg 520 translated. 516 translated, 4 untranslated. MSGFMT po/zh_cn.msg 474 translated, 39 untranslated. GEN git-gui INDEX lib/ 521 translated. 366 translated, 7 fuzzy, 17 untranslated. make[2]: Leaving directory `/<>/git-gui' make[2]: Entering directory `/<>/gitk-git' Generating catalog po/bg.msg * new Tcl/Tk interpreter location Generating catalog po/de.msg msgfmt --statistics --tcl po/de.po -l de -d po/ Generating catalog po/es.msg msgfmt --statistics --tcl po/bg.po -l bg -d po/ msgfmt --statistics --tcl po/es.po -l es -d po/ 200 translated messages, 7 untranslated messages. 304 translated messages. Generating catalog po/fr.msg msgfmt --statistics --tcl po/fr.po -l fr -d po/ 289 translated messages. Generating catalog po/hu.msg msgfmt --statistics --tcl po/hu.po -l hu -d po/ 276 translated messages, 4 fuzzy translations. Generating catalog po/it.msg 288 translated messages. Generating catalog po/ja.msg msgfmt --statistics --tcl po/it.po -l it -d po/ msgfmt --statistics --tcl po/ja.po -l ja -d po/ Generating catalog po/pt_br.msg msgfmt --statistics --tcl po/pt_br.po -l pt_br -d po/ 283 translated messages, 6 untranslated messages. 284 translated messages. Generating catalog po/ru.msg 290 translated messages. Generating catalog po/sv.msg msgfmt --statistics --tcl po/ru.po -l ru -d po/ msgfmt --statistics --tcl po/sv.po -l sv -d po/ GEN gitk-wish 245 translated messages. 304 translated messages. make[2]: Leaving directory `/<>/gitk-git' make[2]: Entering directory `/<>/perl' make[3]: Entering directory `/<>/perl' /usr/bin/perl -pe "s<\Q++LOCALEDIR++\E>" blib/lib/Error.pm /usr/bin/perl -pe "s<\Q++LOCALEDIR++\E>" blib/lib/Git/SVN/Utils.pm /usr/bin/perl -pe "s<\Q++LOCALEDIR++\E>" blib/lib/Git/SVN/Ra.pm /usr/bin/perl -pe "s<\Q++LOCALEDIR++\E>" blib/lib/Git/SVN/Prompt.pm /usr/bin/perl -pe "s<\Q++LOCALEDIR++\E>" blib/lib/Git/SVN/Editor.pm /usr/bin/perl -pe "s<\Q++LOCALEDIR++\E>" blib/lib/Git/I18N.pm /usr/bin/perl -pe "s<\Q++LOCALEDIR++\E>" blib/lib/Git/SVN/Fetcher.pm /usr/bin/perl -pe "s<\Q++LOCALEDIR++\E>" blib/lib/Git/SVN/GlobSpec.pm /usr/bin/perl -pe "s<\Q++LOCALEDIR++\E>" blib/lib/Git/SVN/Migration.pm /usr/bin/perl -pe "s<\Q++LOCALEDIR++\E>" blib/lib/Git/SVN/Memoize/YAML.pm /usr/bin/perl -pe "s<\Q++LOCALEDIR++\E>" blib/lib/Git/SVN.pm /usr/bin/perl -pe "s<\Q++LOCALEDIR++\E>" blib/lib/Git/IndexInfo.pm /usr/bin/perl -pe "s<\Q++LOCALEDIR++\E>" blib/lib/Git.pm /usr/bin/perl -pe "s<\Q++LOCALEDIR++\E>" blib/lib/Git/SVN/Log.pm Manifying blib/man3/Git::SVN::Editor.3pm Manifying blib/man3/Git::SVN::Ra.3pm Manifying blib/man3/Git::SVN::Memoize::YAML.3pm Manifying blib/man3/Git.3pm Manifying blib/man3/private-Error.3pm Manifying blib/man3/Git::I18N.3pm Manifying blib/man3/Git::SVN::Prompt.3pm Manifying blib/man3/Git::SVN::Fetcher.3pm Manifying blib/man3/Git::SVN::Utils.3pm make[3]: Leaving directory `/<>/perl' make[2]: Leaving directory `/<>/perl' make[2]: Entering directory `/<>/templates' make[2]: Leaving directory `/<>/templates' make[1]: Leaving directory `/<>' DESTDIR='/<>/debian/git' /usr/bin/make -C contrib/subtree all 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 NO_PYTHON=1 USE_SRV_RR=1 USE_LIBPCRE=1 THREADED_DELTA_SEARCH=1 NO_CROSS_DIRECTORY_HARDLINKS=1 NO_INSTALL_HARDLINKS=1 DEFAULT_PAGER=pager DEFAULT_EDITOR=editor CC='gcc' CFLAGS='-Wall -g -O2 -fstack-protector --param=ssp-buffer-size=4 -Wformat -Werror=format-security -D_FORTIFY_SOURCE=2' LDFLAGS='-Wl,-Bsymbolic-functions -Wl,-z,relro' make[1]: Entering directory `/<>/contrib/subtree' cp git-subtree.sh git-subtree && chmod +x git-subtree make[1]: Leaving directory `/<>/contrib/subtree' ln -s contrib/subtree/git-subtree test -z 'test' || \ DESTDIR='/<>/debian/git' /usr/bin/make test 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 NO_PYTHON=1 USE_SRV_RR=1 USE_LIBPCRE=1 THREADED_DELTA_SEARCH=1 NO_CROSS_DIRECTORY_HARDLINKS=1 NO_INSTALL_HARDLINKS=1 DEFAULT_PAGER=pager DEFAULT_EDITOR=editor CC='gcc' CFLAGS='-Wall -g -O2 -fstack-protector --param=ssp-buffer-size=4 -Wformat -Werror=format-security -D_FORTIFY_SOURCE=2' LDFLAGS='-Wl,-Bsymbolic-functions -Wl,-z,relro' || \ GIT_TEST_OPTS=--verbose DESTDIR='/<>/debian/git' /usr/bin/make test 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 NO_PYTHON=1 USE_SRV_RR=1 USE_LIBPCRE=1 THREADED_DELTA_SEARCH=1 NO_CROSS_DIRECTORY_HARDLINKS=1 NO_INSTALL_HARDLINKS=1 DEFAULT_PAGER=pager DEFAULT_EDITOR=editor CC='gcc' CFLAGS='-Wall -g -O2 -fstack-protector --param=ssp-buffer-size=4 -Wformat -Werror=format-security -D_FORTIFY_SOURCE=2' LDFLAGS='-Wl,-Bsymbolic-functions -Wl,-z,relro' make[1]: Entering directory `/<>' GEN perl/PM.stamp make[2]: Entering directory `/<>/gitweb' make[2]: Entering directory `/<>/perl' /usr/bin/perl Makefile.PL PREFIX='/usr' INSTALL_BASE='' --localedir='/usr/share/locale' make[3]: Entering directory `/<>' make[3]: `GIT-VERSION-FILE' is up to date. make[3]: Leaving directory `/<>' make[2]: Leaving directory `/<>/gitweb' GEN git-instaweb Writing perl.mak for Git Writing MYMETA.yml and MYMETA.json make[2]: Leaving directory `/<>/perl' GEN git-add--interactive GEN git-difftool GEN git-archimport GEN git-cvsexportcommit GEN git-cvsimport GEN git-cvsserver GEN git-relink GEN git-send-email GEN git-svn make[2]: Entering directory `/<>/git-gui' make[2]: Leaving directory `/<>/git-gui' make[2]: Entering directory `/<>/gitk-git' make[2]: Leaving directory `/<>/gitk-git' make[2]: Entering directory `/<>/perl' make[3]: Entering directory `/<>/perl' /usr/bin/perl -pe "s<\Q++LOCALEDIR++\E>" blib/lib/Git/SVN/Log.pm /usr/bin/perl -pe "s<\Q++LOCALEDIR++\E>" blib/lib/Git/SVN/GlobSpec.pm /usr/bin/perl -pe "s<\Q++LOCALEDIR++\E>" blib/lib/Git/SVN.pm /usr/bin/perl -pe "s<\Q++LOCALEDIR++\E>" blib/lib/Git/SVN/Editor.pm /usr/bin/perl -pe "s<\Q++LOCALEDIR++\E>" blib/lib/Git/I18N.pm /usr/bin/perl -pe "s<\Q++LOCALEDIR++\E>" blib/lib/Git/SVN/Prompt.pm /usr/bin/perl -pe "s<\Q++LOCALEDIR++\E>" blib/lib/Git/SVN/Memoize/YAML.pm /usr/bin/perl -pe "s<\Q++LOCALEDIR++\E>" blib/lib/Git/SVN/Ra.pm /usr/bin/perl -pe "s<\Q++LOCALEDIR++\E>" blib/lib/Git/SVN/Utils.pm /usr/bin/perl -pe "s<\Q++LOCALEDIR++\E>" blib/lib/Git.pm /usr/bin/perl -pe "s<\Q++LOCALEDIR++\E>" blib/lib/Git/IndexInfo.pm /usr/bin/perl -pe "s<\Q++LOCALEDIR++\E>" blib/lib/Git/SVN/Fetcher.pm /usr/bin/perl -pe "s<\Q++LOCALEDIR++\E>" blib/lib/Git/SVN/Migration.pm /usr/bin/perl -pe "s<\Q++LOCALEDIR++\E>" blib/lib/Error.pm make[3]: Leaving directory `/<>/perl' make[2]: Leaving directory `/<>/perl' make[2]: Entering directory `/<>/templates' make[2]: Leaving directory `/<>/templates' /usr/bin/make -C t/ all make[2]: Entering directory `/<>/t' rm -f -r 'test-results' /usr/bin/make aggregate-results-and-cleanup make[3]: Entering directory `/<>/t' *** t0000-basic.sh *** *** t0001-init.sh *** *** t0002-gitfile.sh *** *** t0003-attributes.sh *** ok 1 - .git/objects should be empty after git init in an empty repo ok 1 - initial setup ok 1 - plain ok 2 - .git/objects should have 3 subdirectories ok 3 - success is reported like this ok 2 - bad setup: invalid .git file format ok 1 - setup ok 3 - bad setup: invalid .git file path ok 4 - final setup + check rev-parse --git-dir ok 2 - plain nested in bare ok 5 - check hash-object ok 6 - check cat-file ok 3 - plain through aliased command, outside any git repo ok 2 - command line checks not ok 4 - plain nested through aliased command # TODO known breakage ok 4 - pretend we have a fully passing test suite ok 7 - check update-index ok 8 - check write-tree ok 9 - check commit-tree not ok 5 - plain nested in bare through aliased command # TODO known breakage ok 10 - check rev-list # passed all 10 test(s) 1..10 ok 6 - plain with GIT_WORK_TREE *** t0004-unwritable.sh *** ok 7 - plain bare ok 8 - plain bare with GIT_WORK_TREE ok 5 - pretend we have a partially passing test suite ok 9 - GIT_DIR bare ok 10 - init --bare ok 1 - setup ok 11 - GIT_DIR non-bare ok 2 - write-tree should notice unwritable repository ok 3 - attribute test ok 3 - commit should notice unwritable repository ok 4 - update-index should notice unwritable repository ok 5 - add should notice unwritable repository # passed all 5 test(s) 1..5 ok 12 - GIT_DIR & GIT_WORK_TREE (1) ok 6 - pretend we have a known breakage *** t0005-signals.sh *** ok 13 - GIT_DIR & GIT_WORK_TREE (2) ok 14 - reinit ok 1 - sigchain works ok 7 - pretend we have fixed a known breakage ok 2 - signals are propagated using shell convention # passed all 2 test(s) 1..2 ok 15 - init with --template *** t0006-date.sh *** ok 16 - init with --template (blank) ok 4 - attribute matching is case sensitive when core.ignorecase=0 ok 1 - relative date (5 seconds ago) ok 2 - relative date (5 minutes ago) ok 3 - relative date (5 hours ago) ok 17 - init with init.templatedir set ok 4 - relative date (5 days ago) ok 5 - relative date (3 weeks ago) ok 6 - relative date (5 months ago) ok 8 - pretend we have fixed one of two known breakages (run in sub test-lib) ok 7 - relative date (1 year, 2 months ago) ok 8 - relative date (1 year, 9 months ago) ok 18 - init --bare/--shared overrides system/global config ok 9 - relative date (20 years ago) ok 10 - relative date (12 months ago) ok 11 - relative date (2 years ago) ok 12 - parse date (2008) ok 19 - init honors global core.sharedRepository ok 13 - parse date (2008-02) ok 14 - parse date (2008-02-14) ok 5 - attribute matching is case insensitive when core.ignorecase=1 ok 15 - parse date (2008-02-14 20:30:45) ok 20 - init rejects insanely long --template ok 6 # skip additional case insensitivity tests (missing CASE_INSENSITIVE_FS) ok 9 - pretend we have a pass, fail, and known breakage ok 16 - parse date (2008-02-14 20:30:45 -0500) ok 17 - parse date (2008-02-14 20:30:45 -0015) ok 21 - init creates a new directory ok 18 - parse date (2008-02-14 20:30:45 -5) ok 22 - init creates a new bare directory ok 19 - parse date (2008-02-14 20:30:45 -5:) ok 7 - unnormalized paths ok 20 - parse date (2008-02-14 20:30:45 -05) ok 21 - parse date (2008-02-14 20:30:45 -:30) ok 23 - init recreates a directory ok 22 - parse date (2008-02-14 20:30:45 -05:00) ok 23 - parse date (2008-02-14 20:30:45 TZ=EST5) ok 24 - parse approxidate (now) ok 24 - init recreates a new bare directory ok 10 - pretend we have a mix of all possible results ok 25 - parse approxidate (5 seconds ago) ok 26 - parse approxidate (5.seconds.ago) ok 27 - parse approxidate (10.minutes.ago) ok 28 - parse approxidate (yesterday) ok 8 - relative paths ok 25 - init creates a new deep directory ok 29 - parse approxidate (3.days.ago) ok 30 - parse approxidate (3.weeks.ago) ok 31 - parse approxidate (3.months.ago) ok 32 - parse approxidate (2.years.3.months.ago) ok 9 - prefixes are not confused with leading directories ok 33 - parse approxidate (6am yesterday) ok 26 - init creates a new deep directory (umask vs. shared) ok 11 - test --verbose ok 27 - init notices EEXIST (1) ok 34 - parse approxidate (6pm yesterday) ok 28 - init notices EEXIST (2) ok 35 - parse approxidate (3:00) ok 29 - init notices EPERM ok 36 - parse approxidate (15:00) ok 30 - init creates a new bare directory with global --bare ok 10 - core.attributesfile ok 37 - parse approxidate (noon today) ok 38 - parse approxidate (noon yesterday) ok 39 - parse approxidate (last tuesday) ok 40 - parse approxidate (July 5th) ok 11 - attribute test: read paths from stdin ok 12 - test --verbose-only ok 13 - test runs if prerequisite is satisfied ok 14 # skip unmet prerequisite causes test to be skipped (missing DONTHAVEIT) ok 15 - test runs if prerequisites are satisfied ok 16 # skip unmet prerequisites causes test to be skipped (missing DONTHAVEIT of HAVEIT,DONTHAVEIT) ok 17 # skip unmet prerequisites causes test to be skipped (missing DONTHAVEIT of DONTHAVEIT,HAVEIT) ok 31 - init prefers command line to GIT_DIR ok 18 - test runs if lazy prereq is satisfied ok 19 # skip missing lazy prereqs skip tests (missing !LAZY_TRUE) ok 20 - negative lazy prereqs checked ok 21 # skip missing negative lazy prereqs will skip (missing LAZY_FALSE) ok 32 - init with separate gitdir ok 22 - tests clean up after themselves ok 41 - parse approxidate (06/05/2009) ok 33 - re-init on .git file ok 12 - attribute test: --all option ok 42 - parse approxidate (06.05.2009) ok 43 - parse approxidate (Jun 6, 5AM) ok 13 - attribute test: --cached option ok 34 - re-init to update git link ok 44 - parse approxidate (5AM Jun 6) ok 14 - root subdir attribute test ok 45 - parse approxidate (6AM, June 7, 2009) # passed all 45 test(s) 1..45 *** t0007-git-var.sh *** ok 15 - negative patterns ok 35 - re-init to move gitdir ok 16 - patterns starting with exclamation ok 17 - "**" test ok 23 - tests clean up even on failures ok 24 - git update-index without --add should fail adding ok 25 - git update-index with --add should succeed ok 26 - writing tree out with git write-tree ok 27 - validate object ID of a known tree ok 28 - git update-index without --remove should fail removing ok 29 - git update-index with --remove should be able to remove ok 30 - git write-tree should be able to write an empty tree ok 31 - validate object ID of a known tree ok 36 - re-init to move gitdir symlink # still have 2 known breakage(s) # passed all remaining 34 test(s) 1..36 ok 18 - "**" with no slashes test ok 1 - get GIT_AUTHOR_IDENT ok 2 - get GIT_COMMITTER_IDENT *** t0008-ignores.sh *** ok 32 - adding various types of objects with git update-index --add ok 3 # skip requested identites are strict (missing !AUTOIDENT) ok 33 - showing stage with git ls-files --stage ok 19 - using --git-dir and --work-tree ok 4 - git var -l lists variables ok 34 - validate git ls-files output for a known tree ok 20 - setup bare ok 5 - git var -l lists config ok 35 - writing tree out with git write-tree ok 36 - validate object ID for a known tree ok 37 - showing tree with git ls-tree ok 6 - listing and asking for variables are exclusive ok 38 - git ls-tree output for a known tree # passed all 6 test(s) 1..6 ok 39 - showing tree with git ls-tree -r ok 40 - git ls-tree -r output for a known tree ok 41 - showing tree with git ls-tree -r -t *** t0009-prio-queue.sh *** ok 42 - git ls-tree -r output for a known tree ok 43 - writing partial tree out with git write-tree --prefix ok 44 - validate object ID for a known tree ok 45 - writing partial tree out with git write-tree --prefix ok 46 - validate object ID for a known tree ok 21 - bare repository: check that .gitattribute is ignored ok 47 - put invalid objects into the index ok 48 - writing this tree without --missing-ok ok 22 - bare repository: check that --cached honors index ok 1 - setup ok 49 - writing this tree with --missing-ok ok 1 - basic ordering ok 2 - . corner-case ok 2 - mixed put and get ok 50 - git read-tree followed by write-tree should be idempotent ok 51 - validate git diff-files output for a know cache/work tree state ok 3 - notice empty queue ok 3 - . corner-case with -q ok 52 - git update-index --refresh should succeed # passed all 3 test(s) 1..3 ok 53 - no diff after checkout and git update-index --refresh ok 4 - . corner-case with --quiet *** t0010-racy-git.sh *** ok 5 - . corner-case with -v ok 23 - bare repository: test info/attributes # passed all 23 test(s) 1..23 ok 6 - . corner-case with -v -n ok 54 - git commit-tree records the correct tree in a commit ok 7 - . corner-case with -v --non-matching *** t0020-crlf.sh *** ok 8 - . corner-case with --verbose ok 9 - . corner-case with --verbose -n ok 55 - git commit-tree records the correct parent in a commit ok 10 - . corner-case with --verbose --non-matching ok 1 - Racy GIT trial #0 part A ok 11 - empty command line ok 56 - git commit-tree omits duplicated parent in a commit ok 12 - empty command line with -q ok 57 - update-index D/F conflict ok 13 - empty command line with --quiet ok 14 - empty command line with -v ok 58 - very long name in the index handled sanely # passed all 58 test(s) 1..58 ok 15 - empty command line with -v -n ok 16 - empty command line with -v --non-matching ok 1 - setup ok 17 - empty command line with --verbose *** t0021-conversion.sh *** ok 18 - empty command line with --verbose -n ok 2 - safecrlf: autocrlf=input, all CRLF ok 19 - empty command line with --verbose --non-matching ok 3 - safecrlf: autocrlf=input, mixed LF/CRLF ok 20 - --stdin with empty STDIN ok 4 - safecrlf: autocrlf=true, all LF ok 5 - safecrlf: autocrlf=true mixed LF/CRLF ok 21 - --stdin with empty STDIN with -q ok 1 - setup ok 22 - --stdin with empty STDIN with --quiet ok 23 - --stdin with empty STDIN with -v ok 2 - check ok 24 - --stdin with empty STDIN with -v -n ok 25 - --stdin with empty STDIN with -v --non-matching ok 6 - safecrlf: print warning only once ok 7 - safecrlf: git diff demotes safecrlf=true to warn ok 2 - Racy GIT trial #0 part B ok 26 - --stdin with empty STDIN with --verbose ok 3 - Racy GIT trial #1 part A ok 8 - switch off autocrlf, safecrlf, reset HEAD ok 27 - --stdin with empty STDIN with --verbose -n ok 3 - expanded_in_repo ok 28 - --stdin with empty STDIN with --verbose --non-matching ok 29 - -q with multiple args ok 30 - --quiet with multiple args ok 9 - update with autocrlf=input ok 31 - -q -v ok 4 - filter shell-escaped filenames ok 32 - --quiet -v ok 33 - -q --verbose ok 5 - required filter success ok 34 - --quiet --verbose ok 10 - update with autocrlf=true ok 35 - --quiet with multiple args ok 6 - required filter smudge failure ok 36 - erroneous use of -- ok 37 - erroneous use of -- with -q ok 7 - required filter clean failure ok 8 # skip filter large file (missing EXPENSIVE) ok 38 - erroneous use of -- with --quiet # passed all 8 test(s) 1..8 ok 11 - checkout with autocrlf=true *** t0022-crlf-rename.sh *** ok 39 - erroneous use of -- with -v ok 40 - erroneous use of -- with -v -n ok 41 - erroneous use of -- with -v --non-matching ok 42 - erroneous use of -- with --verbose ok 12 - checkout with autocrlf=input ok 43 - erroneous use of -- with --verbose -n ok 44 - erroneous use of -- with --verbose --non-matching ok 13 - apply patch (autocrlf=input) ok 45 - --stdin with superfluous arg ok 14 - apply patch --cached (autocrlf=input) ok 1 - setup ok 46 - --stdin with superfluous arg with -q ok 2 - diff -M ok 15 - apply patch --index (autocrlf=input) # passed all 2 test(s) 1..2 ok 47 - --stdin with superfluous arg with --quiet ok 4 - Racy GIT trial #1 part B *** t0023-crlf-am.sh *** ok 5 - Racy GIT trial #2 part A ok 48 - --stdin with superfluous arg with -v ok 49 - --stdin with superfluous arg with -v -n ok 50 - --stdin with superfluous arg with -v --non-matching ok 16 - apply patch (autocrlf=true) ok 51 - --stdin with superfluous arg with --verbose ok 1 - setup ok 52 - --stdin with superfluous arg with --verbose -n ok 17 - apply patch --cached (autocrlf=true) ok 53 - --stdin with superfluous arg with --verbose --non-matching ok 54 - --stdin -z with superfluous arg ok 18 - apply patch --index (autocrlf=true) ok 55 - --stdin -z with superfluous arg with -q ok 19 - .gitattributes says two is binary ok 56 - --stdin -z with superfluous arg with --quiet ok 57 - --stdin -z with superfluous arg with -v ok 20 - .gitattributes says two is input ok 58 - --stdin -z with superfluous arg with -v -n ok 21 - .gitattributes says two and three are text ok 59 - --stdin -z with superfluous arg with -v --non-matching ok 60 - --stdin -z with superfluous arg with --verbose ok 22 - in-tree .gitattributes (1) ok 61 - --stdin -z with superfluous arg with --verbose -n ok 2 - am ok 62 - --stdin -z with superfluous arg with --verbose --non-matching # passed all 2 test(s) 1..2 ok 23 - in-tree .gitattributes (2) *** t0024-crlf-archive.sh *** ok 63 - -z without --stdin ok 24 - in-tree .gitattributes (3) ok 64 - -z without --stdin with -q ok 6 - Racy GIT trial #2 part B ok 65 - -z without --stdin with --quiet ok 7 - Racy GIT trial #3 part A ok 25 - in-tree .gitattributes (4) ok 1 - setup ok 66 - -z without --stdin with -v ok 2 - tar archive ok 67 - -z without --stdin with -v -n ok 68 - -z without --stdin with -v --non-matching ok 3 - zip archive # passed all 3 test(s) 1..3 *** t0025-crlf-auto.sh *** ok 69 - -z without --stdin with --verbose ok 70 - -z without --stdin with --verbose -n ok 71 - -z without --stdin with --verbose --non-matching ok 26 - checkout with existing .gitattributes ok 72 - -z without --stdin and superfluous arg ok 73 - -z without --stdin and superfluous arg with -q ok 74 - -z without --stdin and superfluous arg with --quiet ok 1 - setup ok 75 - -z without --stdin and superfluous arg with -v ok 76 - -z without --stdin and superfluous arg with -v -n ok 27 - checkout when deleting .gitattributes ok 77 - -z without --stdin and superfluous arg with -v --non-matching ok 2 - default settings cause no changes ok 28 - invalid .gitattributes (must not crash) ok 78 - -z without --stdin and superfluous arg with --verbose ok 3 - crlf=true causes a CRLF file to be normalized ok 79 - -z without --stdin and superfluous arg with --verbose -n ok 4 - text=true causes a CRLF file to be normalized ok 80 - -z without --stdin and superfluous arg with --verbose --non-matching ok 5 - eol=crlf gives a normalized file CRLFs with autocrlf=false ok 29 - setting up for new autocrlf tests ok 6 - eol=crlf gives a normalized file CRLFs with autocrlf=input ok 81 - needs work tree ok 8 - Racy GIT trial #3 part B ok 30 - report no change after setting autocrlf ok 9 - Racy GIT trial #4 part A ok 82 - needs work tree with -q ok 31 - files are clean after checkout ok 32 - LF only file gets CRLF with autocrlf ok 33 - Mixed file is still mixed with autocrlf ok 83 - needs work tree with --quiet ok 7 - eol=lf gives a normalized file LFs with autocrlf=true ok 34 - CRLF only file has CRLF with autocrlf ok 84 - needs work tree with -v ok 8 - autocrlf=true does not normalize CRLF files ok 85 - needs work tree with -v -n ok 35 - New CRLF file gets LF in repo ok 86 - needs work tree with -v --non-matching # passed all 35 test(s) 1..35 ok 9 - text=auto, autocrlf=true _does_ normalize CRLF files ok 87 - needs work tree with --verbose *** t0026-eol-config.sh *** ok 10 - text=auto, autocrlf=true does not normalize binary files ok 88 - needs work tree with --verbose -n ok 11 - eol=crlf _does_ normalize binary files # passed all 11 test(s) 1..11 ok 89 - needs work tree with --verbose --non-matching *** t0030-stripspace.sh *** ok 90 - non-existent file at top-level not ignored ok 1 - setup ok 91 - non-existent file at top-level not ignored with -q ok 1 - long lines without spaces should be unchanged ok 92 - non-existent file at top-level not ignored with --quiet ok 93 - non-existent file at top-level not ignored with -v ok 2 - eol=lf puts LFs in normalized file ok 2 - lines with spaces at the beginning should be unchanged ok 94 - non-existent file at top-level not ignored with -v -n ok 3 - lines with intermediate spaces should be unchanged ok 95 - non-existent file at top-level not ignored with -v --non-matching ok 3 - eol=crlf puts CRLFs in normalized file ok 96 - non-existent file at top-level not ignored with --verbose ok 97 - non-existent file at top-level not ignored with --verbose -n ok 98 - non-existent file at top-level not ignored with --verbose --non-matching ok 4 - autocrlf=true overrides eol=lf ok 99 - non-existent file at top-level not ignored with --no-index ok 10 - Racy GIT trial #4 part B # passed all 10 test(s) 1..10 ok 100 - non-existent file at top-level not ignored with --no-index -q *** t0040-parse-options.sh *** ok 101 - non-existent file at top-level not ignored with --no-index --quiet ok 102 - non-existent file at top-level not ignored with --no-index -v ok 103 - non-existent file at top-level not ignored with --no-index -v -n ok 5 - autocrlf=true overrides unset eol ok 4 - consecutive blank lines should be unified # passed all 5 test(s) 1..5 *** t0050-filesystem.sh *** ok 104 - non-existent file at top-level not ignored with --no-index -v --non-matching ok 105 - non-existent file at top-level not ignored with --no-index --verbose ok 106 - non-existent file at top-level not ignored with --no-index --verbose -n ok 1 - test help ok 2 - OPT_BOOL() #1 ok 107 - non-existent file at top-level not ignored with --no-index --verbose --non-matching ok 3 - OPT_BOOL() #2 ok 4 - OPT_BOOL() #3 ok 5 - only consecutive blank lines should be completely removed ok 5 - OPT_BOOL() #4 ok 6 - OPT_BOOL() #5 ok 108 - non-existent file at top-level ignored ok 7 - OPT_BOOL() is idempotent #1 ok 8 - OPT_BOOL() is idempotent #2 ok 9 - OPT_BOOL() negation #1 ok 109 - non-existent file at top-level ignored with -q ok 1 - detection of case insensitive filesystem during repo init ok 10 - OPT_BOOL() negation #2 ok 11 - OPT_BOOL() no negation #1 ok 2 - detection of filesystem w/o symlink support during repo init ok 110 - non-existent file at top-level ignored with --quiet ok 12 - OPT_BOOL() no negation #2 ok 111 - non-existent file at top-level ignored with -v ok 13 - OPT_BOOL() positivation ok 112 - non-existent file at top-level ignored with -v -n ok 14 - short options ok 15 - long options ok 113 - non-existent file at top-level ignored with -v --non-matching ok 16 - missing required value ok 6 - consecutive blank lines at the beginning should be removed ok 3 - setup case tests ok 17 - intermingled arguments ok 4 - rename (case change) ok 114 - non-existent file at top-level ignored with --verbose ok 18 - unambiguously abbreviated option ok 115 - non-existent file at top-level ignored with --verbose -n ok 19 - unambiguously abbreviated option with "=" ok 20 - ambiguously abbreviated option ok 21 - non ambiguous option (after two options it abbreviates) ok 116 - non-existent file at top-level ignored with --verbose --non-matching ok 22 - detect possible typos ok 5 - merge (case change) ok 6 # skip add (with different case) (missing CASE_INSENSITIVE_FS) ok 23 - detect possible typos ok 117 - non-existent file at top-level ignored with --no-index ok 24 - keep some options as arguments ok 25 - OPT_DATE() and OPT_SET_PTR() work ok 118 - non-existent file at top-level ignored with --no-index -q ok 26 - OPT_CALLBACK() and OPT_BIT() work ok 119 - non-existent file at top-level ignored with --no-index --quiet ok 27 - OPT_CALLBACK() and callback errors work ok 120 - non-existent file at top-level ignored with --no-index -v ok 28 - OPT_BIT() and OPT_SET_INT() work ok 29 - OPT_NEGBIT() and OPT_SET_INT() work ok 121 - non-existent file at top-level ignored with --no-index -v -n ok 7 - setup unicode normalization tests ok 30 - OPT_BIT() works ok 31 - OPT_NEGBIT() works ok 8 - rename (silent unicode normalization) ok 7 - consecutive blank lines at the end should be removed ok 32 - OPT_COUNTUP() with PARSE_OPT_NODASH works ok 122 - non-existent file at top-level ignored with --no-index -v --non-matching ok 33 - OPT_NUMBER_CALLBACK() works ok 34 - negation of OPT_NONEG flags is not ambiguous ok 123 - non-existent file at top-level ignored with --no-index --verbose ok 35 - --list keeps list of strings ok 9 - merge (silent unicode normalization) ok 124 - non-existent file at top-level ignored with --no-index --verbose -n ok 36 - --no-list resets list # passed all 9 test(s) 1..9 ok 125 - non-existent file at top-level ignored with --no-index --verbose --non-matching ok 8 - text without newline at end should end with newline # passed all 36 test(s) 1..36 ok 126 - existing untracked file at top-level not ignored *** t0055-beyond-symlinks.sh *** ok 127 - existing untracked file at top-level not ignored with -q *** t0056-git-C.sh *** ok 128 - existing untracked file at top-level not ignored with --quiet ok 129 - existing untracked file at top-level not ignored with -v ok 9 - text plus spaces without newline at end should end with newline ok 130 - existing untracked file at top-level not ignored with -v -n ok 1 - setup ok 131 - existing untracked file at top-level not ignored with -v --non-matching ok 2 - update-index --add beyond symlinks ok 132 - existing untracked file at top-level not ignored with --verbose ok 3 - add beyond symlinks ok 10 - text plus spaces without newline at end should not show spaces ok 1 - "git -C " runs git from the directory ok 133 - existing untracked file at top-level not ignored with --verbose -n ok 134 - existing untracked file at top-level not ignored with --verbose --non-matching # passed all 3 test(s) 1..3 ok 135 - existing untracked file at top-level not ignored with --no-index *** t0060-path-utils.sh *** ok 2 - Multiple -C options: "-C dir1 -C dir2" is equivalent to "-C dir1/dir2" ok 11 - text plus spaces without newline should show the correct lines ok 136 - existing untracked file at top-level not ignored with --no-index -q ok 137 - existing untracked file at top-level not ignored with --no-index --quiet ok 138 - existing untracked file at top-level not ignored with --no-index -v ok 3 - Effect on --git-dir option: "-C c --git-dir=a.git" is equivalent to "--git-dir c/a.git" ok 139 - existing untracked file at top-level not ignored with --no-index -v -n ok 4 - Order should not matter: "--git-dir=a.git -C c" is equivalent to "-C c --git-dir=a.git" ok 12 - text plus spaces at end should not show spaces ok 140 - existing untracked file at top-level not ignored with --no-index -v --non-matching ok 5 - Effect on --work-tree option: "-C c/a.git --work-tree=../a" is equivalent to "--work-tree=c/a --git-dir=c/a.git" ok 141 - existing untracked file at top-level not ignored with --no-index --verbose ok 6 - Order should not matter: "--work-tree=../a -C c/a.git" is equivalent to "-C c/a.git --work-tree=../a" ok 142 - existing untracked file at top-level not ignored with --no-index --verbose -n ok 143 - existing untracked file at top-level not ignored with --no-index --verbose --non-matching ok 1 - normalize path: => ok 7 - 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" ok 13 - text plus spaces at end should be cleaned and newline must remain ok 2 - normalize path: . => ok 3 - normalize path: ./ => ok 4 - normalize path: ./. => ok 8 - 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" ok 5 - normalize path: ./.. => ++failed++ ok 6 - normalize path: ../. => ++failed++ ok 144 - existing tracked file at top-level not ignored ok 14 - spaces with newline at end should be replaced with empty string ok 9 - 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" ok 145 - existing tracked file at top-level not ignored with -q ok 7 - normalize path: ./../.// => ++failed++ ok 10 - Relative followed by fullpath: "-C ./here -C /there" is equivalent to "-C /there" ok 8 - normalize path: dir/.. => # passed all 10 test(s) 1..10 ok 9 - normalize path: dir/sub/../.. => ok 146 - existing tracked file at top-level not ignored with --quiet ok 147 - existing tracked file at top-level not ignored with -v *** t0061-run-command.sh *** ok 10 - normalize path: dir/sub/../../.. => ++failed++ ok 15 - spaces without newline at end should not show spaces ok 11 - normalize path: dir => dir ok 148 - existing tracked file at top-level not ignored with -v -n ok 12 - normalize path: dir// => dir/ ok 149 - existing tracked file at top-level not ignored with -v --non-matching ok 13 - normalize path: ./dir => dir ok 16 - spaces without newline at end should be replaced with empty string ok 150 - existing tracked file at top-level not ignored with --verbose ok 14 - normalize path: dir/. => dir/ ok 15 - normalize path: dir///./ => dir/ ok 1 - start_command reports ENOENT ok 151 - existing tracked file at top-level not ignored with --verbose -n ok 16 - normalize path: dir//sub/.. => dir/ ok 152 - existing tracked file at top-level not ignored with --verbose --non-matching ok 17 - consecutive text lines should be unchanged ok 17 - normalize path: dir/sub/../ => dir/ ok 2 - run_command can run a command ok 18 - normalize path: dir/sub/../. => dir/ ok 18 - strip comments, too ok 3 - run_command reports EACCES ok 19 - normalize path: dir/s1/../s2/ => dir/s2/ ok 153 - existing tracked file at top-level shown as ignored with --no-index ok 19 - strip comments with changed comment char ok 20 - normalize path: d1/s1///s2/..//../s3/ => d1/s3/ ok 21 - normalize path: d1/s1//../s2/../../d2 => d2 ok 154 - existing tracked file at top-level shown as ignored with --no-index -q ok 20 - -c with single line ok 22 - normalize path: d1/.../d2 => d1/.../d2 ok 4 - unreadable directory in PATH ok 23 - normalize path: d1/..././../d2 => d1/d2 ok 155 - existing tracked file at top-level shown as ignored with --no-index --quiet ok 21 - -c with single line followed by empty line # passed all 4 test(s) 1..4 ok 156 - existing tracked file at top-level shown as ignored with --no-index -v ok 24 - normalize path: / => / ok 22 - -c with newline only ok 157 - existing tracked file at top-level shown as ignored with --no-index -v -n ok 23 - --comment-lines with single line ok 25 - normalize path: // => / *** t0062-revision-walking.sh *** ok 158 - existing tracked file at top-level shown as ignored with --no-index -v --non-matching ok 24 - -c with changed comment char # passed all 24 test(s) 1..24 ok 26 - normalize path: /// => / ok 27 - normalize path: /. => / ok 159 - existing tracked file at top-level shown as ignored with --no-index --verbose ok 28 - normalize path: /./ => / *** t0063-string-list.sh *** ok 160 - existing tracked file at top-level shown as ignored with --no-index --verbose -n ok 29 - normalize path: /./.. => ++failed++ ok 161 - existing tracked file at top-level shown as ignored with --no-index --verbose --non-matching ok 30 - normalize path: /../. => ++failed++ ok 31 - normalize path: /./../.// => ++failed++ ok 32 - normalize path: /dir/.. => / ok 162 - existing untracked file at top-level ignored ok 33 - normalize path: /dir/sub/../.. => / ok 34 - normalize path: /dir/sub/../../.. => ++failed++ ok 1 - split foo:bar:baz at :, max -1 ok 35 - normalize path: /dir => /dir ok 1 - setup ok 163 - existing untracked file at top-level ignored with -q ok 2 - revision walking can be done twice # passed all 2 test(s) 1..2 ok 36 - normalize path: /dir// => /dir/ ok 2 - split foo:bar:baz at :, max 0 ok 164 - existing untracked file at top-level ignored with --quiet ok 37 - normalize path: /./dir => /dir *** t0070-fundamental.sh *** ok 3 - split foo:bar:baz at :, max 1 ok 38 - normalize path: /dir/. => /dir/ ok 165 - existing untracked file at top-level ignored with -v ok 39 - normalize path: /dir///./ => /dir/ ok 40 - normalize path: /dir//sub/.. => /dir/ ok 41 - normalize path: /dir/sub/../ => /dir/ ok 42 - normalize path: //dir/sub/../. => /dir/ ok 4 - split foo:bar:baz at :, max 2 ok 166 - existing untracked file at top-level ignored with -v -n ok 43 - normalize path: /dir/s1/../s2/ => /dir/s2/ ok 44 - normalize path: /d1/s1///s2/..//../s3/ => /d1/s3/ ok 45 - normalize path: /d1/s1//../s2/../../d2 => /d2 ok 167 - existing untracked file at top-level ignored with -v --non-matching ok 5 - split foo:bar: at :, max -1 ok 1 - character classes (isspace, isalpha etc.) ok 46 - normalize path: /d1/.../d2 => /d1/.../d2 ok 168 - existing untracked file at top-level ignored with --verbose ok 2 - mktemp to nonexistent directory prints filename ok 47 - normalize path: /d1/..././../d2 => /d1/d2 ok 48 - longest ancestor: / / => -1 ok 49 - longest ancestor: /foo / => 0 ok 6 - split at :, max -1 ok 3 - mktemp to unwritable directory prints filename ok 50 - longest ancestor: /foo /fo => -1 ok 51 - longest ancestor: /foo /foo => -1 ok 52 - longest ancestor: /foo /bar => -1 ok 4 - git_mkstemps_mode does not fail if fd 0 is not open ok 53 - longest ancestor: /foo /foo/bar => -1 ok 5 - check for a bug in the regex routines ok 169 - existing untracked file at top-level ignored with --verbose -n # passed all 5 test(s) 1..5 ok 54 - longest ancestor: /foo /foo:/bar => -1 ok 55 - longest ancestor: /foo /:/foo:/bar => 0 ok 56 - longest ancestor: /foo /foo:/:/bar => 0 ok 170 - existing untracked file at top-level ignored with --verbose --non-matching ok 7 - split : at :, max -1 *** t0081-line-buffer.sh *** ok 57 - longest ancestor: /foo /:/bar:/foo => 0 ok 58 - longest ancestor: /foo/bar / => 0 ok 59 - longest ancestor: /foo/bar /fo => -1 ok 60 - longest ancestor: /foo/bar /foo => 4 ok 171 - existing untracked file at top-level ignored with --no-index ok 61 - longest ancestor: /foo/bar /foo/ba => -1 ok 62 - longest ancestor: /foo/bar /:/fo => 0 ok 8 - test filter_string_list ok 63 - longest ancestor: /foo/bar /foo:/foo/ba => 4 ok 64 - longest ancestor: /foo/bar /bar => -1 ok 65 - longest ancestor: /foo/bar /fo => -1 ok 172 - existing untracked file at top-level ignored with --no-index -q ok 66 - longest ancestor: /foo/bar /foo:/bar => 4 ok 67 - longest ancestor: /foo/bar /:/foo:/bar => 4 ok 68 - longest ancestor: /foo/bar /foo:/:/bar => 4 ok 1 - hello world ok 69 - longest ancestor: /foo/bar /:/bar:/fo => 0 ok 173 - existing untracked file at top-level ignored with --no-index --quiet ok 70 - longest ancestor: /foo/bar /:/bar => 0 ok 2 - 0-length read, send along greeting ok 71 - longest ancestor: /foo/bar /foo => 4 ok 72 - longest ancestor: /foo/bar /foo:/bar => 4 ok 73 - longest ancestor: /foo/bar /bar => -1 ok 74 - strip_path_suffix ok 9 - test remove_duplicates ok 3 - read from file descriptor ok 75 - absolute path rejects the empty string ok 174 - existing untracked file at top-level ignored with --no-index -v ok 76 - real path rejects the empty string # passed all 9 test(s) 1..9 ok 4 - skip, copy null byte *** t0090-cache-tree.sh *** ok 77 - real path works on absolute paths 1 ok 5 - read null byte ok 175 - existing untracked file at top-level ignored with --no-index -v -n ok 78 - real path works on absolute paths 2 ok 6 - long reads are truncated ok 7 - long copies are truncated ok 8 - long binary reads are truncated ok 176 - existing untracked file at top-level ignored with --no-index -v --non-matching ok 177 - existing untracked file at top-level ignored with --no-index --verbose ok 79 - real path removes extra leading slashes # passed all 8 test(s) 1..8 ok 178 - existing untracked file at top-level ignored with --no-index --verbose -n *** t0100-previous.sh *** ok 80 - real path removes other extra slashes ok 179 - existing untracked file at top-level ignored with --no-index --verbose --non-matching not ok 1 - initial commit has cache-tree # TODO known breakage ok 2 - read-tree HEAD establishes cache-tree ok 81 - real path works on symlinks ok 180 - mix of file types at top-level ok 82 - relative path: /foo/a/b/c/ /foo/a/b/ => c/ ok 3 - git-add invalidates cache-tree ok 83 - relative path: /foo/a/b/c/ /foo/a/b => c/ ok 181 - mix of file types at top-level with -v ok 84 - relative path: /foo/a//b//c/ ///foo/a/b// => c/ ok 182 - mix of file types at top-level with -v -n ok 85 - relative path: /foo/a/b /foo/a/b => ./ ok 183 - mix of file types at top-level with -v --non-matching ok 1 - branch -d @{-1} ok 86 - relative path: /foo/a/b/ /foo/a/b => ./ ok 4 - update-index invalidates cache-tree ok 87 - relative path: /foo/a /foo/a/b => ../ ok 184 - mix of file types at top-level with --verbose ok 88 - relative path: / /foo/a/b/ => ../../../ ok 89 - relative path: /foo/a/c /foo/a/b/ => ../c ok 2 - branch -d @{-12} when there is not enough switches yet ok 5 - write-tree establishes cache-tree ok 90 - relative path: /foo/a/c /foo/a/b => ../c ok 185 - mix of file types at top-level with --verbose -n ok 91 - relative path: /foo/x/y /foo/a/b/ => ../../x/y ok 92 - relative path: /foo/a/b => /foo/a/b ok 186 - mix of file types at top-level with --verbose --non-matching ok 6 - test-scrap-cache-tree works ok 93 - relative path: /foo/a/b => /foo/a/b ok 94 - relative path: foo/a/b/c/ foo/a/b/ => c/ ok 95 - relative path: foo/a/b/c/ foo/a/b => c/ ok 187 - mix of file types at top-level with --no-index ok 7 - second commit has cache-tree ok 96 - relative path: foo/a/b//c foo/a//b => c ok 97 - relative path: foo/a/b/ foo/a/b/ => ./ ok 188 - mix of file types at top-level with --no-index -v ok 98 - relative path: foo/a/b/ foo/a/b => ./ ok 99 - relative path: foo/a foo/a/b => ../ ok 189 - mix of file types at top-level with --no-index -v -n ok 100 - relative path: foo/x/y foo/a/b => ../../x/y ok 8 - reset --hard gives cache-tree ok 101 - relative path: foo/a/c foo/a/b => ../c ok 190 - mix of file types at top-level with --no-index -v --non-matching ok 191 - mix of file types at top-level with --no-index --verbose ok 102 - relative path: foo/a/b /foo/x/y => foo/a/b ok 103 - relative path: /foo/a/b foo/x/y => /foo/a/b ok 104 # skip relative path: d:/a/b D:/a/c => ../b (missing MINGW) ok 9 - reset --hard without index gives cache-tree ok 105 # skip relative path: C:/a/b D:/a/c => C:/a/b (missing MINGW) ok 192 - mix of file types at top-level with --no-index --verbose -n ok 106 - relative path: foo/a/b => foo/a/b ok 107 - relative path: foo/a/b => foo/a/b ok 108 - relative path: /foo/a/b => ./ ok 193 - mix of file types at top-level with --no-index --verbose --non-matching ok 109 - relative path: => ./ not ok 10 - checkout gives cache-tree # TODO known breakage # still have 2 known breakage(s) # passed all remaining 8 test(s) 1..10 *** t0101-at-syntax.sh *** ok 194 - non-existent file in subdir a/ not ignored ok 110 - relative path: => ./ ok 3 - merge @{-1} ok 111 - relative path: => ./ ok 195 - non-existent file in subdir a/ not ignored with -q ok 112 - relative path: => ./ ok 113 - relative path: /foo/a/b => ./ ok 196 - non-existent file in subdir a/ not ignored with --quiet # passed all 113 test(s) 1..113 ok 4 - merge @{-1}~1 ok 197 - non-existent file in subdir a/ not ignored with -v *** t0110-urlmatch-normalization.sh *** ok 198 - non-existent file in subdir a/ not ignored with -v -n ok 1 - setup ok 199 - non-existent file in subdir a/ not ignored with -v --non-matching ok 2 - @{0} shows current ok 3 - @{1} shows old ok 200 - non-existent file in subdir a/ not ignored with --verbose ok 4 - @{now} shows current ok 201 - non-existent file in subdir a/ not ignored with --verbose -n ok 5 - merge @{-100} before checking out that many branches yet ok 5 - @{2001-09-17} (before the first commit) shows old # passed all 5 test(s) 1..5 ok 202 - non-existent file in subdir a/ not ignored with --verbose --non-matching ok 6 - silly approxidates work *** t0200-gettext-basic.sh *** ok 7 - notice misspelled upstream ok 8 - complain about total nonsense # passed all 8 test(s) 1..8 ok 203 - non-existent file in subdir a/ not ignored with --no-index *** t0201-gettext-fallbacks.sh *** ok 1 - url scheme ok 204 - non-existent file in subdir a/ not ignored with --no-index -q ok 205 - non-existent file in subdir a/ not ignored with --no-index --quiet ok 206 - non-existent file in subdir a/ not ignored with --no-index -v # lib-gettext: No is_IS UTF-8 locale available # lib-gettext: No is_IS ISO-8859-1 locale available ok 1 - sanity: $GIT_INTERNAL_GETTEXT_SH_SCHEME is set (to gnu) ok 2 - sanity: $TEXTDOMAIN is git ok 3 - xgettext sanity: Perl _() strings are not extracted ok 207 - non-existent file in subdir a/ not ignored with --no-index -v -n ok 208 - non-existent file in subdir a/ not ignored with --no-index -v --non-matching ok 4 - xgettext sanity: Comment extraction with --add-comments ok 5 - xgettext sanity: Comment extraction with --add-comments stops at statements ok 6 - sanity: $TEXTDOMAINDIR exists without NO_GETTEXT=YesPlease ok 7 - sanity: Icelandic locale was compiled ok 8 # skip sanity: gettext("") metadata is OK (missing GETTEXT_LOCALE) ok 9 # skip sanity: gettext(unknown) is passed through (missing GETTEXT_LOCALE) ok 10 # skip xgettext: C extraction of _() and N_() strings (missing GETTEXT_LOCALE) ok 11 # skip xgettext: C extraction with %s (missing GETTEXT_LOCALE) ok 12 # skip xgettext: Shell extraction (missing GETTEXT_LOCALE) ok 13 # skip xgettext: Shell extraction with $variable (missing GETTEXT_LOCALE) ok 14 # skip xgettext: Perl extraction (missing GETTEXT_LOCALE) ok 15 # skip xgettext: Perl extraction with %s (missing GETTEXT_LOCALE) ok 16 # skip sanity: Some gettext("") data for real locale (missing GETTEXT_LOCALE) # lib-gettext: No is_IS UTF-8 locale available # lib-gettext: No is_IS ISO-8859-1 locale available ok 1 - sanity: $GIT_INTERNAL_GETTEXT_SH_SCHEME is set (to fallthrough) ok 2 - sanity: $GIT_INTERNAL_GETTEXT_TEST_FALLBACKS is set ok 3 - sanity: $GIT_INTERNAL_GETTEXT_SH_SCHEME" is fallthrough ok 209 - non-existent file in subdir a/ not ignored with --no-index --verbose # passed all 16 test(s) 1..16 ok 4 - gettext: our gettext() fallback has pass-through semantics ok 210 - non-existent file in subdir a/ not ignored with --no-index --verbose -n *** t0202-gettext-perl.sh *** ok 211 - non-existent file in subdir a/ not ignored with --no-index --verbose --non-matching ok 5 - eval_gettext: our eval_gettext() fallback has pass-through semantics ok 212 - non-existent file in subdir a/ ignored ok 2 - url authority ok 6 - eval_gettext: our eval_gettext() fallback can interpolate variables ok 213 - non-existent file in subdir a/ ignored with -q # lib-gettext: No is_IS UTF-8 locale available # lib-gettext: No is_IS ISO-8859-1 locale available ok 214 - non-existent file in subdir a/ ignored with --quiet ok 7 - eval_gettext: our eval_gettext() fallback can interpolate variables with spaces ok 8 - eval_gettext: our eval_gettext() fallback can interpolate variables with spaces and quotes ok 215 - non-existent file in subdir a/ ignored with -v # passed all 8 test(s) 1..8 *** t0203-gettext-setlocale-sanity.sh *** # run 0: Perl Git::I18N API (perl /<>/t/t0202/test.pl) ok 216 - non-existent file in subdir a/ ignored with -v -n ok 217 - non-existent file in subdir a/ ignored with -v --non-matching # lib-gettext: No is_IS UTF-8 locale available # lib-gettext: No is_IS ISO-8859-1 locale available ok 218 - non-existent file in subdir a/ ignored with --verbose 1..8 ok 1 - Testing Git::I18N with NO Perl gettext library ok 2 - Git::I18N is located at /<>/t/../perl/blib/lib/Git/I18N.pm ok 3 - sanity: Git::I18N has 1 export(s) ok 4 - sanity: Git::I18N exports everything by default ok 5 - sanity: __ has a $ prototype ok 6 - Passing a string through __() in the C locale works ok 7 # skip GETTEXT_LOCALE must be set by lib-gettext.sh for exhaustive Git::I18N tests ok 8 # skip GETTEXT_LOCALE must be set by lib-gettext.sh for exhaustive Git::I18N tests # test_external test Perl Git::I18N API was ok ok 1 - git show a ISO-8859-1 commit under C locale ok 2 # skip git show a ISO-8859-1 commit under a UTF-8 locale (missing GETTEXT_LOCALE) # test_external_without_stderr test no stderr: Perl Git::I18N API was ok ok 3 - url port checks # passed all 2 test(s) 1..2 ok 219 - non-existent file in subdir a/ ignored with --verbose -n *** t0204-gettext-reencode-sanity.sh *** *** t0205-gettext-poison.sh *** ok 220 - non-existent file in subdir a/ ignored with --verbose --non-matching ok 4 - url port normalization ok 221 - non-existent file in subdir a/ ignored with --no-index # lib-gettext: No is_IS UTF-8 locale available # lib-gettext: No is_IS ISO-8859-1 locale available ok 1 # skip gettext: Emitting UTF-8 from our UTF-8 *.mo files / Icelandic (missing GETTEXT_LOCALE) ok 2 # skip gettext: Emitting UTF-8 from our UTF-8 *.mo files / Runes (missing GETTEXT_LOCALE) ok 3 # skip gettext: Emitting ISO-8859-1 from our UTF-8 *.mo files / Icelandic (missing GETTEXT_ISO_LOCALE) ok 4 # skip gettext: impossible ISO-8859-1 output (missing GETTEXT_ISO_LOCALE) ok 5 # skip gettext: Fetching a UTF-8 msgid -> UTF-8 (missing GETTEXT_LOCALE) ok 6 # skip gettext: Fetching a UTF-8 msgid -> ISO-8859-1 (missing GETTEXT_ISO_LOCALE) ok 7 # skip gettext.c: git init UTF-8 -> UTF-8 (missing GETTEXT_LOCALE) ok 8 # skip gettext.c: git init UTF-8 -> ISO-8859-1 (missing GETTEXT_ISO_LOCALE) # passed all 8 test(s) 1..8 # lib-gettext: No is_IS UTF-8 locale available # lib-gettext: No is_IS ISO-8859-1 locale available ok 1 # skip sanity: $GIT_INTERNAL_GETTEXT_SH_SCHEME is set (to gnu) (missing GETTEXT_POISON) ok 2 # skip sanity: $GIT_INTERNAL_GETTEXT_SH_SCHEME" is poison (missing GETTEXT_POISON) ok 3 # skip gettext: our gettext() fallback has poison semantics (missing GETTEXT_POISON) ok 4 # skip eval_gettext: our eval_gettext() fallback has poison semantics (missing GETTEXT_POISON) # passed all 4 test(s) 1..4 *** t0300-credentials.sh *** ok 5 - url general escapes ok 222 - non-existent file in subdir a/ ignored with --no-index -q *** t0301-credential-cache.sh *** ok 223 - non-existent file in subdir a/ ignored with --no-index --quiet ok 1 - setup helper scripts ok 224 - non-existent file in subdir a/ ignored with --no-index -v ok 6 - url high-bit escapes ok 7 - url username/password escapes ok 2 - credential_fill invokes helper ok 8 - url normalized lengths ok 225 - non-existent file in subdir a/ ignored with --no-index -v -n ok 226 - non-existent file in subdir a/ ignored with --no-index -v --non-matching ok 3 - credential_fill invokes multiple helpers ok 227 - non-existent file in subdir a/ ignored with --no-index --verbose ok 1 - helper (cache) has no existing data ok 4 - credential_fill stops when we get a full response ok 9 - url . and .. segments ok 228 - non-existent file in subdir a/ ignored with --no-index --verbose -n ok 2 - helper (cache) stores password ok 10 - url equivalents ok 229 - non-existent file in subdir a/ ignored with --no-index --verbose --non-matching # passed all 10 test(s) 1..10 *** t0302-credential-store.sh *** ok 3 - helper (cache) can retrieve password ok 5 - credential_fill continues through partial response ok 230 - existing untracked file in subdir a/ not ignored ok 6 - credential_fill passes along metadata ok 231 - existing untracked file in subdir a/ not ignored with -q ok 4 - helper (cache) requires matching protocol ok 232 - existing untracked file in subdir a/ not ignored with --quiet ok 233 - existing untracked file in subdir a/ not ignored with -v ok 7 - credential_approve calls all helpers ok 234 - existing untracked file in subdir a/ not ignored with -v -n ok 5 - helper (cache) requires matching host ok 8 - do not bother storing password-less credential ok 235 - existing untracked file in subdir a/ not ignored with -v --non-matching ok 236 - existing untracked file in subdir a/ not ignored with --verbose ok 1 - helper (store) has no existing data ok 6 - helper (cache) requires matching username ok 2 - helper (store) stores password ok 237 - existing untracked file in subdir a/ not ignored with --verbose -n ok 3 - helper (store) can retrieve password ok 238 - existing untracked file in subdir a/ not ignored with --verbose --non-matching ok 9 - credential_reject calls all helpers ok 4 - helper (store) requires matching protocol ok 239 - existing untracked file in subdir a/ not ignored with --no-index ok 10 - usernames can be preserved ok 240 - existing untracked file in subdir a/ not ignored with --no-index -q ok 7 - helper (cache) requires matching path ok 11 - usernames can be overridden ok 241 - existing untracked file in subdir a/ not ignored with --no-index --quiet ok 12 - do not bother completing already-full credential ok 5 - helper (store) requires matching host ok 242 - existing untracked file in subdir a/ not ignored with --no-index -v ok 243 - existing untracked file in subdir a/ not ignored with --no-index -v -n ok 244 - existing untracked file in subdir a/ not ignored with --no-index -v --non-matching ok 13 - empty helper list falls back to internal getpass ok 8 - helper (cache) can forget host ok 6 - helper (store) requires matching username ok 245 - existing untracked file in subdir a/ not ignored with --no-index --verbose ok 14 - internal getpass does not ask for known username ok 246 - existing untracked file in subdir a/ not ignored with --no-index --verbose -n ok 247 - existing untracked file in subdir a/ not ignored with --no-index --verbose --non-matching ok 15 - respect configured credentials ok 9 - helper (cache) can store multiple users ok 248 - existing tracked file in subdir a/ not ignored ok 7 - helper (store) requires matching path ok 249 - existing tracked file in subdir a/ not ignored with -q ok 250 - existing tracked file in subdir a/ not ignored with --quiet ok 16 - match configured credential ok 8 - helper (store) can forget host ok 10 - helper (cache) can forget user ok 251 - existing tracked file in subdir a/ not ignored with -v ok 11 - helper (cache) remembers other user ok 252 - existing tracked file in subdir a/ not ignored with -v -n ok 253 - existing tracked file in subdir a/ not ignored with -v --non-matching ok 17 - do not match configured credential ok 254 - existing tracked file in subdir a/ not ignored with --verbose ok 18 - pull username from config ok 255 - existing tracked file in subdir a/ not ignored with --verbose -n ok 9 - helper (store) can store multiple users ok 256 - existing tracked file in subdir a/ not ignored with --verbose --non-matching ok 19 - http paths can be part of context # passed all 19 test(s) 1..19 ok 257 - existing tracked file in subdir a/ shown as ignored with --no-index ok 10 - helper (store) can forget user *** t0303-credential-external.sh *** ok 258 - existing tracked file in subdir a/ shown as ignored with --no-index -q ok 11 - helper (store) remembers other user ok 259 - existing tracked file in subdir a/ shown as ignored with --no-index --quiet # passed all 11 test(s) 1..11 ok 260 - existing tracked file in subdir a/ shown as ignored with --no-index -v *** t1000-read-tree-m-3way.sh *** ok 261 - existing tracked file in subdir a/ shown as ignored with --no-index -v -n 1..0 # SKIP used to test external credential helpers *** t1001-read-tree-m-2way.sh *** ok 262 - existing tracked file in subdir a/ shown as ignored with --no-index -v --non-matching ok 263 - existing tracked file in subdir a/ shown as ignored with --no-index --verbose ok 1 - adding test file NN and Z/NN ok 264 - existing tracked file in subdir a/ shown as ignored with --no-index --verbose -n ok 265 - existing tracked file in subdir a/ shown as ignored with --no-index --verbose --non-matching ok 2 - adding test file ND and Z/ND ok 266 - existing untracked file in subdir a/ ignored ok 3 - adding test file NM and Z/NM ok 267 - existing untracked file in subdir a/ ignored with -q ok 268 - existing untracked file in subdir a/ ignored with --quiet ok 4 - adding test file DN and Z/DN ok 269 - existing untracked file in subdir a/ ignored with -v ok 5 - adding test file DD and Z/DD ok 270 - existing untracked file in subdir a/ ignored with -v -n ok 1 - setup ok 6 - adding test file DM and Z/DM ok 7 - adding test file MN and Z/MN ok 271 - existing untracked file in subdir a/ ignored with -v --non-matching ok 2 - 1, 2, 3 - no carry forward ok 272 - existing untracked file in subdir a/ ignored with --verbose ok 8 - adding test file MD and Z/MD ok 273 - existing untracked file in subdir a/ ignored with --verbose -n ok 9 - adding test file MM and Z/MM ok 10 - adding test file SS ok 11 - adding test file TT ok 274 - existing untracked file in subdir a/ ignored with --verbose --non-matching ok 12 - prepare initial tree ok 13 - change in branch A (removal) ok 3 - 4 - carry forward local addition. ok 275 - existing untracked file in subdir a/ ignored with --no-index ok 14 - change in branch A (modification) ok 15 - change in branch A (modification) ok 16 - change in branch A (modification) ok 276 - existing untracked file in subdir a/ ignored with --no-index -q ok 17 - change in branch A (modification) ok 277 - existing untracked file in subdir a/ ignored with --no-index --quiet ok 18 - change in branch A (modification) ok 278 - existing untracked file in subdir a/ ignored with --no-index -v ok 19 - change in branch A (modification) ok 279 - existing untracked file in subdir a/ ignored with --no-index -v -n ok 20 - change in branch A (addition) ok 21 - change in branch A (addition) ok 280 - existing untracked file in subdir a/ ignored with --no-index -v --non-matching ok 22 - change in branch A (addition) ok 23 - change in branch A (addition) ok 281 - existing untracked file in subdir a/ ignored with --no-index --verbose ok 24 - change in branch A (addition) ok 4 - 5 - carry forward local addition. ok 25 - change in branch A (edit) ok 282 - existing untracked file in subdir a/ ignored with --no-index --verbose -n ok 26 - change in branch A (change file to directory) ok 283 - existing untracked file in subdir a/ ignored with --no-index --verbose --non-matching ok 27 - recording branch A tree ok 284 - mix of file types in subdir a/ ok 285 - mix of file types in subdir a/ with -v ok 5 - 6 - local addition already has the same. ok 28 - reading original tree and checking out ok 286 - mix of file types in subdir a/ with -v -n ok 29 - change in branch B (removal) ok 30 - change in branch B (modification) ok 12 - helper (cache --timeout=1) times out ok 31 - change in branch B (modification) ok 287 - mix of file types in subdir a/ with -v --non-matching ok 32 - change in branch B (modification) ok 33 - change in branch B (modification) ok 34 - change in branch B (modification) # passed all 12 test(s) 1..12 ok 288 - mix of file types in subdir a/ with --verbose ok 35 - change in branch B (modification) ok 289 - mix of file types in subdir a/ with --verbose -n ok 36 - change in branch B (addition) ok 6 - 7 - local addition already has the same. ok 290 - mix of file types in subdir a/ with --verbose --non-matching ok 37 - change in branch B (addition) *** t1002-read-tree-m-u-2way.sh *** ok 38 - change in branch B (addition) ok 39 - change in branch B (addition) ok 291 - mix of file types in subdir a/ with --no-index ok 7 - 8 - conflicting addition. ok 40 - change in branch B (addition and modification) ok 292 - mix of file types in subdir a/ with --no-index -v ok 293 - mix of file types in subdir a/ with --no-index -v -n ok 41 - change in branch B (modification) ok 42 - change in branch B (addition of a file to conflict with directory) ok 294 - mix of file types in subdir a/ with --no-index -v --non-matching ok 43 - recording branch B tree ok 8 - 9 - conflicting addition. ok 295 - mix of file types in subdir a/ with --no-index --verbose ok 1 - setup ok 296 - mix of file types in subdir a/ with --no-index --verbose -n ok 44 - keep contents of 3 trees for easy access ok 297 - mix of file types in subdir a/ with --no-index --verbose --non-matching ok 9 - 10 - path removed. ok 298 - sub-directory local ignore ok 299 - sub-directory local ignore with --verbose ok 10 - 11 - dirty path removed. ok 45 - 3-way merge with git read-tree -m, empty cache ok 300 - local ignore inside a sub-directory ok 11 - 12 - unmatching local changes being removed. ok 301 - local ignore inside a sub-directory with --verbose ok 12 - 13 - unmatching local changes being removed. ok 302 - nested include ok 46 - 3-way merge with git read-tree -m, match H ok 2 - 1, 2, 3 - no carry forward ok 303 - nested include with -q ok 304 - nested include with --quiet ok 305 - nested include with -v ok 47 - 1 - must not have an entry not in A. ok 306 - nested include with -v -n ok 13 - 14 - unchanged in two heads. ok 307 - nested include with -v --non-matching ok 308 - nested include with --verbose ok 48 - 2 - must match B in !O && !A && B case. ok 3 - 4 - carry forward local addition. ok 309 - nested include with --verbose -n ok 49 - 2 - matching B alone is OK in !O && !A && B case. ok 310 - nested include with --verbose --non-matching ok 14 - 15 - unchanged in two heads. ok 311 - ignored sub-directory ok 312 - ignored sub-directory with -q ok 313 - ignored sub-directory with --quiet ok 15 - 16 - conflicting local change. ok 50 - 3 - must match A in !O && A && !B case. ok 314 - ignored sub-directory with -v ok 315 - ignored sub-directory with -v -n ok 16 - 17 - conflicting local change. ok 4 - 5 - carry forward local addition. ok 51 - 3 - matching A alone is OK in !O && A && !B case. ok 316 - ignored sub-directory with -v --non-matching ok 52 - 3 (fail) - must match A in !O && A && !B case. ok 317 - ignored sub-directory with --verbose ok 17 - 18 - local change already having a good result. ok 318 - ignored sub-directory with --verbose -n ok 319 - ignored sub-directory with --verbose --non-matching ok 320 - multiple files inside ignored sub-directory ok 53 - 4 - must match and be up-to-date in !O && A && B && A!=B case. ok 321 - multiple files inside ignored sub-directory with -v ok 18 - 19 - local change already having a good result, further modified. ok 5 - 6 - local addition already has the same. ok 54 - 4 (fail) - must match and be up-to-date in !O && A && B && A!=B case. ok 322 - cd to ignored sub-directory ok 323 - cd to ignored sub-directory with -v ok 324 - symlink ok 55 - 4 (fail) - must match and be up-to-date in !O && A && B && A!=B case. ok 325 - symlink with -q ok 19 - 20 - no local change, use new tree. ok 326 - symlink with --quiet ok 327 - symlink with -v ok 6 - 7 - local addition already has the same. ok 328 - symlink with -v -n ok 56 - 5 - must match in !O && A && B && A==B case. ok 329 - symlink with -v --non-matching ok 20 - 21 - no local change, dirty cache. ok 330 - symlink with --verbose ok 331 - symlink with --verbose -n ok 57 - 5 - must match in !O && A && B && A==B case. ok 7 - 8 - conflicting addition. ok 332 - symlink with --verbose --non-matching ok 21 - 22 - local change cache updated. ok 58 - 5 (fail) - must match A in !O && A && B && A==B case. ok 333 - beyond a symlink ok 334 - beyond a symlink with -q ok 8 - 9 - conflicting addition. ok 59 - 6 - must not exist in O && !A && !B case ok 335 - beyond a symlink with --quiet ok 22 - DF vs DF/DF case setup. ok 23 - DF vs DF/DF case test. ok 336 - beyond a symlink with -v ok 60 - 7 - must not exist in O && !A && B && O!=B case ok 337 - beyond a symlink with -v -n ok 9 - 10 - path removed. ok 338 - beyond a symlink with -v --non-matching ok 339 - beyond a symlink with --verbose ok 61 - 8 - must not exist in O && !A && B && O==B case ok 340 - beyond a symlink with --verbose -n ok 24 - a/b (untracked) vs a case setup. ok 341 - beyond a symlink with --verbose --non-matching ok 25 - a/b (untracked) vs a, plus c/d case test. ok 62 - 9 - must match and be up-to-date in O && A && !B && O!=A case ok 10 - 11 - dirty path removed. ok 342 - beyond a symlink from subdirectory ok 343 - beyond a symlink from subdirectory with -q ok 63 - 9 (fail) - must match and be up-to-date in O && A && !B && O!=A case ok 26 - a/b vs a, plus c/d case setup. ok 344 - beyond a symlink from subdirectory with --quiet ok 345 - beyond a symlink from subdirectory with -v ok 11 - 12 - unmatching local changes being removed. ok 64 - 9 (fail) - must match and be up-to-date in O && A && !B && O!=A case ok 346 - beyond a symlink from subdirectory with -v -n ok 347 - beyond a symlink from subdirectory with -v --non-matching ok 27 - a/b vs a, plus c/d case test. ok 348 - beyond a symlink from subdirectory with --verbose ok 349 - beyond a symlink from subdirectory with --verbose -n ok 350 - beyond a symlink from subdirectory with --verbose --non-matching ok 12 - 13 - unmatching local changes being removed. ok 351 - submodule ok 352 - submodule with -q ok 65 - 10 - must match and be up-to-date in O && A && !B && O==A case ok 28 - -m references the correct modified tree # passed all 28 test(s) 1..28 ok 353 - submodule with --quiet *** t1003-read-tree-prefix.sh *** ok 354 - submodule with -v ok 355 - submodule with -v -n ok 66 - 10 (fail) - must match and be up-to-date in O && A && !B && O==A case ok 356 - submodule with -v --non-matching ok 1 - setup ok 67 - 10 (fail) - must match and be up-to-date in O && A && !B && O==A case ok 357 - submodule with --verbose ok 358 - submodule with --verbose -n ok 2 - read-tree --prefix # passed all 2 test(s) 1..2 ok 13 - 14 - unchanged in two heads. ok 359 - submodule with --verbose --non-matching ok 68 - 11 - must match and be up-to-date in O && A && B && O!=A && O!=B && A!=B case *** t1004-read-tree-m-u-wf.sh *** ok 360 - submodule from subdirectory ok 361 - submodule from subdirectory with -q ok 69 - 11 (fail) - must match and be up-to-date in O && A && B && O!=A && O!=B && A!=B case ok 362 - submodule from subdirectory with --quiet ok 363 - submodule from subdirectory with -v ok 364 - submodule from subdirectory with -v -n ok 70 - 11 (fail) - must match and be up-to-date in O && A && B && O!=A && O!=B && A!=B case ok 365 - submodule from subdirectory with -v --non-matching ok 1 - two-way setup ok 366 - submodule from subdirectory with --verbose ok 2 - two-way not clobbering ok 3 - two-way with incorrect --exclude-per-directory (1) ok 367 - submodule from subdirectory with --verbose -n ok 14 - 15 - unchanged in two heads. ok 71 - 12 - must match A in O && A && B && O!=A && A==B case ok 368 - submodule from subdirectory with --verbose --non-matching ok 4 - two-way with incorrect --exclude-per-directory (2) ok 369 - global ignore not yet enabled ok 370 - global ignore ok 5 - two-way clobbering a ignored file ok 371 - global ignore with -v ok 15 - 16 - conflicting local change. ok 72 - 12 - must match A in O && A && B && O!=A && A==B case ok 372 - --stdin ok 73 - 12 (fail) - must match A in O && A && B && O!=A && A==B case ok 373 - --stdin -q ok 16 - 17 - conflicting local change. ok 6 - three-way not complaining on an untracked path in both ok 374 - --stdin -v ok 375 - --stdin -z ok 74 - 13 - must match A in O && A && B && O!=A && O==B case ok 376 - --stdin -z -q ok 7 - three-way not clobbering a working tree file ok 377 - --stdin -z -v ok 378 - -z --stdin ok 379 - -z --stdin -q ok 17 - 18 - local change already having a good result. ok 75 - 13 - must match A in O && A && B && O!=A && O==B case ok 380 - -z --stdin -v ok 8 - three-way not complaining on an untracked file ok 381 - --stdin from subdirectory ok 382 - --stdin from subdirectory with -v ok 76 - 14 - must match and be up-to-date in O && A && B && O==A && O!=B case ok 383 - --stdin from subdirectory with -v -n ok 9 - 3-way not overwriting local changes (setup) ok 18 - 19 - local change already having a good result, further modified. ok 384 - --stdin -z from subdirectory ok 385 - --stdin -z from subdirectory with -v ok 77 - 14 - may match B in O && A && B && O==A && O!=B case ok 386 - -z --stdin from subdirectory ok 10 - 3-way not overwriting local changes (our side) ok 78 - 14 (fail) - must match and be up-to-date in O && A && B && O==A && O!=B case ok 387 - -z --stdin from subdirectory with -v ok 11 - 3-way not overwriting local changes (their side) ok 79 - 14 (fail) - must match and be up-to-date in O && A && B && O==A && O!=B case ok 19 - 20 - no local change, use new tree. ok 388 - streaming support for --stdin # passed all 388 test(s) 1..388 *** t1005-read-tree-reset.sh *** ok 80 - 15 - must match A in O && A && B && O==A && O==B case ok 20 - 21 - no local change, dirty cache. ok 21 - DF vs DF/DF case setup. ok 12 - funny symlink in work tree ok 81 - 15 - must match A in O && A && B && O==A && O==B case ok 13 - funny symlink in work tree, un-unlink-able ok 1 - setup ok 82 - 15 (fail) - must match A in O && A && B && O==A && O==B case ok 22 - DF vs DF/DF case test. # passed all 22 test(s) 1..22 ok 14 - D/F setup ok 2 - reset should work *** t1006-cat-file.sh *** ok 83 - 16 - A matches in one and B matches in another. # passed all 83 test(s) 1..83 ok 15 - D/F ok 1 - setup ok 2 - blob exists ok 3 - Type of blob is correct ok 3 - reset should remove remnants from a failed merge ok 4 - Size of blob is correct *** t1007-hash-object.sh *** ok 5 - Content of blob is correct ok 6 - Pretty content of blob is correct ok 7 - --batch output of blob is correct ok 8 - --batch-check output of blob is correct ok 9 - custom --batch-check format ok 16 - D/F resolve ok 4 - two-way reset should remove remnants too ok 10 - --batch-check with %(rest) ok 1 - multiple '--stdin's are rejected ok 17 - D/F recursive ok 11 - --batch without type (blob) # passed all 17 test(s) 1..17 ok 12 - --batch without size (blob) *** t1008-read-tree-overlay.sh *** ok 2 - Can't use --stdin and --stdin-paths together ok 3 - Can't pass filenames as arguments with --stdin-paths ok 4 - Can't use --path with --stdin-paths ok 5 - Can't use --path with --no-filters ok 6 - hash a file ok 13 - --batch-check without %(rest) considers whole line ok 7 - blob does not exist in database ok 8 - hash from stdin ok 9 - blob does not exist in database ok 14 - tree exists ok 10 - hash a file and write to database ok 5 - Porcelain reset should remove remnants too ok 11 - blob exists in database ok 15 - Type of tree is correct ok 16 - Size of tree is correct ok 12 - git hash-object --stdin file1 with --batch fails ok 53 - Passing --batch with fails ok 54 - Passing sha1 with --batch fails ok 4 - reject . at end of path ok 55 - Passing -t with --batch-check fails ok 56 - Passing --batch-check with -t fails ok 57 - Passing -s with --batch-check fails ok 5 - reject . as subtree ok 58 - Passing --batch-check with -s fails ok 59 - Passing -e with --batch-check fails ok 5 - read-tree with empty .git/info/sparse-checkout ok 60 - Passing --batch-check with -e fails ok 6 - reject .. at end of path ok 61 - Passing -p with --batch-check fails ok 62 - Passing --batch-check with -p fails ok 7 - reject .. as subtree ok 63 - Passing with --batch-check fails ok 64 - Passing --batch-check with fails ok 65 - Passing sha1 with --batch-check fails ok 8 - reject .git at end of path ok 6 - match directories with trailing slash ok 66 - --batch-check for a non-existent named object ok 67 - --batch-check for a non-existent hash ok 68 - --batch for an existent and a non-existent hash ok 9 - reject .git as subtree ok 69 - --batch-check for an emtpy line ok 10 - reject .GIT at end of path ok 70 - empty --batch-check notices missing object ok 11 - reject .GIT as subtree ok 7 - match directories without trailing slash ok 71 - --batch with multiple sha1s gives correct format ok 12 - reject {u200c}.Git at end of path ok 72 - --batch-check with multiple sha1s gives correct format ok 13 - reject {u200c}.Git as subtree ok 14 - reject .gI{u200c}T at end of path ok 8 - match directories with negated patterns ok 15 - reject .gI{u200c}T as subtree ok 73 - setup blobs which are likely to delta ok 74 - confirm that neither loose blob is a delta ok 16 - reject .GiT{u200c} at end of path ok 17 - reject .GiT{u200c} as subtree ok 9 - match directories with negated patterns (2) ok 18 - reject git~1 at end of path ok 75 - %(deltabase) reports packed delta bases ok 19 - reject git~1 as subtree ok 20 - reject .git.{space} at end of path # passed all 75 test(s) 1..75 *** t1020-subdirectory.sh *** ok 21 - reject .git.{space} as subtree ok 22 - reject backslashes at end of path ok 10 - match directory pattern ok 23 - reject backslashes as subtree ok 24 - reject backslashes2 at end of path ok 25 - reject backslashes2 as subtree ok 1 - setup ok 11 - checkout area changes ok 2 - update-index and ls-files ok 26 - utf-8 paths allowed with core.protectHFS off # passed all 26 test(s) 1..26 *** t1021-rerere-in-workdir.sh *** ok 3 - cat-file ok 4 - diff-files ok 12 - read-tree updates worktree, absent case ok 5 - write-tree ok 6 - checkout-index ok 13 - read-tree updates worktree, dirty case ok 1 - setup ok 14 - read-tree removes worktree, dirty case ok 2 - rerere in workdir ok 15 - read-tree adds to worktree, absent case ok 7 - read-tree ok 1 - setup ok 8 - alias expansion ok 16 - read-tree adds to worktree, dirty case ok 9 - !alias expansion not ok 3 - rerere in workdir (relative) # TODO known breakage ok 17 - index removal and worktree narrowing at the same time ok 10 - GIT_PREFIX for !alias # still have 1 known breakage(s) # passed all remaining 2 test(s) 1..3 ok 2 - 3-way (1) *** t1050-large.sh *** ok 18 - read-tree --reset removes outside worktree ok 11 - GIT_PREFIX for built-ins ok 12 - no file/rev ambiguity check inside .git ok 19 - print errors when failed to update worktree ok 13 - no file/rev ambiguity check inside a bare repo ok 1 - setup ok 20 - checkout without --ignore-skip-worktree-bits ok 3 - 3-way (2) ok 14 - detection should not be fooled by a symlink ok 21 - checkout with --ignore-skip-worktree-bits # passed all 14 test(s) 1..14 # passed all 21 test(s) 1..21 *** t1051-large-conversion.sh *** ok 2 - add a large file or two *** t1060-object-corruption.sh *** ok 3 - checkout a large file ok 4 - 3-way (3) ok 1 - setup input tests ok 1 - setup corrupt repo ok 5 - 2-way (1) ok 2 - autocrlf=true converts on input # passed all 5 test(s) 1..5 ok 2 - setup repo with missing object ok 3 - eol=crlf converts on input *** t1100-commit-tree-options.sh *** ok 4 - packsize limit ok 4 - ident converts on input ok 3 - setup repo with misnamed object ok 4 - streaming a corrupt blob fails ok 5 - user-defined filters convert on input ok 1 - test preparation: write empty tree ok 5 - read-tree -u detects bit-errors in blobs ok 2 - construct commit ok 6 - read-tree -u detects missing objects ok 3 - read commit ok 6 - setup output tests ok 4 - compare commit ok 7 - autocrlf=true converts on output ok 8 - eol=crlf converts on output ok 7 - clone --no-local --bare detects corruption ok 8 - clone --no-local --bare detects missing object ok 5 - flags and then non flags # passed all 5 test(s) 1..5 ok 9 - user-defined filters convert on output *** t1200-tutorial.sh *** ok 10 - ident converts on output ok 9 - clone --no-local --bare detects misnamed object ok 5 - diff --raw # passed all 10 test(s) 1..10 *** t1300-repo-config.sh *** ok 10 - clone --local detects corruption ok 11 - error detected during checkout leaves repo intact ok 1 - blob ok 2 - blob 557db03 ok 6 - hash-object ok 7 - cat-file a large file ok 3 - git diff-files -p ok 12 - clone --local detects missing objects ok 8 - cat-file a large file from a tag ok 4 - git diff ok 9 - git-show a large file ok 1 - clear default config ok 2 - initial ok 5 - tree ok 3 - mixed case not ok 13 - clone --local detects misnamed objects # TODO known breakage # still have 1 known breakage(s) # passed all remaining 12 test(s) 1..13 ok 4 - similar section ok 5 - uppercase section ok 6 - git diff-index -p HEAD ok 6 - replace with non-match ok 7 - replace with non-match (actually matching) ok 7 - git diff HEAD ok 8 - git whatchanged -p --root *** t1301-shared-repo.sh *** ok 8 - non-match result ok 9 - git tag my-first-tag ok 9 - find mixed-case key by canonical name ok 10 - git checkout -b mybranch ok 10 - find mixed-case key by non-canonical name ok 11 - git branch ok 1 - shared = 0400 (faulty permission u-w) ok 11 - subsections are not canonicalized by git-config ok 12 - unset with cont. lines ok 13 - unset with cont. lines is correct ok 2 - shared=1 does not clear bits preset by umask 002 ok 14 - multiple unset ok 15 - multiple unset is correct ok 3 - shared=1 does not clear bits preset by umask 022 ok 16 - --replace-all missing value ok 17 - --replace-all ok 18 - all replaced ok 12 - git resolve now fails ok 19 - really mean test ok 13 - git show-branch ok 10 - index-pack ok 20 - really really mean test ok 4 - shared=all ok 21 - get value ok 22 - unset ok 23 - multivar ok 24 - non-match ok 5 - update-server-info honors core.sharedRepository ok 14 - git resolve ok 15 - git resolve output ok 25 - non-match value ok 16 - git show-branch (part 2) ok 26 - multi-valued get returns final one ok 17 - git show-branch (part 3) ok 6 - shared = 0660 (r--r-----) ro ok 11 - repack ok 27 - multi-valued get-all returns all ok 28 - multivar replace ok 29 - ambiguous unset ok 30 - invalid unset ok 7 - shared = 0660 (rw-rw----) rw ok 18 - rewind to "Some fun." and "Some work." ok 31 - multivar unset ok 19 - git show-branch (part 4) ok 32 - invalid key ok 33 - correct key ok 34 - hierarchical section ok 8 - shared = 0640 (r--r-----) ro ok 20 - manual merge ok 35 - hierarchical section value ok 21 - git ls-files --stage ok 36 - working --list ok 9 - shared = 0640 (rw-r-----) rw ok 37 - --list without repo produces empty output ok 22 - git ls-files --unmerged ok 38 - --get-regexp ok 39 - --add ok 40 - get variable with no value ok 10 - shared = 0600 (r--------) ro ok 41 - get variable with empty value ok 42 - get-regexp variable with no value ok 23 - git-merge-index ok 11 - shared = 0600 (rw-------) rw ok 43 - get-regexp --bool variable with no value ok 24 - git ls-files --stage (part 2) ok 44 - get-regexp variable with empty value ok 45 - get bool variable with no value ok 12 - pack-objects with large loose object ok 46 - get bool variable with empty value ok 47 - no arguments, but no crash ok 25 - git repack ok 13 - tar achiving ok 12 - shared = 0666 (r--r--r--) ro ok 48 - new section is partial match of another ok 26 - git prune-packed ok 13 - shared = 0666 (rw-rw-rw-) rw ok 14 - zip achiving, store only ok 27 - -> only packed objects ok 49 - new variable inserts into proper section ok 50 - alternative GIT_CONFIG (non-existing file should fail) # passed all 27 test(s) 1..27 ok 51 - alternative GIT_CONFIG *** t1302-repo-version.sh *** ok 52 - alternative GIT_CONFIG (--file) ok 14 - shared = 0664 (r--r--r--) ro ok 53 - refer config from subdirectory ok 15 - shared = 0664 (rw-rw-r--) rw ok 54 - refer config from subdirectory via GIT_CONFIG ok 55 - --set in alternative GIT_CONFIG ok 16 - git reflog expire honors core.sharedRepository ok 56 - rename section ok 57 - rename succeeded ok 58 - rename non-existing section ok 59 - rename succeeded ok 60 - rename another section ok 61 - rename succeeded ok 62 - rename a section with a var on the same line ok 15 - zip achiving, deflate ok 63 - rename succeeded ok 1 - setup # passed all 15 test(s) 1..15 ok 64 - renaming empty section name is rejected ok 2 - gitdir selection on normal repos ok 65 - renaming to bogus section is rejected ok 66 - remove section *** t1303-wacky-config.sh *** ok 3 - gitdir selection on unsupported repo ok 67 - section was removed properly ok 4 - gitdir not required mode ok 68 - section ending ok 5 - gitdir required mode ok 69 - numbers # passed all 5 test(s) 1..5 ok 17 - forced modes *** t1304-default-acl.sh *** # passed all 17 test(s) 1..17 ok 70 - --int is at least 64 bits *** t1305-config-include.sh *** ok 1 - modify same key ok 71 - invalid unit ok 1 - checking for a working acl setup ok 2 # skip Setup test repo (missing SETFACL) ok 3 # skip Objects creation does not break ACLs with restrictive umask (missing SETFACL) ok 4 # skip git gc does not break ACLs with restrictive umask (missing SETFACL) # passed all 4 test(s) 1..4 ok 2 - add key in same section *** t1306-xdg-files.sh *** ok 3 - add key in different section ok 1 - include file by absolute path ok 2 - include file by relative path ok 4 - make sure git config escapes section names properly ok 3 - chained relative paths ok 1 - read config: xdg file exists and ~/.gitconfig doesn't ok 4 - include paths get tilde-expansion ok 5 - do not crash on special long config line ok 2 - read config: xdg file exists and ~/.gitconfig exists ok 5 - include options can still be examined ok 6 - listing includes option and expansion ok 3 - read with --get: xdg file exists and ~/.gitconfig doesn't ok 72 - bool ok 6 - get many entries ok 73 - invalid bool (--get) ok 4 - "$XDG_CONFIG_HOME overrides $HOME/.config/git ok 7 - single file lookup does not expand includes by default ok 74 - invalid bool (set) ok 5 - read with --get: xdg file exists and ~/.gitconfig exists ok 8 - single file list does not expand includes by default ok 7 - get many entries by regex ok 6 - read with --list: xdg file exists and ~/.gitconfig doesn't ok 7 - read with --list: xdg file exists and ~/.gitconfig exists ok 8 - Setup ok 9 - writing config file does not expand includes ok 9 - Exclusion of a file in the XDG ignore file ok 75 - set --bool ok 10 - config modification does not affect includes ok 10 - $XDG_CONFIG_HOME overrides $HOME/.config/git/ignore ok 11 - Exclusion in both XDG and local ignore files ok 11 - missing include files are ignored ok 12 - absolute includes from command line work ok 13 - relative includes from command line fail ok 12 - Exclusion in a non-XDG global ignore file ok 8 - add and replace one of many entries ok 76 - set --int ok 13 - Checking XDG ignore file when HOME is unset ok 14 - include cycles are detected # passed all 14 test(s) 1..14 ok 9 - replace many entries *** t1307-config-blob.sh *** ok 14 - Checking attributes in the XDG attributes file ok 15 - Checking XDG attributes when HOME is unset ok 77 - get --bool-or-int ok 16 - $XDG_CONFIG_HOME overrides $HOME/.config/git/attributes ok 17 - Checking attributes in both XDG and local attributes files ok 10 - unset many entries # passed all 10 test(s) 1..10 ok 18 - Checking attributes in a non-XDG global attributes file ok 19 - write: xdg file exists and ~/.gitconfig doesn't *** t1400-update-ref.sh *** ok 78 - set --bool-or-int ok 20 - write: xdg file exists and ~/.gitconfig exists ok 1 - create config blob ok 21 - write: ~/.config/git/ exists and config file doesn't ok 79 - set --path # passed all 21 test(s) 1..21 *** t1401-symbolic-ref.sh *** ok 2 - list config blob contents ok 3 - fetch value from blob ok 80 - get --path ok 4 - reading non-existing value from blob is an error ok 5 - reading from blob and file is an error ok 6 - reading from missing ref is an error ok 7 - reading from non-blob is an error ok 8 - setting a value in a blob is an error ok 81 - get --path copes with unset $HOME ok 1 - symbolic-ref writes HEAD ok 9 - deleting a value in a blob is an error ok 82 - get --path barfs on boolean variable ok 2 - symbolic-ref reads HEAD ok 10 - editing a blob is an error ok 3 - symbolic-ref refuses non-ref for HEAD ok 4 - symbolic-ref refuses bare sha1 ok 83 - quoting ok 5 - symbolic-ref deletes HEAD ok 11 - parse errors in blobs are properly attributed ok 84 - key with newline # passed all 11 test(s) 1..11 ok 85 - value with newline *** t1402-check-ref-format.sh *** ok 1 - setup ok 6 - symbolic-ref deletes dangling HEAD ok 7 - symbolic-ref fails to delete missing FOO ok 86 - value continued on next line ok 8 - symbolic-ref fails to delete real ref ok 2 - create refs/heads/master # passed all 8 test(s) 1..8 ok 87 - --null --list ok 3 - create refs/heads/master *** t1403-show-ref.sh *** ok 88 - --null --get-regexp ok 4 - fail to delete refs/heads/master with stale ref ok 1 - ref name '' is invalid ok 2 - ref name '/' is invalid ok 3 - ref name '/' is invalid with options --allow-onelevel ok 4 - ref name '/' is invalid with options --normalize ok 5 - ref name '/' is invalid with options --allow-onelevel --normalize ok 5 - delete refs/heads/master ok 6 - ref name 'foo/bar/baz' is valid ok 89 - inner whitespace kept verbatim ok 7 - ref name 'foo/bar/baz' is valid with options --normalize ok 8 - ref name 'refs///heads/foo' is invalid ok 6 - delete refs/heads/master without oldvalue verification ok 9 - ref name 'refs///heads/foo' is valid with options --normalize ok 10 - ref name 'heads/foo/' is invalid ok 11 - ref name '/heads/foo' is invalid ok 7 - fail to create refs/heads/gu/fixes ok 12 - ref name '/heads/foo' is valid with options --normalize ok 13 - ref name '///heads/foo' is invalid ok 8 - create refs/heads/master (by HEAD) ok 14 - ref name '///heads/foo' is valid with options --normalize ok 9 - create refs/heads/master (by HEAD) ok 15 - ref name './foo' is invalid ok 10 - fail to delete refs/heads/master (by HEAD) with stale ref ok 16 - ref name './foo/bar' is invalid ok 90 - symlinked configuration ok 17 - ref name 'foo/./bar' is invalid ok 18 - ref name 'foo/bar/.' is invalid ok 11 - delete refs/heads/master (by HEAD) ok 19 - ref name '.refs/foo' is invalid ok 12 - create refs/heads/master (by HEAD) ok 13 - pack refs ok 20 - ref name 'heads/foo..bar' is invalid ok 91 - nonexistent configuration ok 92 - symlink to nonexistent configuration ok 14 - move refs/heads/master (by HEAD) ok 21 - ref name 'heads/foo?bar' is invalid ok 22 - ref name 'foo./bar' is valid ok 23 - ref name 'heads/foo.lock' is invalid ok 24 - ref name 'heads///foo.lock' is invalid ok 15 - delete refs/heads/master (by HEAD) should remove both packed and loose refs/heads/master ok 25 - ref name 'foo.lock/bar' is invalid ok 26 - ref name 'foo.lock///bar' is invalid ok 93 - check split_cmdline return ok 16 - delete symref without dereference ok 27 - ref name 'heads/foo@bar' is valid ok 94 - git -c "key=value" support ok 28 - ref name 'heads/v@{ation' is invalid ok 29 - ref name 'heads/foo\bar' is invalid ok 30 - ref name 'heads/foo ' is invalid ok 31 - ref name 'heads/foo' is invalid ok 1 - setup ok 17 - delete symref without dereference when the referred ref is packed ok 32 - ref name 'heads/fuß' is valid ok 33 - ref name 'heads/*foo/bar' is invalid with options --refspec-pattern ok 34 - ref name 'heads/foo*/bar' is invalid with options --refspec-pattern ok 18 - (not) create HEAD with old sha1 ok 19 - (not) prior created .git/refs/heads/master ok 35 - ref name 'heads/f*o/bar' is invalid with options --refspec-pattern ok 20 - create HEAD ok 36 - ref name 'foo' is invalid ok 37 - ref name 'foo' is valid with options --allow-onelevel ok 21 - (not) change HEAD with wrong SHA1 ok 22 - (not) changed .git/refs/heads/master ok 38 - ref name 'foo' is invalid with options --refspec-pattern ok 95 - key sanity-checking ok 39 - ref name 'foo' is valid with options --refspec-pattern --allow-onelevel ok 40 - ref name 'foo' is invalid with options --normalize ok 41 - ref name 'foo' is valid with options --allow-onelevel --normalize ok 42 - ref name 'foo/bar' is valid ok 2 - show-ref ok 96 - git -c works with aliases of builtins ok 23 - create refs/heads/master (logged by touch) ok 43 - ref name 'foo/bar' is valid with options --allow-onelevel ok 44 - ref name 'foo/bar' is valid with options --refspec-pattern ok 45 - ref name 'foo/bar' is valid with options --refspec-pattern --allow-onelevel ok 46 - ref name 'foo/bar' is valid with options --normalize ok 24 - update refs/heads/master (logged by touch) ok 47 - ref name 'foo/*' is invalid ok 25 - set refs/heads/master (logged by touch) ok 26 - verifying refs/heads/master's log ok 48 - ref name 'foo/*' is invalid with options --allow-onelevel ok 97 - git -c does not split values on equals ok 49 - ref name 'foo/*' is valid with options --refspec-pattern ok 50 - ref name 'foo/*' is valid with options --refspec-pattern --allow-onelevel ok 98 - git -c dies on bogus config ok 51 - ref name '*/foo' is invalid ok 27 - enable core.logAllRefUpdates ok 52 - ref name '*/foo' is invalid with options --allow-onelevel ok 53 - ref name '*/foo' is valid with options --refspec-pattern ok 99 - git -c complains about empty key ok 28 - create refs/heads/master (logged by config) ok 54 - ref name '*/foo' is valid with options --refspec-pattern --allow-onelevel ok 100 - git -c complains about empty key and value ok 3 - show-ref -q ok 29 - update refs/heads/master (logged by config) ok 55 - ref name '*/foo' is invalid with options --normalize ok 56 - ref name '*/foo' is valid with options --refspec-pattern --normalize ok 30 - set refs/heads/master (logged by config) ok 31 - verifying refs/heads/master's log ok 57 - ref name 'foo/*/bar' is invalid ok 101 - git config --edit works ok 4 - show-ref --verify ok 58 - ref name 'foo/*/bar' is invalid with options --allow-onelevel ok 59 - ref name 'foo/*/bar' is valid with options --refspec-pattern ok 60 - ref name 'foo/*/bar' is valid with options --refspec-pattern --allow-onelevel ok 61 - ref name '*' is invalid ok 32 - Query "master@{May 25 2005}" (before history) ok 62 - ref name '*' is invalid with options --allow-onelevel ok 63 - ref name '*' is invalid with options --refspec-pattern ok 64 - ref name '*' is valid with options --refspec-pattern --allow-onelevel ok 65 - ref name 'foo/*/*' is invalid with options --refspec-pattern ok 66 - ref name 'foo/*/*' is invalid with options --refspec-pattern --allow-onelevel ok 67 - ref name '*/foo/*' is invalid with options --refspec-pattern ok 5 - show-ref --verify -q ok 33 - Query master@{2005-05-25} (before history) ok 68 - ref name '*/foo/*' is invalid with options --refspec-pattern --allow-onelevel ok 34 - Query "master@{May 26 2005 23:31:59}" (1 second before history) ok 69 - ref name '*/*/foo' is invalid with options --refspec-pattern ok 35 - Query "master@{May 26 2005 23:32:00}" (exactly history start) ok 102 - git config --edit respects core.editor ok 70 - ref name '*/*/foo' is invalid with options --refspec-pattern --allow-onelevel ok 36 - Query "master@{May 26 2005 23:32:30}" (first non-creation change) ok 71 - ref name '/foo' is invalid ok 72 - ref name '/foo' is invalid with options --allow-onelevel ok 103 - barf on syntax error ok 73 - ref name '/foo' is invalid with options --refspec-pattern ok 37 - Query "master@{2005-05-26 23:33:01}" (middle of history with gap) ok 104 - barf on incomplete section header ok 74 - ref name '/foo' is invalid with options --refspec-pattern --allow-onelevel ok 38 - Query "master@{2005-05-26 23:38:00}" (middle of history) ok 75 - ref name '/foo' is invalid with options --normalize ok 76 - ref name '/foo' is valid with options --allow-onelevel --normalize ok 105 - barf on incomplete string ok 39 - Query "master@{2005-05-26 23:43:00}" (exact end of history) ok 77 - ref name '/foo' is invalid with options --refspec-pattern --normalize ok 78 - ref name '/foo' is valid with options --refspec-pattern --allow-onelevel --normalize ok 106 - urlmatch ok 40 - Query "master@{2005-05-28}" (past end of history) not ok 107 - unsetting the last key in a section removes header # TODO known breakage ok 6 - show-ref -d not ok 108 - adding a key into an empty section reuses header # TODO known breakage # still have 2 known breakage(s) # passed all remaining 106 test(s) 1..108 ok 41 - creating initial files ok 42 - git commit logged updates *** t1410-reflog.sh *** ok 79 - check-ref-format --branch @{-1} ok 43 - git cat-file blob master:F (expect OTHER) ok 44 - git cat-file blob master@{2005-05-26 23:30}:F (expect TEST) ok 45 - git cat-file blob master@{2005-05-26 23:42}:F (expect OTHER) ok 46 - stdin test setup ok 47 - -z fails without --stdin ok 80 - check-ref-format --branch from subdir ok 48 - stdin works with no input ok 81 - ref name 'heads/foo' simplifies to 'heads/foo' ok 49 - stdin fails on empty line ok 82 - ref name 'refs///heads/foo' simplifies to 'refs/heads/foo' ok 83 - ref name '/heads/foo' simplifies to 'heads/foo' ok 50 - stdin fails on only whitespace ok 51 - stdin fails on leading whitespace ok 7 - show-ref --heads, --tags, --head, pattern ok 84 - ref name '///heads/foo' simplifies to 'heads/foo' # passed all 7 test(s) 1..7 ok 85 - check-ref-format --normalize rejects 'foo' ok 86 - check-ref-format --normalize rejects '/foo' ok 52 - stdin fails on unknown command ok 87 - check-ref-format --normalize rejects 'heads/foo/../bar' ok 53 - stdin fails on badly quoted input ok 88 - check-ref-format --normalize rejects 'heads/./foo' *** t1411-reflog-show.sh *** ok 54 - stdin fails on arguments not separated by space ok 89 - check-ref-format --normalize rejects 'heads\foo' ok 90 - check-ref-format --normalize rejects 'heads/foo.lock' ok 55 - stdin fails create with no ref ok 91 - check-ref-format --normalize rejects 'heads///foo.lock' ok 92 - check-ref-format --normalize rejects 'foo.lock/bar' ok 56 - stdin fails create with bad ref name ok 93 - check-ref-format --normalize rejects 'foo.lock///bar' # passed all 93 test(s) 1..93 ok 57 - stdin fails create with no new value ok 58 - stdin fails create with too many arguments *** t1412-reflog-loop.sh *** ok 59 - stdin fails update with no ref ok 60 - stdin fails update with bad ref name ok 1 - setup ok 61 - stdin fails update with no new value ok 2 - log -g shows reflog headers ok 3 - oneline reflog format ok 62 - stdin fails update with too many arguments ok 4 - reflog default format ok 63 - stdin fails delete with no ref ok 5 - override reflog default format ok 64 - stdin fails delete with bad ref name ok 65 - stdin fails delete with too many arguments ok 66 - stdin fails verify with too many arguments ok 6 - using @{now} syntax shows reflog date (multiline) ok 7 - using @{now} syntax shows reflog date (oneline) ok 67 - stdin fails option with unknown name ok 1 - setup commits ok 8 - using @{now} syntax shows reflog date (format=%gd) ok 68 - stdin fails with duplicate refs ok 9 - using --date= shows reflog date (multiline) ok 2 - setup reflog with alternating commits ok 69 - stdin create ref works ok 3 - reflog shows all entries # passed all 3 test(s) 1..3 ok 10 - using --date= shows reflog date (oneline) ok 11 - using --date= shows reflog date (format=%gd) *** t1420-lost-found.sh *** ok 70 - stdin update ref creates with zero old value ok 12 - log.date does not invoke "--date" magic (multiline) ok 71 - stdin update ref creates with empty old value ok 72 - stdin create ref works with path with space to blob ok 73 - stdin update ref fails with wrong old value ok 74 - stdin update ref fails with bad old value ok 13 - log.date does not invoke "--date" magic (oneline) ok 75 - stdin create ref fails with bad new value ok 76 - stdin create ref fails with zero new value ok 14 - log.date does not invoke "--date" magic (format=%gd) ok 1 - setup ok 15 - --date magic does not override explicit @{0} syntax ok 16 - empty reflog file ok 77 - stdin update ref works with right old value ok 1 - setup ok 78 - stdin delete ref fails with wrong old value ok 79 - stdin delete ref fails with zero old value ok 2 - lost and found something # passed all 2 test(s) 1..2 ok 17 - git log -g -p shows diffs vs. parents *** t1450-fsck.sh *** # passed all 17 test(s) 1..17 *** t1500-rev-parse.sh *** ok 80 - stdin update symref works option no-deref ok 2 - rewind ok 1 - toplevel: is-bare-repository ok 3 - corrupt and check ok 2 - toplevel: is-inside-git-dir ok 81 - stdin delete symref works option no-deref ok 3 - toplevel: is-inside-work-tree ok 4 - toplevel: prefix ok 4 - reflog expire --dry-run should not touch reflog ok 82 - stdin delete ref works with right old value ok 5 - toplevel: git-dir ok 6 - .git/: is-bare-repository ok 7 - .git/: is-inside-git-dir ok 1 - setup ok 83 - stdin update/create/verify combination works ok 8 - .git/: is-inside-work-tree ok 5 - reflog expire ok 9 - .git/: prefix ok 10 - .git/: git-dir ok 11 - .git/objects/: is-bare-repository ok 2 - loose objects borrowed from alternate are not missing ok 84 - stdin update refs works with identity updates ok 12 - .git/objects/: is-inside-git-dir ok 3 - HEAD is part of refs, valid objects appear valid ok 4 - setup: helpers for corruption tests ok 13 - .git/objects/: is-inside-work-tree ok 14 - .git/objects/: prefix ok 15 - .git/objects/: git-dir ok 16 - subdirectory: is-bare-repository ok 17 - subdirectory: is-inside-git-dir ok 18 - subdirectory: is-inside-work-tree ok 19 - subdirectory: prefix ok 85 - stdin update refs fails with wrong old value ok 20 - subdirectory: git-dir ok 6 - prune and fsck ok 21 - core.bare = true: is-bare-repository ok 7 - recover and check ok 22 - core.bare = true: is-inside-git-dir ok 23 - core.bare = true: is-inside-work-tree ok 24 - core.bare undefined: is-bare-repository ok 25 - core.bare undefined: is-inside-git-dir ok 86 - stdin delete refs works with packed and loose refs ok 26 - core.bare undefined: is-inside-work-tree ok 27 - GIT_DIR=../.git, core.bare = false: is-bare-repository ok 28 - GIT_DIR=../.git, core.bare = false: is-inside-git-dir ok 87 - stdin -z works on empty input ok 29 - GIT_DIR=../.git, core.bare = false: is-inside-work-tree ok 30 - GIT_DIR=../.git, core.bare = false: prefix ok 31 - GIT_DIR=../.git, core.bare = true: is-bare-repository ok 88 - stdin -z fails on empty line ok 5 - object with bad sha1 ok 32 - GIT_DIR=../.git, core.bare = true: is-inside-git-dir ok 89 - stdin -z fails on empty command ok 33 - GIT_DIR=../.git, core.bare = true: is-inside-work-tree ok 34 - GIT_DIR=../.git, core.bare = true: prefix ok 90 - stdin -z fails on only whitespace ok 91 - stdin -z fails on leading whitespace ok 6 - branch pointing to non-commit ok 92 - stdin -z fails on unknown command ok 93 - stdin -z fails create with no ref ok 35 - GIT_DIR=../.git, core.bare undefined: is-bare-repository ok 36 - GIT_DIR=../.git, core.bare undefined: is-inside-git-dir ok 94 - stdin -z fails create with bad ref name ok 37 - GIT_DIR=../.git, core.bare undefined: is-inside-work-tree ok 38 - GIT_DIR=../.git, core.bare undefined: prefix ok 8 - delete ok 95 - stdin -z fails create with no new value ok 39 - GIT_DIR=../repo.git, core.bare = false: is-bare-repository ok 96 - stdin -z fails create with too many arguments ok 9 - rewind2 ok 40 - GIT_DIR=../repo.git, core.bare = false: is-inside-git-dir ok 7 - email without @ is okay ok 41 - GIT_DIR=../repo.git, core.bare = false: is-inside-work-tree ok 97 - stdin -z fails update with no ref ok 10 - --expire=never ok 42 - GIT_DIR=../repo.git, core.bare = false: prefix ok 98 - stdin -z fails update with bad ref name ok 43 - GIT_DIR=../repo.git, core.bare = true: is-bare-repository ok 44 - GIT_DIR=../repo.git, core.bare = true: is-inside-git-dir ok 45 - GIT_DIR=../repo.git, core.bare = true: is-inside-work-tree ok 46 - GIT_DIR=../repo.git, core.bare = true: prefix ok 99 - stdin -z fails update with no new value ok 47 - GIT_DIR=../repo.git, core.bare undefined: is-bare-repository ok 100 - stdin -z fails update with no old value ok 101 - stdin -z fails update with too many arguments ok 8 - email with embedded > is not okay ok 48 - GIT_DIR=../repo.git, core.bare undefined: is-inside-git-dir ok 49 - GIT_DIR=../repo.git, core.bare undefined: is-inside-work-tree ok 11 - gc.reflogexpire=never ok 102 - stdin -z fails delete with no ref ok 50 - GIT_DIR=../repo.git, core.bare undefined: prefix ok 103 - stdin -z fails delete with bad ref name # passed all 50 test(s) 1..50 ok 104 - stdin -z fails delete with no old value ok 105 - stdin -z fails delete with too many arguments *** t1501-worktree.sh *** ok 106 - stdin -z fails verify with too many arguments ok 107 - stdin -z fails verify with no old value ok 12 - gc.reflogexpire=false # passed all 12 test(s) 1..12 ok 108 - stdin -z fails option with unknown name ok 109 - stdin -z fails with duplicate refs ok 9 - missing < email delimiter is reported nicely *** t1502-rev-parse-parseopt.sh *** ok 110 - stdin -z create ref works ok 1 - setup ok 2 - setup: helper for testing rev-parse ok 111 - stdin -z update ref creates with zero old value ok 3 - setup: core.worktree = relative path ok 10 - missing email is reported nicely ok 4 - outside ok 1 - test --parseopt help output ok 112 - stdin -z update ref creates with empty old value ok 2 - test --parseopt ok 3 - test --parseopt with mixed options and arguments ok 113 - stdin -z create ref works with path with space to blob ok 11 - > in name is reported ok 4 - test --parseopt with -- ok 114 - stdin -z update ref fails with wrong old value ok 5 - test --parseopt --stop-at-non-option ok 5 - inside work tree ok 6 - test --parseopt --keep-dashdash ok 115 - stdin -z update ref fails with bad old value ok 7 - test --parseopt --keep-dashdash --stop-at-non-option with -- ok 8 - test --parseopt --keep-dashdash --stop-at-non-option without -- ok 6 - empty prefix is actually written out ok 116 - stdin -z create ref fails with bad new value ok 9 - test --parseopt --stuck-long ok 117 - stdin -z create ref fails with zero new value ok 12 - integer overflow in timestamps is reported ok 7 - subdir of work tree ok 10 - test --parseopt --stuck-long and empty optional argument ok 8 - setup: core.worktree = absolute path ok 11 - test --parseopt --stuck-long and long option with unset optional argument ok 118 - stdin -z update ref works with right old value ok 12 - test --parseopt --stuck-long and short option with unset optional argument ok 119 - stdin -z delete ref fails with wrong old value ok 13 - tag pointing to nonexistent # passed all 12 test(s) 1..12 *** t1503-rev-parse-verify.sh *** ok 120 - stdin -z delete ref fails with zero old value ok 9 - outside ok 14 - tag pointing to something else than its type ok 15 - cleaned up ok 16 - rev-list --verify-objects ok 121 - stdin -z update symref works option no-deref ok 10 - inside work tree ok 122 - stdin -z delete symref works option no-deref ok 11 - subdir of work tree ok 123 - stdin -z delete ref works with right old value ok 1 - set up basic repo with 1 file (hello) and 4 commits ok 12 - setup: GIT_WORK_TREE=relative (override core.worktree) ok 124 - stdin -z update/create/verify combination works ok 2 - works with one good rev ok 17 - rev-list --verify-objects with bad sha1 ok 13 - outside ok 3 - fails with any bad rev or many good revs ok 125 - stdin -z update refs works with identity updates ok 18 - fsck notices blob entry pointing to null sha1 ok 14 - inside work tree ok 4 - fails silently when using -q ok 15 - subdir of work tree ok 126 - stdin -z update refs fails with wrong old value ok 16 - setup: GIT_WORK_TREE=absolute, below git dir ok 19 - fsck notices submodule entry pointing to null sha1 ok 5 - no stdout output on error ok 6 - use --default ok 127 - stdin -z delete refs works with packed and loose refs ok 17 - outside # passed all 127 test(s) 1..127 ok 20 - fsck notices . as blob *** t1504-ceiling-dirs.sh *** ok 7 - master@{n} for various n # passed all 7 test(s) 1..7 *** t1505-rev-parse-last.sh *** ok 21 - fsck notices . as tree ok 1 - no_ceil ok 18 - in repo.git ok 2 - ceil_empty ok 3 - ceil_at_parent ok 4 - ceil_at_parent_slash ok 5 - ceil_at_trash ok 6 - ceil_at_trash_slash ok 7 - ceil_at_sub ok 8 - ceil_at_sub_slash ok 19 - inside work tree ok 9 - subdir_no_ceil ok 22 - fsck notices .. as blob ok 10 - subdir_ceil_empty ok 20 - subdir of work tree ok 11 - subdir_ceil_at_trash: prefix ok 12 - subdir_ceil_at_trash_slash: prefix ok 13 - subdir_ceil_at_sub: prefix ok 14 - subdir_ceil_at_sub_slash: prefix ok 15 - subdir_ceil_at_top: prefix ok 21 - find work tree from repo ok 16 - subdir_ceil_at_top_slash: prefix ok 17 - subdir_ceil_at_top_no_resolve ok 18 - subdir_ceil_at_top_slash_no_resolve ok 22 - find work tree from work tree ok 1 - setup ok 19 - subdir_ceil_at_subdir ok 2 - @{-1} works ok 20 - subdir_ceil_at_subdir_slash ok 23 - fsck notices .. as tree ok 21 - subdir_ceil_at_su ok 3 - @{-1}~2 works ok 22 - subdir_ceil_at_su_slash ok 23 - _gently() groks relative GIT_DIR & GIT_WORK_TREE ok 4 - @{-1}^2 works ok 23 - subdir_ceil_at_sub_di ok 24 - diff-index respects work tree under .git dir ok 5 - @{-1}@{1} works ok 24 - subdir_ceil_at_sub_di_slash ok 25 - subdir_ceil_at_subdi ok 25 - diff-files respects work tree under .git dir ok 26 - subdir_ceil_at_subdi_slash ok 6 - @{-2} works ok 7 - @{-3} fails ok 27 - second_of_two: prefix # passed all 7 test(s) 1..7 ok 28 - first_of_two: prefix ok 29 - second_of_three: prefix ok 24 - fsck notices .git as blob ok 30 - git_dir_specified *** t1506-rev-parse-diagnosis.sh *** ok 26 - git diff respects work tree under .git dir ok 31 - sd_no_ceil ok 32 - sd_ceil_empty ok 27 - git grep ok 33 - sd_ceil_at_trash: prefix ok 34 - sd_ceil_at_trash_slash: prefix ok 35 - sd_ceil_at_s: prefix ok 28 - git commit ok 36 - sd_ceil_at_s_slash: prefix ok 37 - sd_ceil_at_sd ok 38 - sd_ceil_at_sd_slash ok 39 - sd_ceil_at_su ok 40 - sd_ceil_at_su_slash ok 29 - absolute pathspec should fail gracefully ok 25 - fsck notices .git as tree ok 41 - sd_ceil_at_s_di ok 42 - sd_ceil_at_s_di_slash ok 43 - sd_ceil_at_sdi ok 30 - make_relative_path handles double slashes in GIT_DIR ok 44 - sd_ceil_at_sdi_slash ok 1 - set up basic repo ok 31 - relative $GIT_WORK_TREE and git subprocesses # passed all 44 test(s) 1..44 # passed all 31 test(s) 1..31 *** t1507-rev-parse-upstream.sh *** *** t1508-at-combinations.sh *** ok 26 - fsck notices .GIT as blob ok 2 - correct file objects ok 3 - correct relative file objects (0) ok 4 - correct relative file objects (1) ok 5 - correct relative file objects (2) ok 6 - correct relative file objects (3) ok 27 - fsck notices .GIT as tree ok 7 - correct relative file objects (4) ok 8 - correct relative file objects (5) ok 28 - fsck notices .gI{u200c}T as blob ok 9 - correct relative file objects (6) ok 10 - incorrect revision id ok 29 - fsck notices .gI{u200c}T as tree ok 11 - incorrect file in sha1:path ok 30 - fsck notices .Git as blob ok 1 - setup ok 2 - @{upstream} resolves to correct full name ok 3 - @{u} resolves to correct full name ok 4 - my-side@{upstream} resolves to correct full name ok 12 - incorrect file in :path and :N:path ok 5 - upstream of branch with @ in middle ok 6 - upstream of branch with @ at start ok 31 - fsck notices .Git as tree ok 1 - setup ok 7 - upstream of branch with @ at end ok 8 - refs/heads/my-side@{upstream} does not resolve to my-side{upstream} ok 2 - HEAD = refs/heads/new-branch ok 13 - invalid @{n} reference ok 3 - @{1} = new-one ok 14 - relative path not found ok 4 - HEAD@{1} = new-one ok 15 - relative path outside worktree ok 5 - @{now} = new-two ok 16 - relative path when cwd is outside worktree ok 6 - HEAD@{now} = new-two ok 17 - relative path when startup_info is NULL ok 32 - fsck notices git~1 as blob ok 7 - @{-1} = refs/heads/old-branch ok 18 - :file correctly diagnosed after a pathname ok 8 - @{-1}@{0} = old-two ok 9 - @{-1}@{1} = old-one ok 19 - dotdot is not an empty set ok 20 - arg before dashdash must be a revision (missing) ok 10 - @{u} = refs/heads/upstream-branch ok 9 - my-side@{u} resolves to correct commit ok 21 - arg before dashdash must be a revision (file) ok 10 - not-tracking@{u} fails ok 11 - HEAD@{u} = refs/heads/upstream-branch ok 33 - fsck notices git~1 as tree ok 22 - arg before dashdash must be a revision (ambiguous) ok 12 - @{u}@{1} = upstream-one # passed all 22 test(s) 1..22 ok 13 - @{-1}@{u} = refs/heads/master *** t1509-root-worktree.sh *** ok 14 - @{-1}@{u}@{1} = master-one ok 15 - @ = new-two ok 16 - @@{u} = refs/heads/upstream-branch ok 17 - @@/at-test = refs/heads/@@/at-test ok 11 - @{u}@{1} resolves correctly ok 34 - fsck notices .git. as blob 1..0 # SKIP Dangerous test skipped. Read this test if you want to execute it ok 18 - @/at-test = refs/heads/@/at-test ok 12 - @{u} without specifying branch fails on a detached HEAD *** t1510-repo-setup.sh *** ok 19 - @at-test = refs/heads/@at-test ok 20 - @{u}@{-1} is nonsensical ok 21 - @{0}@{0} is nonsensical ok 13 - checkout -b new my-side@{u} forks from the same ok 22 - @{1}@{u} is nonsensical ok 23 - HEAD@{-1} is nonsensical ok 24 - @{-1}@{-1} is nonsensical ok 35 - fsck notices .git. as tree ok 25 - HEAD@{3} = old-two ok 26 - @{3} is nonsensical ok 27 - switch to old-branch ok 14 - merge my-side@{u} records the correct name ok 28 - HEAD = refs/heads/old-branch ok 29 - HEAD@{1} = new-two ok 30 - @{1} = old-one ok 15 - branch -d other@{u} ok 36 - fsck notices .\.GIT\foobar as blob ok 31 - create path with @ ok 1 - #0: nonbare repo, no explicit configuration ok 16 - checkout other@{u} ok 32 - @:normal = content ok 17 - branch@{u} works when tracking a local branch ok 33 - @:fun@ny = content ok 37 - fsck notices .\.GIT\foobar as tree # passed all 33 test(s) 1..33 ok 18 - branch@{u} error message when no upstream ok 2 - #1: GIT_WORK_TREE without explicit GIT_DIR is accepted *** t1511-rev-parse-caret.sh *** ok 19 - @{u} error message when no upstream ok 20 - branch@{u} error message with misspelt branch ok 21 - @{u} error message when not on a branch ok 22 - branch@{u} error message if upstream branch not fetched ok 38 - fsck notices .git\foobar as blob ok 3 - #2: worktree defaults to cwd with explicit GIT_DIR ok 39 - fsck notices .git\foobar as tree ok 1 - setup ok 4 - #2b: relative GIT_DIR ok 2 - ref^{non-existent} ok 5 - #3: setup ok 3 - ref^{} ok 40 - fsck allows .Ňit # passed all 40 test(s) 1..40 ok 23 - pull works when tracking a local branch ok 24 - @{u} works when tracking a local branch ok 4 - ref^{commit} ok 25 - log -g other@{u} ok 26 - log -g other@{u}@{now} ok 5 - ref^{tree} ok 6 - ref^{tag} ok 6 - #3: explicit GIT_WORK_TREE and GIT_DIR at toplevel ok 27 - @{reflog}-parsing does not look beyond colon ok 7 - ref^{/.} ok 8 - ref^{/non-existent} *** t1512-rev-parse-disambiguation.sh *** ok 9 - ref^{/Initial} ok 28 - @{upstream}-parsing does not look beyond colon # passed all 9 test(s) 1..9 # passed all 28 test(s) 1..28 *** t1513-rev-parse-prefix.sh *** ok 7 - #3: explicit GIT_WORK_TREE and GIT_DIR in subdir *** t2000-checkout-cache-clash.sh *** ok 1 - blob and tree ok 2 - warn ambiguity when no candidate matches type hint ok 3 - disambiguate tree-ish ok 1 - setup ok 2 - empty prefix -- file ok 4 - disambiguate blob ok 1 - git update-index --add various paths. ok 3 - valid prefix -- file ok 4 - valid prefix -- ../file ok 5 - disambiguate tree ok 8 - #3: explicit GIT_WORK_TREE from parent of worktree ok 6 - first commit ok 2 - git checkout-index without -f should fail on conflicting work tree. ok 5 - empty prefix HEAD:./path ok 7 - disambiguate commit-ish ok 3 - git checkout-index with -f should succeed. ok 4 - git checkout-index conflicting paths. ok 6 - valid prefix HEAD:./path ok 7 - valid prefix HEAD:../path ok 8 - disambiguate commit ok 5 - checkout-index -f twice with --prefix # passed all 5 test(s) 1..5 ok 8 - prefix ignored with HEAD:top ok 9 - disambiguate path with valid prefix *** t2001-checkout-cache-clash.sh *** ok 9 - log name1..name2 takes only commit-ishes on both ends ok 10 - file and refs with prefix ok 11 - two-levels deep ok 9 - #3: explicit GIT_WORK_TREE from nephew of worktree # passed all 11 test(s) 1..11 ok 10 - rev-parse name1..name2 takes only commit-ishes on both ends *** t2002-checkout-cache-u.sh *** ok 11 - git log takes only commit-ish ok 12 - git reset takes only commit-ish ok 13 - first tag not ok 14 - two semi-ambiguous commit-ish # TODO known breakage not ok 15 - three semi-ambiguous tree-ish # TODO known breakage ok 16 - parse describe name ok 1 - git update-index --add path0/file0 ok 2 - writing tree out with git write-tree ok 10 - #3: chdir_to_toplevel uses worktree, not git dir ok 1 - preparation ok 3 - git update-index --add path1/file1 ok 4 - writing tree out with git write-tree ok 2 - without -u, git checkout-index smudges stat information. ok 5 - read previously written tree and checkout. ok 3 - with -u, git checkout-index picks up stat information from new files. ok 6 - add a symlink ok 7 - writing tree out with git write-tree ok 11 - #3: chdir_to_toplevel uses worktree (from subdir) # passed all 3 test(s) 1..3 *** t2003-checkout-cache-mkdir.sh *** ok 8 - read previously written tree and checkout. ok 9 - checking out conflicting path with -f # passed all 9 test(s) 1..9 *** t2004-checkout-cache-temp.sh *** ok 17 - more history not ok 18 - parse describe name taking advantage of generation # TODO known breakage ok 12 - #4: core.worktree without GIT_DIR set is accepted ok 19 - parse describe name not ignoring ambiguity ok 1 - setup ok 2 - have symlink in place where dir is expected. ok 3 - use --prefix=path2/ ok 4 - use --prefix=tmp- ok 5 - use --prefix=tmp- but with a conflicting file and dir ok 6 - use --prefix=tmp/orary/ where tmp is a symlink ok 7 - use --prefix=tmp/orary- where tmp is a symlink ok 20 - ambiguous commit-ish ok 8 - use --prefix=tmp- where tmp-path1 is a symlink ok 21 - rev-parse --disambiguate ok 1 - preparation ok 22 - ambiguous 40-hex ref ok 9 - apply filter from working tree .gitattributes with --prefix ok 13 - #5: core.worktree + GIT_WORK_TREE is accepted ok 2 - checkout one stage 0 to temporary file ok 23 - ambiguous short sha1 ref # still have 3 known breakage(s) # passed all remaining 20 test(s) 1..23 ok 10 - apply CRLF filter from working tree .gitattributes with --prefix # passed all 10 test(s) 1..10 *** t2005-checkout-index-symlinks.sh *** *** t2006-checkout-index-basic.sh *** ok 3 - checkout all stage 0 to temporary files ok 4 - prepare 3-way merge ok 14 - #6: setting GIT_DIR brings core.worktree to life ok 5 - checkout one stage 2 to temporary file ok 1 - preparation ok 1 - checkout-index --gobbledegook ok 2 - the checked-out symlink must be a file ok 3 - the file must be the blob we added during the setup # passed all 3 test(s) 1..3 ok 2 - checkout-index -h in broken repository # passed all 2 test(s) 1..2 *** t2007-checkout-symlink.sh *** *** t2008-checkout-subdir.sh *** ok 6 - checkout all stage 2 to temporary files ok 7 - checkout all stages/one file to nothing ok 8 - checkout all stages/one file to temporary files ok 1 - setup ok 15 - #6b: GIT_DIR set, core.worktree relative ok 9 - checkout some stages/one file to temporary files ok 10 - checkout all stages/all files to temporary files ok 11 - -- path0: no entry ok 1 - setup ok 12 - -- path1: all 3 stages ok 2 - switch from symlink to dir ok 13 - -- path2: no stage 1, have stage 2 and 3 ok 2 - remove and restore with relative path ok 3 - Remove temporary directories & switch to master ok 4 - switch from dir to symlink ok 3 - checkout with empty prefix # passed all 4 test(s) 1..4 ok 14 - -- path3: no stage 2, have stage 1 and 3 *** t2009-checkout-statinfo.sh *** ok 4 - checkout with simple prefix ok 15 - -- path4: no stage 3, have stage 1 and 3 ok 16 - #6c: GIT_DIR set, core.worktree=../wt (absolute) ok 16 - -- asubdir/path5: no stage 2 and 3 have stage 1 ok 5 - checkout with complex relative path ok 17 - checkout --temp within subdir ok 6 - relative path outside tree should fail ok 7 - incorrect relative path to file should fail (1) ok 8 - incorrect relative path should fail (2) ok 9 - incorrect relative path should fail (3) # passed all 9 test(s) 1..9 ok 1 - setup *** t2010-checkout-ambiguous.sh *** ok 18 - checkout --temp symlink # passed all 18 test(s) 1..18 *** t2011-checkout-invalid-head.sh *** ok 17 - #6d: GIT_DIR set, core.worktree=../wt (relative) ok 2 - branch switching ok 1 - setup ok 2 - reference must be a tree ok 1 - setup ok 2 - checkout should not start branch from a tree ok 3 - checkout master from invalid HEAD ok 3 - branch switching # passed all 3 test(s) 1..3 *** t2012-checkout-last.sh *** ok 4 - checkout world from the index ok 5 - non ambiguous call ok 6 - allow the most common case ok 3 - path checkout ok 7 - check ambiguity # passed all 3 test(s) 1..3 ok 18 - #6e: GIT_DIR set, core.worktree=../.. (absolute) *** t2013-checkout-submodule.sh *** ok 8 - disambiguate checking out from a tree-ish ok 9 - accurate error message with more than one ref # passed all 9 test(s) 1..9 ok 1 - setup ok 2 - "checkout -" does not work initially ok 3 - first branch switch *** t2014-switch.sh *** ok 4 - "checkout -" switches back ok 5 - "checkout -" switches forth ok 6 - detach HEAD ok 7 - "checkout -" attaches again ok 1 - setup ok 2 - check all changes are staged ok 19 - #6f: GIT_DIR set, core.worktree=../.. (relative) ok 3 - second commit ok 4 - check # passed all 4 test(s) 1..4 ok 20 - #7: setup ok 8 - "checkout -" detaches again *** t2015-checkout-unborn.sh *** ok 1 - setup ok 2 - "reset " updates the index ok 21 - #7: explicit GIT_WORK_TREE and GIT_DIR at toplevel ok 1 - setup ok 9 - more switches ok 2 - checkout from unborn preserves untracked files ok 3 - "checkout " updates the index only ok 3 - checkout from unborn preserves index contents ok 22 - #7: explicit GIT_WORK_TREE and GIT_DIR in subdir ok 4 - "checkout " honors diff.ignoreSubmodules ok 4 - checkout from unborn merges identical index contents ok 5 - checking out another branch from unborn state ok 5 - "checkout " honors submodule.*.ignore from .gitmodules ok 6 - checking out in a newly created repo ok 23 - #7: explicit GIT_WORK_TREE from parent of worktree ok 6 - "checkout " honors submodule.*.ignore from .git/config # passed all 6 test(s) 1..6 # passed all 6 test(s) 1..6 *** t2016-checkout-patch.sh *** *** t2017-checkout-orphan.sh *** ok 10 - switch to the last ok 24 - #7: explicit GIT_WORK_TREE from nephew of worktree ok 1 - Setup ok 2 - --orphan creates a new orphan branch from HEAD ok 1 - setup ok 25 - #7: chdir_to_toplevel uses worktree, not git dir ok 3 - --orphan creates a new orphan branch from ok 4 - --orphan must be rejected with -b ok 5 - --orphan must be rejected with -t ok 11 - switch to second from the last ok 26 - #7: chdir_to_toplevel uses worktree (from subdir) ok 6 - --orphan ignores branch.autosetupmerge ok 27 - #8: gitfile, easy case ok 2 - saying "n" does nothing ok 7 - --orphan makes reflog by default ok 28 - #9: GIT_WORK_TREE accepted with gitfile ok 8 - --orphan does not make reflog when core.logAllRefUpdates = false ok 9 - --orphan with -l makes reflog when core.logAllRefUpdates = false ok 10 - giving up --orphan not committed when -l and core.logAllRefUpdates = false deletes reflog ok 29 - #10: GIT_DIR can point to gitfile ok 12 - switch to third from the last ok 11 - --orphan is rejected with an existing name ok 12 - --orphan refuses to switch if a merge is needed ok 30 - #10b: relative GIT_DIR can point to gitfile ok 3 - git checkout -p ok 13 - cannot --detach on an unborn branch # passed all 13 test(s) 1..13 *** t2018-checkout-branch.sh *** ok 31 - #11: setup ok 13 - switch to fourth from the last ok 1 - setup ok 32 - #11: explicit GIT_WORK_TREE and GIT_DIR at toplevel ok 2 - checkout -b to a new branch, set to HEAD ok 3 - checkout -b to a new branch, set to an explicit ref ok 4 - checkout -b to a new branch with unmergeable changes fails ok 14 - switch to twelfth from the last ok 5 - checkout -f -b to a new branch with unmergeable changes discards changes ok 33 - #11: explicit GIT_WORK_TREE and GIT_DIR in subdir ok 15 - merge base test setup ok 4 - git checkout -p with staged changes ok 16 - another...master ok 6 - checkout -b to a new branch preserves mergeable changes ok 17 - ...master ok 34 - #11: explicit GIT_WORK_TREE from parent of worktree ok 7 - checkout -f -b to a new branch with mergeable changes discards changes ok 18 - master... ok 8 - checkout -b to an existing branch fails ok 9 - checkout -b to @{-1} fails with the right branch name ok 10 - checkout -B to an existing branch resets branch to HEAD ok 35 - #11: explicit GIT_WORK_TREE from nephew of worktree ok 11 - checkout -B to an existing branch from detached HEAD resets branch to HEAD ok 12 - checkout -B to an existing branch with an explicit ref resets branch to that ref ok 5 - git checkout -p HEAD with NO staged changes: abort ok 13 - checkout -B to an existing branch with unmergeable changes fails ok 36 - #11: chdir_to_toplevel uses worktree, not git dir ok 19 - "checkout -" works after a rebase A ok 14 - checkout -f -B to an existing branch with unmergeable changes discards changes ok 15 - checkout -B to an existing branch preserves mergeable changes ok 37 - #11: chdir_to_toplevel uses worktree (from subdir) ok 16 - checkout -f -B to an existing branch with mergeable changes discards changes ok 6 - git checkout -p HEAD with NO staged changes: apply ok 38 - #12: core.worktree with gitfile is accepted ok 17 - checkout -b ok 20 - "checkout -" works after a rebase A B ok 18 - checkout -B to the current branch works # passed all 18 test(s) 1..18 *** t2019-checkout-ambiguous-ref.sh *** ok 39 - #13: core.worktree+GIT_WORK_TREE accepted (with gitfile) ok 7 - git checkout -p HEAD with change already staged ok 1 - setup ambiguous refs ok 2 - checkout ambiguous ref succeeds ok 3 - checkout produces ambiguity warning ok 4 - checkout chooses branch over tag ok 5 - checkout reports switch to branch ok 6 - checkout vague ref succeeds ok 7 - checkout produces ambiguity warning ok 8 - checkout chooses branch over tag ok 9 - checkout reports switch to branch # passed all 9 test(s) 1..9 *** t2020-checkout-detach.sh *** ok 8 - git checkout -p HEAD^ ok 1 - setup ok 40 - #14: core.worktree with GIT_DIR pointing to gitfile ok 2 - checkout branch does not detach ok 3 - checkout tag detaches ok 9 - git checkout -p handles deletion ok 4 - checkout branch by full name detaches ok 5 - checkout non-ref detaches ok 6 - checkout ref^0 detaches ok 7 - checkout --detach detaches ok 8 - checkout --detach without branch name ok 41 - #14b: core.worktree is relative to actual git dir ok 9 - checkout --detach errors out for non-commit ok 42 - #15: setup ok 10 - checkout --detach errors out for extra argument ok 11 - checkout --detached and -b are incompatible ok 10 - path limiting works: dir ok 43 - #15: explicit GIT_WORK_TREE and GIT_DIR at toplevel ok 12 - checkout --detach moves HEAD ok 13 - checkout warns on orphan commits ok 14 - checkout warns on orphan commits: output ok 44 - #15: explicit GIT_WORK_TREE and GIT_DIR in subdir ok 15 - checkout warns orphaning 1 of 2 commits ok 16 - checkout warns orphaning 1 of 2 commits: output ok 21 - "checkout -" works after a rebase -i A ok 17 - checkout does not warn leaving ref tip ok 18 - checkout does not warn leaving ref tip ok 19 - checkout does not warn leaving reachable commit ok 20 - checkout does not warn leaving reachable commit ok 45 - #15: explicit GIT_WORK_TREE from parent of worktree ok 11 - path limiting works: -- dir ok 21 - tracking count is accurate after orphan check # passed all 21 test(s) 1..21 ok 46 - #15: explicit GIT_WORK_TREE from nephew of worktree *** t2021-checkout-overwrite.sh *** ok 47 - #15: chdir_to_toplevel uses worktree, not git dir ok 22 - "checkout -" works after a rebase -i A B ok 1 - setup # passed all 22 test(s) 1..22 *** t2022-checkout-paths.sh *** ok 2 - create a commit where dir a/b changed to file ok 3 - checkout commit with dir must not remove untracked a/b ok 12 - path limiting works: HEAD^ -- dir ok 48 - #15: chdir_to_toplevel uses worktree (from subdir) ok 1 - setup ok 4 - create a commit where dir a/b changed to symlink ok 5 - checkout commit with dir must not remove untracked a/b ok 6 - the symlink remained # passed all 6 test(s) 1..6 ok 49 - #16a: implicitly bare repo (cwd inside .git dir) *** t2023-checkout-m.sh *** ok 2 - checking out paths out of a tree does not clobber unrelated paths ok 50 - #16b: bare .git (cwd inside .git dir) ok 3 - do not touch unmerged entries matching $path but not in $tree # passed all 3 test(s) 1..3 ok 13 - path limiting works: foo inside dir *** t2024-checkout-dwim.sh *** ok 14 - none of this moved HEAD # passed all 14 test(s) 1..14 ok 51 - #16c: bare .git has no worktree *** t2030-unresolve-info.sh *** ok 52 - #16d: bareness preserved across alias ok 53 - #16e: bareness preserved by --bare ok 1 - setup ok 2 - git merge master ok 3 - -m restores 2-way conflicted+resolved file ok 4 - -m restores 3-way conflicted+resolved file # passed all 4 test(s) 1..4 *** t2050-git-dir-relative.sh *** ok 54 - #17: GIT_WORK_TREE without explicit GIT_DIR is accepted (bare case) ok 1 - setup ok 1 - Setting up post-commit hook ok 2 - post-commit hook used ordinarily ok 3 - post-commit-hook created and used from top dir ok 4 - post-commit-hook from sub dir # passed all 4 test(s) 1..4 ok 55 - #18: bare .git named by GIT_DIR has no worktree *** t2100-update-cache-badpath.sh *** ok 56 - #19: setup ok 2 - add records switch clears ok 1 - setup ok 2 - checkout of non-existing branch fails ok 3 - checkout of branch from multiple remotes fails #1 ok 1 - git update-index --add to add various paths. ok 2 - git update-index to add conflicting path path0/file0 should fail. ok 4 - checkout of branch from a single remote succeeds #1 ok 3 - git update-index to add conflicting path path1/file1 should fail. ok 4 - git update-index to add conflicting path path2 should fail. ok 57 - #19: explicit GIT_WORK_TREE and GIT_DIR at toplevel ok 5 - git update-index to add conflicting path path3 should fail. # passed all 5 test(s) 1..5 *** t2101-update-index-reupdate.sh *** ok 5 - checkout of branch from a single remote succeeds #2 ok 58 - #19: explicit GIT_WORK_TREE and GIT_DIR in subdir ok 6 - --no-guess suppresses branch auto-vivification ok 3 - rm records reset clears ok 1 - update-index --add ok 2 - update-index --again ok 3 - update-index --remove --again ok 59 - #19: explicit GIT_WORK_TREE from parent of worktree ok 4 - first commit ok 5 - update-index again ok 6 - update-index --update from subdir ok 60 - #19: explicit GIT_WORK_TREE from nephew of worktree ok 4 - plumbing clears ok 7 - update-index --update with pathspec # passed all 7 test(s) 1..7 *** t2102-update-index-symlinks.sh *** ok 1 - preparation ok 2 - modify the symbolic link ok 3 - the index entry must still be a symbolic link ok 61 - #19: chdir_to_toplevel uses worktree, not git dir # passed all 3 test(s) 1..3 *** t2103-update-index-ignore-missing.sh *** ok 5 - add records checkout -m undoes ok 62 - #19: chdir_to_toplevel uses worktree (from subdir) ok 6 - unmerge with plumbing ok 7 - setup more remotes with unconventional refspecs ok 8 - checkout of branch from multiple remotes fails #2 ok 63 - #20a: core.worktree without GIT_DIR accepted (inside .git) ok 1 - basics ok 2 - --ignore-missing --refresh ok 9 - checkout of branch from multiple remotes fails #3 ok 64 - #20b/c: core.worktree and core.bare conflict ok 7 - rerere and rerere forget ok 3 - --unmerged --refresh ok 4 - --ignore-submodules --refresh (1) ok 65 - #21: setup, core.worktree warns before overriding core.bare ok 10 - checkout of branch from a single remote succeeds #3 ok 5 - --ignore-submodules --refresh (2) # passed all 5 test(s) 1..5 *** t2104-update-index-skip-worktree.sh *** ok 11 - checkout of branch from a single remote succeeds #4 ok 66 - #21: explicit GIT_WORK_TREE and GIT_DIR at toplevel ok 12 - checkout of branch with a file having the same name fails ok 1 - setup ok 2 - index is at version 2 ok 3 - update-index --skip-worktree ok 4 - index is at version 3 after having some skip-worktree entries ok 8 - rerere and rerere forget (subdirectory) ok 5 - ls-files -t ok 6 - update-index --no-skip-worktree ok 13 - checkout -- succeeds, even if a file with the same name exists ok 7 - index version is back to 2 when there is no skip-worktree entry # passed all 13 test(s) 1..13 # passed all 7 test(s) 1..7 ok 9 - rerere forget (binary) ok 67 - #21: explicit GIT_WORK_TREE and GIT_DIR in subdir *** t2105-update-index-gitfile.sh *** *** t2106-update-index-assume-unchanged.sh *** ok 10 - rerere forget (add-add conflict) # passed all 10 test(s) 1..10 *** t2107-update-index-basic.sh *** ok 1 - setup ok 68 - #21: explicit GIT_WORK_TREE from parent of worktree ok 2 - do not switch branches with dirty file ok 1 - update-index --nonsense fails # passed all 2 test(s) 1..2 ok 2 - update-index --nonsense dumps usage ok 1 - submodule with absolute .git file ok 2 - add gitlink to absolute .git file *** t2200-add-update.sh *** ok 3 - update-index -h with corrupt index ok 4 - --cacheinfo does not accept blob null sha1 ok 69 - #21: explicit GIT_WORK_TREE from nephew of worktree ok 3 - submodule with relative .git file ok 4 - add gitlink to relative .git file # passed all 4 test(s) 1..4 ok 1 - setup *** t2201-add-update-typechange.sh *** ok 2 - update ok 3 - update noticed a removal ok 4 - update touched correct path ok 5 - update did not touch other tracked files ok 6 - update did not touch untracked files ok 70 - #21: chdir_to_toplevel uses worktree, not git dir ok 5 - --cacheinfo does not accept gitlink null sha1 # passed all 5 test(s) 1..5 *** t2202-add-addremove.sh *** ok 7 - cache tree has not been corrupted ok 8 - update from a subdirectory ok 1 - setup ok 9 - change gets noticed ok 10 - non-limited update in subdir leaves root alone ok 71 - #21: chdir_to_toplevel uses worktree (from subdir) ok 11 - replace a file with a symlink ok 12 - add everything changed ok 13 - touch and then add -u ok 1 - setup ok 14 - touch and then add explicitly ok 15 - add -n -u should not add but just report ok 2 - git add --all ok 2 - modify ok 3 - diff-files ok 3 - Just "git add" is a no-op ok 4 - diff-index # passed all 3 test(s) 1..3 ok 5 - add -u *** t2203-add-intent.sh *** ok 16 - add -u resolves unmerged paths ok 17 - "add -u non-existent" should fail # passed all 17 test(s) 1..17 *** t2204-add-ignored.sh *** ok 6 - commit -a # passed all 6 test(s) 1..6 ok 72 - #22a: core.worktree = GIT_DIR = .git dir *** t2300-cd-to-toplevel.sh *** ok 1 - intent to add ok 2 - check result of "add -N" ok 1 - setup ok 3 - intent to add is just an ordinary empty blob ok 2 - no complaints for unignored file ok 3 - no complaints for unignored dir/file ok 4 - intent to add does not clobber existing paths ok 1 - at physical root ok 4 - no complaints for unignored dir ok 5 - no complaints for unignored d* ok 2 - at physical subdir ok 5 - i-t-a entry is simply ignored ok 6 - complaints for ignored ign ok 7 - complaints for ignored ign output ok 8 - complaints for ignored ign with unignored file ok 9 - complaints for ignored ign with unignored file output ok 3 - at symbolic root ok 10 - complaints for ignored dir/ign ok 11 - complaints for ignored dir/ign output ok 6 - can commit with an unrelated i-t-a entry in index ok 12 - complaints for ignored dir/ign with unignored file ok 13 - complaints for ignored dir/ign with unignored file output ok 4 - at symbolic subdir ok 14 - complaints for ignored dir/sub ok 73 - #22b: core.worktree child of .git, GIT_DIR=.git ok 5 - at internal symbolic subdir ok 15 - complaints for ignored dir/sub output # passed all 5 test(s) 1..5 ok 7 - can "commit -a" with an i-t-a entry ok 16 - complaints for ignored dir/sub with unignored file *** t3000-ls-files-others.sh *** ok 17 - complaints for ignored dir/sub with unignored file output ok 18 - complaints for ignored dir/sub/ign ok 19 - complaints for ignored dir/sub/ign output ok 8 - cache-tree invalidates i-t-a paths # passed all 8 test(s) 1..8 ok 20 - complaints for ignored dir/sub/ign with unignored file ok 21 - complaints for ignored dir/sub/ign with unignored file output *** t3001-ls-files-others-exclude.sh *** ok 22 - complaints for ignored sub/file ok 23 - complaints for ignored sub/file output ok 24 - complaints for ignored sub/file with unignored file ok 25 - complaints for ignored sub/file with unignored file output ok 1 - setup ok 2 - setup: expected output ok 26 - complaints for ignored sub ok 27 - complaints for ignored sub output ok 3 - ls-files --others ok 1 - git ls-files --others with various exclude options. ok 4 - ls-files --others --directory ok 5 - --no-empty-directory hides empty directory ok 2 - git ls-files --others with \r\n line endings. ok 28 - complaints for ignored sub with unignored file ok 29 - complaints for ignored sub with unignored file output ok 3 - setup skip-worktree gitignore ok 30 - complaints for ignored sub/file ok 31 - complaints for ignored sub/file output ok 4 - git ls-files --others with various exclude options. ok 32 - complaints for ignored sub/file with unignored file ok 33 - complaints for ignored sub/file with unignored file output ok 5 - restore gitignore ok 34 - complaints for ignored sub/ign ok 74 - #22c: core.worktree = .git/.., GIT_DIR=.git ok 35 - complaints for ignored sub/ign output ok 6 - git status honors core.excludesfile ok 36 - complaints for ignored sub/ign with unignored file ok 7 - trailing slash in exclude allows directory match(1) ok 37 - complaints for ignored sub/ign with unignored file output ok 8 - trailing slash in exclude allows directory match (2) ok 38 - complaints for ignored sub in dir ok 9 - trailing slash in exclude forces directory match (1) ok 10 - trailing slash in exclude forces directory match (2) ok 39 - complaints for ignored sub in dir output ok 75 - #22.2: core.worktree and core.bare conflict ok 40 - complaints for ignored sub/file in dir ok 11 - negated exclude matches can override previous ones ok 41 - complaints for ignored sub/file in dir output ok 12 - excluded directory overrides content patterns ok 13 - negated directory doesn't affect content patterns ok 6 - ls-files --others with symlinked submodule ok 42 - complaints for ignored sub/ign in dir ok 14 - subdirectory ignore (setup) ok 43 - complaints for ignored sub/ign in dir output ok 76 - #23: setup # passed all 6 test(s) 1..6 ok 15 - subdirectory ignore (toplevel) ok 44 - complaints for ignored ign in sub ok 45 - complaints for ignored ign in sub output ok 16 - subdirectory ignore (l1/l2) ok 17 - subdirectory ignore (l1) *** t3002-ls-files-dashpath.sh *** ok 18 - show/hide empty ignored directory (setup) ok 46 - complaints for ignored file in sub ok 47 - complaints for ignored file in sub output ok 19 - show empty ignored directory with --directory # passed all 47 test(s) 1..47 ok 20 - hide empty ignored directory with --no-empty-directory *** t3003-ls-files-exclude.sh *** ok 21 - show/hide empty ignored sub-directory (setup) ok 22 - show empty ignored sub-directory with --directory ok 1 - setup ok 2 - git ls-files without path restriction. ok 77 - #23: explicit GIT_WORK_TREE and GIT_DIR at toplevel ok 3 - git ls-files with path restriction. ok 23 - hide empty ignored sub-directory with --no-empty-directory ok 4 - git ls-files with path restriction with --. ok 24 - pattern matches prefix completely ok 5 - git ls-files with path restriction with -- --. ok 25 - ls-files with "**" patterns ok 6 - git ls-files with no path restriction. # passed all 6 test(s) 1..6 ok 26 - ls-files with "**" patterns and no slashes # passed all 26 test(s) 1..26 ok 1 - create repo with file ok 2 - ls-files output contains file (cached) *** t3004-ls-files-basic.sh *** ok 3 - ls-files output contains file (modified) ok 4 - add file to gitignore ok 5 - ls-files output contains file (cached) *** t3005-ls-files-relative.sh *** ok 6 - ls-files output contains file (modified) ok 78 - #23: explicit GIT_WORK_TREE and GIT_DIR in subdir ok 7 - ls-files -i lists only tracked-but-ignored files ok 1 - ls-files in empty repository ok 2 - ls-files with nonexistent path # passed all 7 test(s) 1..7 ok 3 - ls-files with nonsense option *** t3006-ls-files-long.sh *** ok 4 - ls-files -h in corrupt repository # passed all 4 test(s) 1..4 *** t3010-ls-files-killed-modified.sh *** ok 1 - prepare ok 2 - ls-files with mixed levels ok 3 - ls-files -c ok 79 - #23: explicit GIT_WORK_TREE from parent of worktree ok 1 - setup ok 4 - ls-files -o ok 2 - overly-long path by itself is not a problem # passed all 4 test(s) 1..4 *** t3020-ls-files-error-unmatch.sh *** ok 3 - overly-long path does not replace another by mistake # passed all 3 test(s) 1..3 *** t3030-merge-recursive.sh *** ok 80 - #23: explicit GIT_WORK_TREE from nephew of worktree ok 1 - setup ok 2 - git ls-files --error-unmatch should fail with unmatched path. ok 1 - git update-index --add to add various paths. ok 3 - git ls-files --error-unmatch should succeed eith matched paths. # passed all 3 test(s) 1..3 *** t3031-merge-criscross.sh *** ok 2 - git ls-files -k to show killed files. ok 81 - #23: chdir_to_toplevel uses worktree, not git dir ok 3 - git ls-files -k output (w/o icase) ok 4 - git ls-files -k output (w/ icase) ok 5 - git ls-files -m to show modified files. ok 6 - validate git ls-files -m output. # passed all 6 test(s) 1..6 ok 82 - #23: chdir_to_toplevel uses worktree (from subdir) *** t3032-merge-recursive-options.sh *** ok 83 - #24: bare repo has no worktree (gitfile case) ok 1 - setup 1 ok 84 - #25: GIT_WORK_TREE accepted if GIT_DIR unset (bare gitfile case) ok 2 - setup 2 ok 1 - setup ok 2 - naive merge fails ok 3 - --ignore-space-change makes merge succeed ok 1 - setup repo with criss-cross history ok 85 - #26: bare repo has no worktree (GIT_DIR -> gitfile case) ok 3 - setup 3 ok 2 - recursive merge between F and G, causes segfault # passed all 2 test(s) 1..2 ok 4 - naive cherry-pick fails ok 86 - #27: setup *** t3040-subprojects-basic.sh *** ok 5 - -Xignore-space-change makes cherry-pick succeed ok 6 - --ignore-space-change: our w/s-only change wins ok 4 - setup 4 ok 87 - #27: explicit GIT_WORK_TREE and GIT_DIR at toplevel ok 7 - --ignore-space-change: their real change wins over w/s ok 1 - setup: create superproject ok 8 - --ignore-space-change: does not ignore new spaces ok 5 - setup 5 ok 9 - --ignore-all-space drops their new spaces ok 88 - #27: explicit GIT_WORK_TREE and GIT_DIR in subdir ok 10 - --ignore-all-space keeps our new spaces ok 2 - setup: create subprojects ok 3 - check if fsck ignores the subprojects ok 11 - --ignore-space-at-eol # passed all 11 test(s) 1..11 *** t3050-subprojects-fetch.sh *** ok 89 - #27: explicit GIT_WORK_TREE from parent of worktree ok 6 - setup 6 ok 4 - check if commit in a subproject detected ok 5 - check if a changed subproject HEAD can be committed ok 6 - check if diff-index works for subproject elements ok 7 - check if diff-tree works for subproject elements ok 8 - check if git diff works for subproject elements ok 7 - setup 7 ok 9 - check if clone works ok 1 - setup ok 90 - #27: explicit GIT_WORK_TREE from nephew of worktree ok 10 - removing and adding subproject ok 11 - checkout in superproject # passed all 11 test(s) 1..11 *** t3060-ls-files-with-tree.sh *** ok 8 - setup 8 ok 9 - setup 9 ok 2 - clone ok 91 - #27: chdir_to_toplevel uses worktree, not git dir ok 10 - merge-recursive simple ok 3 - advance ok 11 - merge-recursive result ok 1 - setup ok 2 - git -ls-files --with-tree should succeed from subdir ok 3 - git -ls-files --with-tree should add entries from named tree. # passed all 3 test(s) 1..3 *** t3070-wildmatch.sh *** ok 92 - #27: chdir_to_toplevel uses worktree (from subdir) ok 12 - fail if the index has unresolved entries ok 13 - merge-recursive remove conflict ok 14 - merge-recursive remove conflict ok 93 - #28: core.worktree and core.bare conflict (gitfile case) ok 1 - wildmatch: match 'foo' 'foo' ok 2 - fnmatch: match 'foo' 'foo' ok 3 - wildmatch: no match 'foo' 'bar' ok 15 - merge-recursive d/f simple ok 4 - fnmatch: no match 'foo' 'bar' ok 16 - merge-recursive result ok 5 - wildmatch: match '' '' ok 4 - fetch # passed all 4 test(s) 1..4 ok 6 - fnmatch: match '' '' ok 7 - wildmatch: match 'foo' '???' ok 94 - #29: setup *** t3100-ls-tree-restrict.sh *** ok 8 - fnmatch: match 'foo' '???' ok 9 - wildmatch: no match 'foo' '??' ok 10 - fnmatch: no match 'foo' '??' ok 11 - wildmatch: match 'foo' '*' ok 17 - merge-recursive d/f conflict ok 12 - fnmatch: match 'foo' '*' ok 13 - wildmatch: match 'foo' 'f*' ok 18 - merge-recursive d/f conflict result ok 14 - fnmatch: match 'foo' 'f*' ok 15 - wildmatch: no match 'foo' '*f' ok 16 - fnmatch: no match 'foo' '*f' ok 17 - wildmatch: match 'foo' '*foo*' ok 18 - fnmatch: match 'foo' '*foo*' ok 19 - wildmatch: match 'foobar' '*ob*a*r*' ok 95 - #29: explicit GIT_WORK_TREE and GIT_DIR at toplevel ok 19 - merge-recursive d/f conflict the other way ok 20 - fnmatch: match 'foobar' '*ob*a*r*' ok 20 - merge-recursive d/f conflict result the other way ok 21 - wildmatch: match 'aaaaaaabababab' '*ab' ok 22 - fnmatch: match 'aaaaaaabababab' '*ab' ok 23 - wildmatch: match 'foo*' 'foo\*' ok 24 - fnmatch: match 'foo*' 'foo\*' ok 25 - wildmatch: no match 'foobar' 'foo\*bar' ok 26 - fnmatch: no match 'foobar' 'foo\*bar' ok 21 - merge-recursive d/f conflict ok 27 - wildmatch: match 'f\oo' 'f\\oo' ok 28 - fnmatch: match 'f\oo' 'f\\oo' ok 1 - setup ok 29 - wildmatch: match 'ball' '*[al]?' ok 30 - fnmatch: match 'ball' '*[al]?' ok 31 - wildmatch: no match 'ten' '[ten]' ok 22 - merge-recursive d/f conflict result ok 32 - fnmatch: no match 'ten' '[ten]' ok 2 - ls-tree plain ok 96 - #29: explicit GIT_WORK_TREE and GIT_DIR in subdir ok 33 - wildmatch: no match 'ten' '**[!te]' ok 34 - fnmatch: match 'ten' '**[!te]' ok 35 - wildmatch: no match 'ten' '**[!ten]' ok 36 - fnmatch: no match 'ten' '**[!ten]' ok 3 - ls-tree recursive ok 37 - wildmatch: match 'ten' 't[a-g]n' ok 38 - fnmatch: match 'ten' 't[a-g]n' ok 23 - merge-recursive d/f conflict ok 4 - ls-tree recursive with -t ok 39 - wildmatch: no match 'ten' 't[!a-g]n' ok 40 - fnmatch: no match 'ten' 't[!a-g]n' ok 41 - wildmatch: match 'ton' 't[!a-g]n' ok 24 - merge-recursive d/f conflict result ok 5 - ls-tree recursive with -d ok 42 - fnmatch: match 'ton' 't[!a-g]n' ok 43 - wildmatch: match 'ton' 't[^a-g]n' ok 44 - fnmatch: match 'ton' 't[^a-g]n' ok 45 - wildmatch: match 'a]b' 'a[]]b' ok 25 - reset and 3-way merge ok 6 - ls-tree filtered with path ok 46 - wildmatch: match 'a-b' 'a[]-]b' ok 47 - wildmatch: match 'a]b' 'a[]-]b' ok 48 - wildmatch: no match 'aab' 'a[]-]b' ok 7 - ls-tree filtered with path1 path0 ok 49 - wildmatch: match 'aab' 'a[]a-]b' ok 50 - wildmatch: match ']' ']' ok 97 - #29: explicit GIT_WORK_TREE from parent of worktree ok 51 - fnmatch: match ']' ']' ok 52 - wildmatch: no match 'foo/baz/bar' 'foo*bar' ok 8 - ls-tree filtered with path0/ ok 53 - fnmatch: no match 'foo/baz/bar' 'foo*bar' ok 54 - wildmatch: no match 'foo/baz/bar' 'foo**bar' ok 55 - fnmatch: no match 'foo/baz/bar' 'foo**bar' ok 56 - wildmatch: no match 'foobazbar' 'foo**bar' ok 57 - fnmatch: match 'foobazbar' 'foo**bar' ok 58 - wildmatch: match 'foo/baz/bar' 'foo/**/bar' ok 9 - ls-tree filtered with path2 ok 59 - fnmatch: match 'foo/baz/bar' 'foo/**/bar' ok 60 - wildmatch: match 'foo/baz/bar' 'foo/**/**/bar' ok 61 - fnmatch: no match 'foo/baz/bar' 'foo/**/**/bar' ok 62 - wildmatch: match 'foo/b/a/z/bar' 'foo/**/bar' ok 10 - ls-tree filtered with path2/ ok 63 - fnmatch: no match 'foo/b/a/z/bar' 'foo/**/bar' ok 64 - wildmatch: match 'foo/b/a/z/bar' 'foo/**/**/bar' ok 26 - reset and bind merge ok 65 - fnmatch: no match 'foo/b/a/z/bar' 'foo/**/**/bar' ok 66 - wildmatch: match 'foo/bar' 'foo/**/bar' ok 11 - ls-tree filtered with path2/baz ok 67 - fnmatch: no match 'foo/bar' 'foo/**/bar' ok 98 - #29: explicit GIT_WORK_TREE from nephew of worktree ok 68 - wildmatch: match 'foo/bar' 'foo/**/**/bar' ok 12 - ls-tree filtered with path2/bak ok 69 - fnmatch: no match 'foo/bar' 'foo/**/**/bar' ok 13 - ls-tree -t filtered with path2/bak ok 27 - merge-recursive w/ empty work tree - ours has rename ok 70 - wildmatch: no match 'foo/bar' 'foo?bar' ok 71 - fnmatch: no match 'foo/bar' 'foo?bar' ok 72 - wildmatch: no match 'foo/bar' 'foo[/]bar' ok 73 - fnmatch: no match 'foo/bar' 'foo[/]bar' ok 14 - ls-tree with one path a prefix of the other ok 74 - wildmatch: no match 'foo/bar' 'f[^eiu][^eiu][^eiu][^eiu][^eiu]r' # passed all 14 test(s) 1..14 ok 75 - fnmatch: no match 'foo/bar' 'f[^eiu][^eiu][^eiu][^eiu][^eiu]r' *** t3101-ls-tree-dirname.sh *** ok 76 - wildmatch: match 'foo-bar' 'f[^eiu][^eiu][^eiu][^eiu][^eiu]r' ok 77 - fnmatch: match 'foo-bar' 'f[^eiu][^eiu][^eiu][^eiu][^eiu]r' ok 78 - wildmatch: match 'foo' '**/foo' ok 28 - merge-recursive w/ empty work tree - theirs has rename ok 79 - fnmatch: no match 'foo' '**/foo' ok 99 - #29: chdir_to_toplevel uses worktree, not git dir ok 80 - wildmatch: match 'XXX/foo' '**/foo' ok 81 - wildmatch: match 'bar/baz/foo' '**/foo' ok 82 - fnmatch: no match 'bar/baz/foo' '**/foo' ok 83 - wildmatch: no match 'bar/baz/foo' '*/foo' ok 84 - fnmatch: no match 'bar/baz/foo' '*/foo' ok 85 - wildmatch: no match 'foo/bar/baz' '**/bar*' ok 86 - fnmatch: no match 'foo/bar/baz' '**/bar*' ok 87 - wildmatch: match 'deep/foo/bar/baz' '**/bar/*' ok 88 - fnmatch: no match 'deep/foo/bar/baz' '**/bar/*' ok 89 - wildmatch: no match 'deep/foo/bar/baz/' '**/bar/*' ok 90 - fnmatch: no match 'deep/foo/bar/baz/' '**/bar/*' ok 91 - wildmatch: match 'deep/foo/bar/baz/' '**/bar/**' ok 92 - fnmatch: no match 'deep/foo/bar/baz/' '**/bar/**' ok 93 - wildmatch: no match 'deep/foo/bar' '**/bar/*' ok 94 - fnmatch: no match 'deep/foo/bar' '**/bar/*' ok 95 - wildmatch: match 'deep/foo/bar/' '**/bar/**' ok 96 - fnmatch: no match 'deep/foo/bar/' '**/bar/**' ok 97 - wildmatch: no match 'foo/bar/baz' '**/bar**' ok 98 - fnmatch: no match 'foo/bar/baz' '**/bar**' ok 29 - merge removes empty directories ok 1 - setup ok 99 - wildmatch: match 'foo/bar/baz/x' '*/bar/**' ok 100 - fnmatch: no match 'foo/bar/baz/x' '*/bar/**' ok 101 - wildmatch: no match 'deep/foo/bar/baz/x' '*/bar/**' ok 102 - fnmatch: no match 'deep/foo/bar/baz/x' '*/bar/**' ok 2 - ls-tree plain not ok 30 - merge-recursive simple w/submodule # TODO known breakage ok 103 - wildmatch: match 'deep/foo/bar/baz/x' '**/bar/*/*' not ok 31 - merge-recursive simple w/submodule result # TODO known breakage ok 104 - fnmatch: no match 'deep/foo/bar/baz/x' '**/bar/*/*' ok 3 - ls-tree recursive ok 105 - wildmatch: no match 'acrt' 'a[c-c]st' ok 106 - fnmatch: no match 'acrt' 'a[c-c]st' ok 107 - wildmatch: match 'acrt' 'a[c-c]rt' ok 108 - fnmatch: match 'acrt' 'a[c-c]rt' ok 109 - wildmatch: no match ']' '[!]-]' ok 100 - #29: chdir_to_toplevel uses worktree (from subdir) ok 110 - fnmatch: no match ']' '[!]-]' ok 111 - wildmatch: match 'a' '[!]-]' ok 112 - wildmatch: no match '' '\' ok 113 - fnmatch: no match '' '\' ok 4 - ls-tree filter 1.txt ok 114 - wildmatch: no match '\' '\' ok 115 - wildmatch: no match 'XXX/\' '*/\' ok 116 - wildmatch: match 'XXX/\' '*/\\' ok 117 - wildmatch: match 'foo' 'foo' ok 118 - fnmatch: match 'foo' 'foo' ok 5 - ls-tree filter path1/b/c/1.txt ok 119 - wildmatch: match '@foo' '@foo' ok 32 - merge-recursive copy vs. rename ok 120 - fnmatch: match '@foo' '@foo' ok 121 - wildmatch: no match 'foo' '@foo' ok 122 - fnmatch: no match 'foo' '@foo' ok 123 - wildmatch: match '[ab]' '\[ab]' ok 6 - ls-tree filter all 1.txt files ok 101 - #30: core.worktree and core.bare conflict (gitfile version) ok 7 - ls-tree filter directories ok 124 - fnmatch: match '[ab]' '\[ab]' ok 125 - wildmatch: match '[ab]' '[[]ab]' ok 126 - fnmatch: match '[ab]' '[[]ab]' ok 8 - ls-tree filter odd names ok 127 - wildmatch: match '[ab]' '[[:]ab]' ok 102 - #31: setup ok 128 - wildmatch: no match '[ab]' '[[::]ab]' ok 129 - wildmatch: match '[ab]' '[[:digit]ab]' ok 9 - ls-tree filter missing files and extra slashes ok 130 - wildmatch: match '[ab]' '[\[:]ab]' not ok 33 - merge-recursive rename vs. rename/symlink # TODO known breakage ok 10 - ls-tree filter is leading path match ok 131 - wildmatch: match '?a?b' '\??\?b' # still have 3 known breakage(s) # passed all remaining 30 test(s) 1..33 ok 132 - fnmatch: match '?a?b' '\??\?b' ok 11 - ls-tree --full-name ok 133 - wildmatch: match 'abc' '\a\b\c' ok 134 - fnmatch: match 'abc' '\a\b\c' ok 135 - wildmatch: no match 'foo' '' ok 136 - fnmatch: no match 'foo' '' ok 137 - wildmatch: match 'foo/bar/baz/to' '**/t[o]' ok 138 - fnmatch: no match 'foo/bar/baz/to' '**/t[o]' ok 139 - wildmatch: match 'a1B' '[[:alpha:]][[:digit:]][[:upper:]]' ok 140 - wildmatch: no match 'a' '[[:digit:][:upper:][:space:]]' ok 12 - ls-tree --full-tree ok 141 - wildmatch: match 'A' '[[:digit:][:upper:][:space:]]' *** t3102-ls-tree-wildcards.sh *** ok 142 - wildmatch: match '1' '[[:digit:][:upper:][:space:]]' ok 143 - wildmatch: no match '1' '[[:digit:][:upper:][:spaci:]]' ok 13 - ls-tree --full-tree -r ok 144 - wildmatch: match ' ' '[[:digit:][:upper:][:space:]]' ok 103 - #31: explicit GIT_WORK_TREE and GIT_DIR at toplevel ok 145 - wildmatch: no match '.' '[[:digit:][:upper:][:space:]]' ok 146 - wildmatch: match '.' '[[:digit:][:punct:][:space:]]' ok 147 - wildmatch: match '5' '[[:xdigit:]]' ok 148 - wildmatch: match 'f' '[[:xdigit:]]' ok 14 - ls-tree --abbrev=5 ok 149 - wildmatch: match 'D' '[[:xdigit:]]' ok 150 - wildmatch: match '_' '[[:alnum:][:alpha:][:blank:][:cntrl:][:digit:][:graph:][:lower:][:print:][:punct:][:space:][:upper:][:xdigit:]]' ok 151 - wildmatch: match '_' '[[:alnum:][:alpha:][:blank:][:cntrl:][:digit:][:graph:][:lower:][:print:][:punct:][:space:][:upper:][:xdigit:]]' ok 152 - wildmatch: match '.' '[^[:alnum:][:alpha:][:blank:][:cntrl:][:digit:][:lower:][:space:][:upper:][:xdigit:]]' ok 153 - wildmatch: match '5' '[a-c[:digit:]x-z]' ok 154 - wildmatch: match 'b' '[a-c[:digit:]x-z]' ok 155 - wildmatch: match 'y' '[a-c[:digit:]x-z]' ok 156 - wildmatch: no match 'q' '[a-c[:digit:]x-z]' ok 15 - ls-tree --name-only ok 157 - wildmatch: match ']' '[\\-^]' ok 1 - setup ok 158 - wildmatch: no match '[' '[\\-^]' ok 16 - ls-tree --name-only -r ok 159 - fnmatch: no match '[' '[\\-^]' # passed all 16 test(s) 1..16 ok 160 - wildmatch: match '-' '[\-_]' ok 2 - ls-tree a[a] matches literally # passed all 2 test(s) 1..2 *** t3103-ls-tree-misc.sh *** ok 161 - wildmatch: match ']' '[\]]' ok 104 - #31: explicit GIT_WORK_TREE and GIT_DIR in subdir ok 162 - wildmatch: no match '\]' '[\]]' ok 163 - fnmatch: no match '\]' '[\]]' ok 164 - wildmatch: no match '\' '[\]]' ok 165 - fnmatch: no match '\' '[\]]' *** t3200-branch.sh *** ok 166 - wildmatch: no match 'ab' 'a[]b' ok 167 - fnmatch: no match 'ab' 'a[]b' ok 168 - wildmatch: no match 'a[]b' 'a[]b' ok 169 - wildmatch: no match 'ab[' 'ab[' ok 1 - setup ok 2 - ls-tree fails with non-zero exit code on broken tree ok 170 - wildmatch: no match 'ab' '[!' # passed all 2 test(s) 1..2 ok 171 - fnmatch: no match 'ab' '[!' ok 172 - wildmatch: no match 'ab' '[-' ok 173 - fnmatch: no match 'ab' '[-' ok 1 - prepare a trivial repository ok 174 - wildmatch: match '-' '[-]' *** t3201-branch-contains.sh *** ok 2 - git branch --help should not have created a bogus branch ok 175 - fnmatch: match '-' '[-]' ok 105 - #31: explicit GIT_WORK_TREE from parent of worktree ok 176 - wildmatch: no match '-' '[a-' ok 177 - fnmatch: no match '-' '[a-' ok 178 - wildmatch: no match '-' '[!a-' ok 179 - fnmatch: no match '-' '[!a-' ok 180 - wildmatch: match '-' '[--A]' ok 181 - wildmatch: match '5' '[--A]' ok 182 - wildmatch: match ' ' '[ --]' ok 183 - fnmatch: match ' ' '[ --]' ok 184 - wildmatch: match '$' '[ --]' ok 185 - fnmatch: match '$' '[ --]' ok 3 - branch -h in broken repository ok 186 - wildmatch: match '-' '[ --]' ok 187 - fnmatch: match '-' '[ --]' ok 188 - wildmatch: no match '0' '[ --]' ok 4 - git branch abc should create a branch ok 189 - fnmatch: no match '0' '[ --]' ok 5 - git branch a/b/c should create a branch ok 190 - wildmatch: match '-' '[---]' ok 191 - wildmatch: match '-' '[------]' ok 6 - git branch HEAD should fail ok 192 - wildmatch: no match 'j' '[a-e-n]' ok 193 - fnmatch: no match 'j' '[a-e-n]' ok 194 - wildmatch: match '-' '[a-e-n]' ok 195 - wildmatch: match 'a' '[!------]' ok 7 - git branch -l d/e/f should create a branch and a log ok 196 - wildmatch: no match '[' '[]-a]' ok 197 - fnmatch: no match '[' '[]-a]' ok 8 - git branch -d d/e/f should delete a branch and a log ok 198 - wildmatch: match '^' '[]-a]' ok 199 - wildmatch: no match '^' '[!]-a]' ok 200 - fnmatch: no match '^' '[!]-a]' ok 201 - wildmatch: match '[' '[!]-a]' ok 202 - wildmatch: match '^' '[a^bc]' ok 106 - #31: explicit GIT_WORK_TREE from nephew of worktree ok 9 - git branch j/k should work after branch j has been deleted ok 203 - fnmatch: match '^' '[a^bc]' ok 204 - wildmatch: match '-b]' '[a-]b]' ok 1 - setup ok 205 - wildmatch: no match '\' '[\]' ok 10 - git branch l should work after branch l/m has been deleted ok 206 - fnmatch: no match '\' '[\]' ok 2 - branch --contains=master ok 11 - git branch -m dumps usage ok 207 - wildmatch: match '\' '[\\]' ok 3 - branch --contains master ok 208 - fnmatch: match '\' '[\\]' ok 209 - wildmatch: no match '\' '[!\\]' ok 4 - branch --contains=side ok 210 - fnmatch: no match '\' '[!\\]' ok 211 - wildmatch: match 'G' '[A-\\]' ok 12 - git branch -m m m/m should work ok 5 - branch --contains with pattern implies --list ok 212 - fnmatch: match 'G' '[A-\\]' ok 13 - git branch -m n/n n should work ok 6 - side: branch --merged ok 213 - wildmatch: no match 'aaabbb' 'b*a' ok 214 - fnmatch: no match 'aaabbb' 'b*a' ok 215 - wildmatch: no match 'aabcaa' '*ba*' ok 216 - fnmatch: no match 'aabcaa' '*ba*' ok 14 - git branch -m o/o o should fail when o/p exists ok 7 - branch --merged with pattern implies --list ok 8 - side: branch --no-merged ok 217 - wildmatch: match ',' '[,]' ok 218 - fnmatch: match ',' '[,]' ok 107 - #31: chdir_to_toplevel uses worktree, not git dir ok 219 - wildmatch: match ',' '[\\,]' ok 220 - fnmatch: match ',' '[\\,]' ok 9 - master: branch --merged ok 221 - wildmatch: match '\' '[\\,]' ok 222 - fnmatch: match '\' '[\\,]' ok 15 - git branch -m q r/q should fail when r exists ok 223 - wildmatch: match '-' '[,-.]' ok 224 - fnmatch: match '-' '[,-.]' ok 10 - master: branch --no-merged ok 16 - git branch -M foo bar should fail when bar is checked out ok 225 - wildmatch: no match '+' '[,-.]' ok 11 - branch --no-merged with pattern implies --list ok 226 - fnmatch: no match '+' '[,-.]' ok 227 - wildmatch: no match '-.]' '[,-.]' ok 17 - git branch -M baz bam should succeed when baz is checked out ok 228 - fnmatch: no match '-.]' '[,-.]' ok 229 - wildmatch: match '2' '[\1-\3]' ok 230 - fnmatch: match '2' '[\1-\3]' ok 12 - implicit --list conflicts with modification options ok 231 - wildmatch: match '3' '[\1-\3]' ok 18 - git branch -M master should work when master is checked out ok 232 - fnmatch: match '3' '[\1-\3]' ok 233 - wildmatch: no match '4' '[\1-\3]' # passed all 12 test(s) 1..12 ok 234 - fnmatch: no match '4' '[\1-\3]' ok 235 - wildmatch: match '\' '[[-\]]' ok 19 - git branch -M master master should work when master is checked out ok 236 - fnmatch: match '\' '[[-\]]' ok 237 - wildmatch: match '[' '[[-\]]' ok 238 - fnmatch: match '[' '[[-\]]' ok 239 - wildmatch: match ']' '[[-\]]' *** t3202-show-branch-octopus.sh *** ok 240 - fnmatch: match ']' '[[-\]]' ok 241 - wildmatch: no match '-' '[[-\]]' ok 20 - git branch -M master2 master2 should work when master is checked out ok 108 - #31: chdir_to_toplevel uses worktree (from subdir) ok 242 - fnmatch: no match '-' '[[-\]]' ok 243 - wildmatch: match '-adobe-courier-bold-o-normal--12-120-75-75-m-70-iso8859-1' '-*-*-*-*-*-*-12-*-*-*-m-*-*-*' ok 21 - git branch -v -d t should work # passed all 108 test(s) 1..108 ok 244 - fnmatch: match '-adobe-courier-bold-o-normal--12-120-75-75-m-70-iso8859-1' '-*-*-*-*-*-*-12-*-*-*-m-*-*-*' ok 245 - wildmatch: no match '-adobe-courier-bold-o-normal--12-120-75-75-X-70-iso8859-1' '-*-*-*-*-*-*-12-*-*-*-m-*-*-*' ok 246 - fnmatch: no match '-adobe-courier-bold-o-normal--12-120-75-75-X-70-iso8859-1' '-*-*-*-*-*-*-12-*-*-*-m-*-*-*' ok 247 - wildmatch: no match '-adobe-courier-bold-o-normal--12-120-75-75-/-70-iso8859-1' '-*-*-*-*-*-*-12-*-*-*-m-*-*-*' ok 248 - fnmatch: no match '-adobe-courier-bold-o-normal--12-120-75-75-/-70-iso8859-1' '-*-*-*-*-*-*-12-*-*-*-m-*-*-*' ok 249 - wildmatch: match 'XXX/adobe/courier/bold/o/normal//12/120/75/75/m/70/iso8859/1' 'XXX/*/*/*/*/*/*/12/*/*/*/m/*/*/*' ok 250 - fnmatch: match 'XXX/adobe/courier/bold/o/normal//12/120/75/75/m/70/iso8859/1' 'XXX/*/*/*/*/*/*/12/*/*/*/m/*/*/*' ok 251 - wildmatch: no match 'XXX/adobe/courier/bold/o/normal//12/120/75/75/X/70/iso8859/1' 'XXX/*/*/*/*/*/*/12/*/*/*/m/*/*/*' ok 22 - git branch -v -m t s should work ok 252 - fnmatch: no match 'XXX/adobe/courier/bold/o/normal//12/120/75/75/X/70/iso8859/1' 'XXX/*/*/*/*/*/*/12/*/*/*/m/*/*/*' ok 253 - wildmatch: match 'abcd/abcdefg/abcdefghijk/abcdefghijklmnop.txt' '**/*a*b*g*n*t' ok 254 - fnmatch: no match 'abcd/abcdefg/abcdefghijk/abcdefghijklmnop.txt' '**/*a*b*g*n*t' ok 255 - wildmatch: no match 'abcd/abcdefg/abcdefghijk/abcdefghijklmnop.txtz' '**/*a*b*g*n*t' ok 256 - fnmatch: no match 'abcd/abcdefg/abcdefghijk/abcdefghijklmnop.txtz' '**/*a*b*g*n*t' ok 257 - wildmatch: no match 'foo' '*/*/*' ok 23 - git branch -m -d t s should fail ok 258 - wildmatch: no match 'foo/bar' '*/*/*' ok 259 - wildmatch: match 'foo/bba/arr' '*/*/*' ok 24 - git branch --list -d t should fail ok 260 - wildmatch: no match 'foo/bb/aa/rr' '*/*/*' ok 261 - wildmatch: match 'foo/bb/aa/rr' '**/**/**' *** t3203-branch-output.sh *** ok 262 - wildmatch: match 'abcXdefXghi' '*X*i' ok 25 - git branch --column ok 263 - wildmatch: no match 'ab/cXd/efXg/hi' '*X*i' ok 264 - wildmatch: match 'ab/cXd/efXg/hi' '*/*X*/*/*i' ok 265 - wildmatch: match 'ab/cXd/efXg/hi' '**/*X*/**/*i' ok 266 - pathmatch: match 'foo' 'foo' ok 267 - pathmatch: no match 'foo' 'fo' ok 268 - pathmatch: match 'foo/bar' 'foo/bar' ok 269 - pathmatch: match 'foo/bar' 'foo/*' ok 270 - pathmatch: match 'foo/bba/arr' 'foo/*' ok 271 - pathmatch: match 'foo/bba/arr' 'foo/**' ok 272 - pathmatch: match 'foo/bba/arr' 'foo*' ok 273 - pathmatch: match 'foo/bba/arr' 'foo**' ok 274 - pathmatch: match 'foo/bba/arr' 'foo/*arr' ok 275 - pathmatch: match 'foo/bba/arr' 'foo/**arr' ok 1 - make commits ok 26 - git branch --column with an extremely long branch name ok 276 - pathmatch: no match 'foo/bba/arr' 'foo/*z' ok 277 - pathmatch: no match 'foo/bba/arr' 'foo/**z' ok 2 - make branches ok 278 - pathmatch: match 'foo/bar' 'foo?bar' ok 279 - pathmatch: match 'foo/bar' 'foo[/]bar' ok 280 - pathmatch: no match 'foo' '*/*/*' ok 3 - make remote branches ok 281 - pathmatch: no match 'foo/bar' '*/*/*' ok 27 - git branch with column.* ok 282 - pathmatch: match 'foo/bba/arr' '*/*/*' ok 283 - pathmatch: match 'foo/bb/aa/rr' '*/*/*' ok 284 - pathmatch: match 'abcXdefXghi' '*X*i' ok 285 - pathmatch: match 'ab/cXd/efXg/hi' '*/*X*/*/*i' ok 4 - git branch shows local branches ok 28 - git branch --column -v should fail ok 286 - pathmatch: match 'ab/cXd/efXg/hi' '*Xg*i' ok 5 - git branch --list shows local branches ok 287 - wildmatch: no match 'a' '[A-Z]' ok 6 - git branch --list pattern shows matching local branches ok 288 - wildmatch: match 'A' '[A-Z]' ok 7 - git branch -r shows remote branches ok 289 - wildmatch: no match 'A' '[a-z]' ok 290 - wildmatch: match 'a' '[a-z]' ok 8 - git branch -a shows local and remote branches ok 29 - git branch -v with column.ui ignored ok 9 - git branch -v shows branch summaries ok 291 - wildmatch: no match 'a' '[[:upper:]]' ok 30 - git branch -m q q2 without config should succeed ok 292 - wildmatch: match 'A' '[[:upper:]]' ok 293 - wildmatch: no match 'A' '[[:lower:]]' ok 294 - wildmatch: match 'a' '[[:lower:]]' ok 10 - git branch --list -v pattern shows branch summaries ok 295 - wildmatch: no match 'A' '[B-Za]' ok 11 - git branch -v pattern does not show branch summaries ok 296 - wildmatch: match 'a' '[B-Za]' ok 297 - wildmatch: no match 'A' '[B-a]' ok 298 - wildmatch: match 'a' '[B-a]' ok 299 - wildmatch: no match 'z' '[Z-y]' ok 300 - wildmatch: match 'Z' '[Z-y]' ok 12 - git branch shows detached HEAD properly # passed all 12 test(s) 1..12 ok 301 - iwildmatch: match 'a' '[A-Z]' ok 302 - iwildmatch: match 'A' '[A-Z]' ok 303 - iwildmatch: match 'A' '[a-z]' ok 304 - iwildmatch: match 'a' '[a-z]' ok 305 - iwildmatch: match 'a' '[[:upper:]]' *** t3210-pack-refs.sh *** ok 31 - git branch -m s/s s should work when s/t is deleted ok 306 - iwildmatch: match 'A' '[[:upper:]]' ok 32 - config information was renamed, too ok 307 - iwildmatch: match 'A' '[[:lower:]]' ok 308 - iwildmatch: match 'a' '[[:lower:]]' ok 309 - iwildmatch: match 'A' '[B-Za]' ok 310 - iwildmatch: match 'a' '[B-Za]' ok 311 - iwildmatch: match 'A' '[B-a]' ok 312 - iwildmatch: match 'a' '[B-a]' ok 33 - deleting a symref ok 313 - iwildmatch: match 'z' '[Z-y]' ok 314 - iwildmatch: match 'Z' '[Z-y]' ok 34 - deleting a dangling symref ok 1 - setup # passed all 314 test(s) 1..314 ok 1 - prepare a trivial repository ok 35 - renaming a symref is not allowed ok 2 - show-branch with more than 8 branches *** t3211-peel-ref.sh *** ok 2 - see if git show-ref works as expected ok 36 - git branch -m u v should fail when the reflog for u is a symlink ok 3 - see if a branch still exists when packed ok 4 - git branch c/d should barf if branch c exists ok 5 - see if a branch still exists after git pack-refs --prune ok 6 - see if git pack-refs --prune remove ref files ok 3 - show-branch with showbranch.default # passed all 3 test(s) 1..3 ok 7 - see if git pack-refs --prune removes empty dirs ok 37 - test tracking setup via --track ok 1 - create annotated tag in refs/tags ok 2 - create annotated tag outside of refs/tags *** t3300-funny-names.sh *** ok 3 - set up expected show-ref output ok 38 - test tracking setup (non-wildcard, matching) ok 4 - refs are peeled outside of refs/tags (loose) ok 8 - git branch g should work when git branch g/h has been deleted ok 5 - refs are peeled outside of refs/tags (packed) ok 39 - tracking setup fails on non-matching refspec ok 9 - git branch i/j/k should barf if branch i exists ok 1 - setup ok 6 - create old-style pack-refs without fully-peeled ok 2 - setup: populate index and tree ok 7 - refs are peeled outside of refs/tags (old packed) ok 3 - ls-files prints space in filename verbatim ok 10 - test git branch k after branch k/l/m and k/lm have been deleted ok 4 - setup: add funny filename ok 40 - test tracking setup via config ok 5 - ls-files quotes funny filename ok 8 - peeled refs survive deletion of packed ref # passed all 8 test(s) 1..8 ok 11 - test git branch n after some branch deletion and pruning *** t3301-notes.sh *** ok 6 - ls-files -z does not quote funny filename ok 12 - see if up-to-date packed refs are preserved ok 7 - ls-tree quotes funny filename ok 8 - diff-index --name-status quotes funny filename ok 41 - test overriding tracking setup via --no-track ok 9 - diff-tree --name-status quotes funny filename ok 13 - pack, prune and repack ok 10 - diff-index -z does not quote funny filename ok 1 - cannot annotate non-existing HEAD ok 2 - setup ok 42 - no tracking without .fetch entries ok 11 - diff-tree -z does not quote funny filename ok 3 - need valid notes ref ok 14 - explicit pack-refs with dangling packed reference ok 4 - refusing to add notes in refs/heads/ ok 5 - refusing to edit notes in refs/remotes/ ok 43 - test tracking setup via --track but deeper ok 6 - handle empty notes gracefully ok 12 - diff-tree --find-copies-harder quotes funny filename ok 44 - test deleting branch deletes branch config ok 15 - delete ref with dangling packed version ok 13 - setup: remove unfunny index entry ok 7 - show non-existent notes entry with %N ok 14 - diff-tree -M quotes funny filename ok 45 - test deleting branch without config ok 15 - diff-index -M -p quotes funny filename ok 16 - setup: mode change ok 46 - test --track without .fetch entries ok 17 - diff-index -M -p with mode change quotes funny filename ok 16 - delete ref while another dangling packed ref # passed all 16 test(s) 1..16 *** t3302-notes-index-expensive.sh *** ok 8 - create notes ok 47 - branch from non-branch HEAD w/autosetupmerge=always ok 48 - branch from non-branch HEAD w/--track causes failure ok 18 - diffstat for rename quotes funny filename ok 9 - show notes entry with %N ok 49 - branch from tag w/--track causes failure ok 50 - --set-upstream-to fails on multiple branches ok 10 - create reflog entry ok 19 - numstat for rename quotes funny filename ok 1 - setup / mkdir ok 51 - --set-upstream-to fails on detached HEAD ok 52 - --set-upstream-to fails on a missing dst branch ok 20 - numstat without -M quotes funny filename ok 53 - --set-upstream-to fails on a missing src branch ok 54 - --set-upstream-to fails on a non-ref ok 21 - numstat for non-git rename diff quotes funny filename ok 11 - edit existing notes # passed all 21 test(s) 1..21 ok 2 - setup 10 *** t3303-notes-subtrees.sh *** ok 12 - cannot "git notes add -m" where notes already exists ok 3 - notes work ok 4 # skip notes timing with /usr/bin/time (missing USR_BIN_TIME of USR_BIN_TIME,NOT_EXPENSIVE) ok 5 - teardown / cd .. ok 6 # skip setup / mkdir (missing EXPENSIVE) ok 7 # skip setup 100 (missing EXPENSIVE) ok 8 # skip notes work (missing EXPENSIVE) ok 9 # skip notes timing with /usr/bin/time (missing EXPENSIVE,USR_BIN_TIME of USR_BIN_TIME,EXPENSIVE) ok 10 # skip teardown / cd .. (missing EXPENSIVE) ok 11 # skip setup / mkdir (missing EXPENSIVE) ok 12 # skip setup 1000 (missing EXPENSIVE) ok 13 # skip notes work (missing EXPENSIVE) ok 14 # skip notes timing with /usr/bin/time (missing EXPENSIVE,USR_BIN_TIME of USR_BIN_TIME,EXPENSIVE) ok 15 # skip teardown / cd .. (missing EXPENSIVE) ok 16 # skip setup / mkdir (missing EXPENSIVE) ok 17 # skip setup 10000 (missing EXPENSIVE) ok 18 # skip notes work (missing EXPENSIVE) ok 19 # skip notes timing with /usr/bin/time (missing EXPENSIVE,USR_BIN_TIME of USR_BIN_TIME,EXPENSIVE) ok 20 # skip teardown / cd .. (missing EXPENSIVE) ok 55 - use --set-upstream-to modify HEAD # passed all 20 test(s) 1..20 ok 13 - can overwrite existing note with "git notes add -f -m" *** t3304-notes-mixed.sh *** ok 56 - use --set-upstream-to modify a particular branch ok 57 - --unset-upstream should fail if given a non-existent branch ok 14 - add w/no options on existing note morphs into edit ok 1 - setup: create a couple of commits ok 58 - test --unset-upstream on HEAD ok 59 - --unset-upstream should fail on multiple branches ok 60 - --unset-upstream should fail on detached HEAD ok 15 - can overwrite existing note with "git notes add -f" ok 2 - create a notes tree with both notes and non-notes ok 61 - test --unset-upstream on a particular branch ok 3 - verify contents of notes ok 16 - show notes ok 62 - --set-upstream shows message when creating a new branch that exists as remote-tracking ok 63 - --set-upstream with two args only shows the deprecation message ok 17 - create multi-line notes (setup) ok 4 - verify contents of non-notes ok 18 - show multi-line notes ok 5 - git-notes preserves non-notes ok 64 - --set-upstream with one arg only shows the deprecation message if the branch existed ok 65 - git checkout -b g/h/i -l should create a branch and a log ok 19 - create -F notes (setup) ok 6 - verify contents of non-notes after git-notes ok 20 - show -F notes # passed all 6 test(s) 1..6 *** t3305-notes-fanout.sh *** ok 66 - checkout -b makes reflog by default ok 21 - Re-adding -F notes without -f fails ok 22 - git log --pretty=raw does not show notes ok 67 - checkout -b does not make reflog when core.logAllRefUpdates = false ok 23 - git log --show-notes ok 24 - git log --no-notes ok 25 - git format-patch does not show notes ok 68 - checkout -b with -l makes reflog when core.logAllRefUpdates = false ok 26 - git format-patch --show-notes does show notes ok 27 - git show does show notes ok 28 - git show --pretty does not show notes ok 1 - setup: create 100 commits ok 29 - git show --pretty=raw does not show notes ok 30 - git show --pretty=short does not show notes ok 69 - avoid ambiguous track ok 31 - git show --pretty=medium does not show notes ok 32 - git show --pretty=full does not show notes ok 33 - git show --pretty=fuller does not show notes ok 34 - git show --pretty=format:%s does not show notes ok 35 - git show --oneline does not show notes ok 36 - setup alternate notes ref ok 37 - git log --notes shows default notes ok 38 - git log --notes=X shows only X ok 39 - git log --notes --notes=X shows both ok 40 - git log --no-notes resets default state ok 70 - autosetuprebase local on a tracked local branch ok 41 - git log --no-notes resets ref list ok 42 - create -m notes (setup) ok 43 - show -m notes ok 44 - remove note with add -f -F /dev/null (setup) ok 45 - verify note removal with -F /dev/null ok 71 - autosetuprebase always on a tracked local branch ok 46 - do not create empty note with -m "" (setup) ok 47 - verify non-creation of note with -m "" ok 48 - create note with combination of -m and -F ok 49 - remove note with "git notes remove" (setup) ok 50 - verify note removal with "git notes remove" ok 51 - removing non-existing note should not create new commit ok 52 - removing more than one ok 53 - removing is atomic ok 72 - autosetuprebase remote on a tracked local branch ok 54 - removing with --ignore-missing ok 55 - removing with --ignore-missing but bogus ref ok 56 - remove reads from --stdin ok 73 - autosetuprebase never on a tracked local branch ok 57 - remove --stdin is also atomic ok 58 - removing with --stdin --ignore-missing ok 74 - autosetuprebase local on a tracked remote branch ok 59 - list notes with "git notes list" ok 60 - list notes with "git notes" ok 61 - list specific note with "git notes list " ok 62 - listing non-existing notes fails ok 63 - append to existing note with "git notes append" ok 64 - "git notes list" does not expand to "git notes list HEAD" ok 75 - autosetuprebase never on a tracked remote branch ok 65 - appending empty string does not change existing note ok 66 - git notes append == add when there is no existing note ok 76 - autosetuprebase remote on a tracked remote branch ok 67 - appending empty string to non-existing note does not create note ok 68 - create other note on a different notes ref (setup) ok 77 - autosetuprebase always on a tracked remote branch ok 69 - Do not show note on other ref by default ok 70 - Do show note when ref is given in GIT_NOTES_REF ok 71 - Do show note when ref is given in core.notesRef config ok 2 - test notes in 2/38-fanout ok 72 - Do not show note when core.notesRef is overridden ok 3 - verify notes in 2/38-fanout ok 78 - autosetuprebase unconfigured on a tracked remote branch ok 73 - Show all notes when notes.displayRef=refs/notes/* ok 74 - core.notesRef is implicitly in notes.displayRef ok 75 - notes.displayRef can be given more than once ok 76 - notes.displayRef respects order ok 77 - GIT_NOTES_DISPLAY_REF works ok 78 - GIT_NOTES_DISPLAY_REF overrides config ok 79 - --show-notes=* adds to GIT_NOTES_DISPLAY_REF ok 79 - autosetuprebase unconfigured on a tracked local branch ok 80 - --no-standard-notes ok 81 - --standard-notes ok 80 - autosetuprebase unconfigured on untracked local branch ok 82 - --show-notes=ref accumulates ok 81 - autosetuprebase unconfigured on untracked remote branch ok 82 - autosetuprebase never on an untracked local branch ok 83 - Allow notes on non-commits (trees, blobs, tags) ok 83 - autosetuprebase local on an untracked local branch ok 84 - create note from other note with "git notes add -C" ok 85 - create note from non-existing note with "git notes add -C" fails ok 84 - autosetuprebase remote on an untracked local branch ok 86 - create note from other note with "git notes add -c" ok 87 - create note from non-existing note with "git notes add -c" fails ok 85 - autosetuprebase always on an untracked local branch ok 88 - append to note from other note with "git notes append -C" ok 86 - autosetuprebase never on an untracked remote branch ok 89 - create note from other note with "git notes append -c" ok 90 - append to note from other note with "git notes append -c" ok 87 - autosetuprebase local on an untracked remote branch ok 88 - autosetuprebase remote on an untracked remote branch ok 91 - copy note with "git notes copy" ok 92 - prevent overwrite with "git notes copy" ok 89 - autosetuprebase always on an untracked remote branch ok 93 - allow overwrite with "git notes copy -f" ok 90 - autosetuprebase always on detached HEAD ok 91 - detect misconfigured autosetuprebase (bad value) ok 92 - detect misconfigured autosetuprebase (no value) ok 94 - cannot copy note from object without notes ok 93 - attempt to delete a branch without base and unmerged to HEAD ok 94 - attempt to delete a branch merged to its base ok 95 - git notes copy --stdin ok 95 - attempt to delete a branch merged to its base ok 4 - test notes in 2/2/36-fanout ok 5 - verify notes in 2/2/36-fanout ok 96 - git notes copy --for-rewrite (unconfigured) ok 97 - git notes copy --for-rewrite (enabled) ok 96 - use set-upstream on the current branch ok 98 - git notes copy --for-rewrite (disabled) ok 97 - use --edit-description ok 99 - git notes copy --for-rewrite (overwrite) ok 98 - detect typo in branch name when using --edit-description ok 99 - refuse --edit-description on unborn branch for now ok 100 - git notes copy --for-rewrite (ignore) ok 100 - --merged catches invalid object names ok 101 - git notes copy --for-rewrite (append) ok 102 - git notes copy --for-rewrite (append two to one) ok 103 - git notes copy --for-rewrite (append empty) ok 104 - GIT_NOTES_REWRITE_MODE works ok 105 - GIT_NOTES_REWRITE_REF works ok 106 - GIT_NOTES_REWRITE_REF overrides config ok 101 - tracking with unexpected .fetch refspec # passed all 101 test(s) 1..101 ok 107 - git notes copy diagnoses too many or too few parameters ok 108 - git notes get-ref (no overrides) ok 109 - git notes get-ref (core.notesRef) ok 110 - git notes get-ref (GIT_NOTES_REF) ok 111 - git notes get-ref (--ref) # passed all 111 test(s) 1..111 *** t3306-notes-prune.sh *** *** t3307-notes-man.sh *** ok 1 - setup ok 1 - setup: create a few commits with notes ok 2 - verify commits and notes ok 2 - example 1: notes to add an Acked-by line ok 3 - example 2: binary notes # passed all 3 test(s) 1..3 *** t3308-notes-merge.sh *** ok 3 - remove some commits ok 4 - verify that commits are gone ok 5 - verify that notes are still present ok 6 - prune -n does not remove notes ok 7 - prune -n lists prunable notes ok 8 - prune notes ok 9 - verify that notes are gone ok 6 - test notes in 2/2/2/34-fanout ok 7 - verify notes in 2/2/2/34-fanout ok 1 - setup ok 10 - remove some commits ok 11 - prune -v notes ok 2 - verify initial notes (x) ok 12 - verify that notes are gone ok 3 - fail to merge empty notes ref into empty notes ref (z => y) # passed all 12 test(s) 1..12 *** t3309-notes-merge-auto-resolve.sh *** ok 4 - fail to merge into various non-notes refs ok 5 - fail to merge various non-note-trees ok 6 - merge notes into empty notes ref (x => y) ok 7 - merge empty notes ref (z => y) ok 8 - change notes on other notes ref (y) ok 9 - merge previous notes commit (y^ => y) => No-op ok 10 - verify changed notes on other notes ref (y) ok 11 - verify unchanged notes on original notes ref (x) ok 12 - merge original notes (x) into changed notes (y) => No-op ok 13 - merge changed (y) into original (x) => Fast-forward ok 1 - setup commits ok 14 - merge empty notes ref (z => y) ok 15 - change notes on other notes ref (y) ok 16 - change notes on notes ref (x) ok 2 - setup merge base (x) ok 17 - merge y into x => Non-conflicting 3-way merge ok 3 - verify state of merge base (x) ok 18 - create notes on new, separate notes ref (w) ok 4 - setup local branch (y) ok 19 - merge w into x => Non-conflicting history-less merge # passed all 19 test(s) 1..19 ok 5 - verify state of local branch (y) *** t3310-notes-merge-manual-resolve.sh *** ok 6 - setup remote branch (z) ok 7 - verify state of remote branch (z) ok 1 - setup commits ok 8 - merge z into y with invalid strategy => Fail/No changes ok 9 - merge z into y with "ours" strategy => Non-conflicting 3-way merge ok 10 - reset to pre-merge state (y) ok 2 - setup merge base (x) ok 11 - merge z into y with "theirs" strategy => Non-conflicting 3-way merge ok 12 - reset to pre-merge state (y) ok 13 - merge z into y with "union" strategy => Non-conflicting 3-way merge ok 3 - setup local branch (y) ok 14 - reset to pre-merge state (y) ok 15 - merge y into z with "union" strategy => Non-conflicting 3-way merge ok 16 - reset to pre-merge state (z) ok 4 - setup remote branch (z) ok 17 - merge y into z with "cat_sort_uniq" strategy => Non-conflicting 3-way merge # passed all 17 test(s) 1..17 *** t3311-notes-merge-fanout.sh *** ok 8 - test same notes in no fanout and 2/38-fanout ok 9 - verify same notes in no fanout and 2/38-fanout ok 5 - merge z into m (== y) with default ("manual") resolver => Conflicting 3-way merge ok 6 - change notes in z ok 7 - cannot do merge w/conflicts when previous merge is unfinished ok 8 - setup unrelated notes ref (w) ok 1 - setup a few initial commits with notes (notes ref: x) ok 9 - can do merge without conflicts even if previous merge is unfinished (x => w) ok 2 - sanity check (x) ok 10 - finalize conflicting merge (z => m) ok 11 - redo merge of z into m (== y) with default ("manual") resolver => Conflicting 3-way merge ok 12 - abort notes merge ok 13 - redo merge of z into m (== y) with default ("manual") resolver => Conflicting 3-way merge ok 14 - add + remove notes in finalized merge (z => m) ok 15 - redo merge of z into m (== y) with default ("manual") resolver => Conflicting 3-way merge ok 16 - reset notes ref m to somewhere else (w) ok 17 - fail to finalize conflicting merge if underlying ref has moved in the meantime (m != NOTES_MERGE_PARTIAL^1) ok 10 - test same notes in no fanout and 2/2/36-fanout ok 11 - verify same notes in no fanout and 2/2/36-fanout ok 18 - resolve situation by aborting the notes merge ok 19 - switch cwd before committing notes merge # passed all 19 test(s) 1..19 *** t3400-rebase.sh *** ok 1 - prepare repository with topic branches ok 2 - rebase on dirty worktree ok 3 - rebase on dirty cache ok 4 - rebase against master ok 5 - rebase, with and specified as :/quuxery ok 6 - the rebase operation should not have destroyed author information ok 7 - the rebase operation should not have destroyed author information (2) ok 8 - HEAD was detached during rebase ok 12 - test same notes in 2/38-fanout and 2/2/36-fanout ok 13 - verify same notes in 2/38-fanout and 2/2/36-fanout ok 9 - rebase from ambiguous branch name ok 10 - rebase a single mode change ok 1 - creating many notes with git-notes ok 2 - many notes created correctly with git-notes ok 3 - many notes created with git-notes triggers fanout ok 11 - rebase is not broken by diff.renames ok 12 - setup: recover ok 14 - test same notes in 2/2/2/34-fanout and 2/2/36-fanout ok 15 - verify same notes in 2/2/2/34-fanout and 2/2/36-fanout ok 13 - Show verbose error when HEAD could not be detached ok 14 - fail when upstream arg is missing and not on branch ok 15 - fail when upstream arg is missing and not configured ok 16 - default to common base in @{upstream}s reflog if no upstream arg ok 17 - rebase -q is quiet ok 16 - test notes in no fanout concatenated with 2/38-fanout ok 17 - verify notes in no fanout concatenated with 2/38-fanout ok 18 - Rebase a commit that sprinkles CRs in ok 4 - deleting most notes with git-notes ok 5 - most notes deleted correctly with git-notes ok 6 - deleting most notes triggers fanout consolidation # passed all 6 test(s) 1..6 *** t3402-rebase-merge.sh *** ok 19 - rebase can copy notes ok 1 - setup ok 20 - rebase -m can copy notes ok 2 - reference merge ok 3 - rebase ok 4 - test-rebase@{1} is pre rebase ok 21 - rebase commit with an ancient timestamp ok 5 - merge and rebase should match # passed all 21 test(s) 1..21 *** t3403-rebase-skip.sh *** ok 1 - setup ok 6 - rebase the other way ok 18 - test notes in no fanout concatenated with 2/2/36-fanout ok 19 - verify notes in no fanout concatenated with 2/2/36-fanout ok 7 - rebase -Xtheirs ok 8 - merge and rebase should match ok 2 - rebase with git am -3 (default) ok 3 - rebase --skip can not be used with other options ok 9 - picking rebase ok 10 - rebase -s funny -Xopt # passed all 10 test(s) 1..10 *** t3404-rebase-interactive.sh *** ok 4 - rebase --skip with am -3 ok 1 - setup ok 5 - rebase moves back to skip-reference ok 20 - test notes in 2/38-fanout concatenated with 2/2/36-fanout ok 6 - checkout skip-merge ok 21 - verify notes in 2/38-fanout concatenated with 2/2/36-fanout ok 7 - rebase with --merge ok 8 - rebase --skip with --merge ok 9 - merge and reference trees equal ok 10 - moved back to branch correctly # passed all 10 test(s) 1..10 *** t3405-rebase-malformed.sh *** ok 1 - setup ok 2 - rebase -i with the exec command ok 2 - rebase commit with multi-line subject ok 3 - rebase commit with diff in message # passed all 3 test(s) 1..3 ok 3 - rebase -i with the exec command runs from tree root *** t3406-rebase-message.sh *** ok 22 - test notes in 2/2/36-fanout concatenated with 2/2/2/34-fanout ok 23 - verify notes in 2/2/36-fanout concatenated with 2/2/2/34-fanout # passed all 23 test(s) 1..23 *** t3407-rebase-abort.sh *** ok 1 - setup ok 1 - setup ok 4 - rebase -i with the exec command checks tree cleanness ok 2 - rebase -m ok 3 - rebase against master twice ok 2 - rebase --abort ok 5 - rebase -i with exec of inexistent command ok 4 - rebase against master twice with --force ok 5 - rebase against master twice from another branch ok 6 - no changes are a nop ok 6 - rebase fast-forward to master ok 3 - Add a few hundred commits w/notes to trigger fanout (x -> y) ok 4 - notes tree has fanout (y) ok 5 - No-op merge (already included) (x => y) ok 6 - Fast-forward merge (y => x) ok 7 - test the [branch] option ok 7 - rebase --stat ok 3 - rebase --abort after --skip ok 7 - change some of the initial 5 notes (x -> z) ok 8 - notes tree has no fanout (z) ok 9 - successful merge without conflicts (y => z) ok 10 - notes tree still has fanout after merge (m) ok 11 - introduce conflicting changes (y -> w) ok 12 - successful merge using "ours" strategy (z => w) ok 13 - notes tree still has fanout after merge (m) ok 8 - rebase w/config rebase.stat ok 14 - successful merge using "theirs" strategy (z => w) ok 15 - notes tree still has fanout after merge (m) ok 16 - successful merge using "union" strategy (z => w) ok 17 - notes tree still has fanout after merge (m) ok 9 - rebase -n overrides config rebase.stat config ok 18 - successful merge using "cat_sort_uniq" strategy (z => w) ok 19 - notes tree still has fanout after merge (m) ok 10 - rebase --onto outputs the invalid ref # passed all 10 test(s) 1..10 ok 20 - fails to merge using "manual" strategy (z => w) ok 21 - notes tree still has fanout after merge (m) *** t3408-rebase-multi-line.sh *** ok 22 - verify conflict entries (with no fanout) ok 4 - rebase --abort after --continue ok 1 - setup ok 23 - resolve and finalize merge (z => w) ok 24 - notes tree still has fanout after merge (m) # passed all 24 test(s) 1..24 ok 8 - test --onto *** t3409-rebase-preserve-merges.sh *** ok 2 - rebase # passed all 2 test(s) 1..2 *** t3410-rebase-preserve-dropped-merges.sh *** ok 5 - rebase --abort does not update reflog ok 1 - setup for merge-preserving rebase ok 1 - setup ok 6 - rebase --abort can not be used with other options ok 9 - rebase on top of a non-conflicting commit ok 10 - reflog for the branch shows state before rebase ok 7 - rebase --merge --abort ok 11 - exchange two commits ok 8 - rebase --merge --abort after --skip ok 2 - --continue works after a conflict ok 2 - skip same-resolution merges with -p ok 9 - rebase --merge --abort after --continue ok 12 - stop on conflicting pick ok 10 - rebase --merge --abort does not update reflog ok 13 - abort ok 11 - rebase --abort can not be used with other options # passed all 11 test(s) 1..11 ok 14 - abort with error when new base cannot be checked out *** t3411-rebase-preserve-around-merges.sh *** ok 1 - setup ok 3 - rebase -p preserves no-ff merges ok 15 - retain authorship ok 3 - keep different-resolution merges with -p # passed all 3 test(s) 1..3 *** t3412-rebase-root.sh *** ok 2 - squash F1 into D1 ok 1 - prepare repository ok 2 - rebase --root fails with too many args ok 3 - setup pre-rebase hook ok 16 - squash ok 17 - retain authorship when squashing ok 4 - rebase -p ignores merge.log config # passed all 4 test(s) 1..4 *** t3413-rebase-hook.sh *** ok 1 - setup ok 4 - rebase --root --onto ok 5 - pre-rebase got correct input (1) ok 2 - rebase ok 18 - -p handles "no changes" gracefully ok 6 - rebase --root --onto ok 7 - pre-rebase got correct input (2) not ok 19 - exchange two commits with -p # TODO known breakage ok 3 - rebase -i ok 4 - setup pre-rebase hook ok 5 - pre-rebase hook gets correct input (1) ok 8 - rebase -i --root --onto ok 9 - pre-rebase got correct input (3) ok 3 - rebase two levels of merge # passed all 3 test(s) 1..3 *** t3414-rebase-preserve-onto.sh *** ok 6 - pre-rebase hook gets correct input (2) ok 1 - setup ok 7 - pre-rebase hook gets correct input (3) ok 10 - rebase -i --root --onto ok 11 - pre-rebase got correct input (4) ok 8 - pre-rebase hook gets correct input (4) ok 20 - preserve merges with -p ok 12 - rebase -i -p with linear history ok 13 - pre-rebase got correct input (5) ok 2 - rebase from B1 onto H1 ok 14 - set up merge history ok 9 - pre-rebase hook gets correct input (5) ok 21 - edit ancestor with -p ok 10 - pre-rebase hook gets correct input (6) ok 11 - setup pre-rebase hook that fails ok 3 - rebase from E1 onto H1 ok 12 - pre-rebase hook stops rebase (1) ok 13 - pre-rebase hook stops rebase (2) ok 15 - rebase -i -p with merge ok 16 - set up second root and merge ok 22 - --continue tries to commit ok 14 - rebase --no-verify overrides pre-rebase (1) ok 4 - rebase from C1 onto H1 # passed all 4 test(s) 1..4 *** t3415-rebase-autosquash.sh *** ok 1 - setup ok 15 - rebase --no-verify overrides pre-rebase (2) # passed all 15 test(s) 1..15 *** t3416-rebase-onto-threedots.sh *** ok 23 - verbose flag is heeded, even after --continue ok 1 - setup ok 2 - rebase --onto master...topic ok 17 - rebase -i -p with two roots ok 18 - setup pre-rebase hook that fails ok 19 - pre-rebase hook stops rebase ok 2 - auto fixup (option) ok 20 - pre-rebase hook stops rebase -i ok 21 - remove pre-rebase hook ok 22 - set up a conflict ok 3 - rebase --onto master... ok 24 - multi-squash only fires up editor once ok 4 - rebase --onto master...side ok 23 - rebase --root with conflict (first part) ok 24 - fix the conflict ok 25 - multi-fixup does not fire up editor ok 25 - rebase --root with conflict (second part) ok 5 - rebase -i --onto master...topic ok 26 - rebase -i --root with conflict (first part) ok 27 - fix the conflict ok 26 - commit message used after conflict ok 3 - auto fixup (config) ok 6 - rebase -i --onto master... ok 7 - rebase -i --onto master...side # passed all 7 test(s) 1..7 *** t3417-rebase-whitespace-fix.sh *** ok 28 - rebase -i --root with conflict (second part) ok 27 - commit message retained after conflict ok 1 - blank line at end of file; extend at end of file ok 29 - rebase -i -p --root with conflict (first part) ok 30 - fix the conflict ok 4 - auto squash (option) ok 2 - two blanks line at end of file; extend at end of file ok 28 - squash and fixup generate correct log messages ok 3 - same, but do not remove trailing spaces ok 29 - squash ignores comments ok 4 - at beginning of file # passed all 4 test(s) 1..4 ok 31 - rebase -i -p --root with conflict (second part) # passed all 31 test(s) 1..31 *** t3418-rebase-continue.sh *** *** t3419-rebase-patch-id.sh *** ok 1 - setup ok 1 - setup ok 2 - setup: 500 lines ok 3 - setup attributes ok 5 - auto squash (config) ok 2 - interactive rebase --continue works with touched file ok 4 - detect upstream patch ok 6 - misspelled auto squash ok 30 - squash ignores blank lines ok 5 - do not drop patch ok 6 # skip setup: 50000 lines (missing EXPENSIVE) ok 7 # skip setup attributes (missing EXPENSIVE) ok 8 # skip detect upstream patch (missing EXPENSIVE) ok 9 # skip do not drop patch (missing EXPENSIVE) # passed all 9 test(s) 1..9 *** t3420-rebase-autostash.sh *** ok 3 - non-interactive rebase --continue works with touched file ok 4 - rebase --continue can not be used with other options ok 31 - squash works as expected ok 1 - setup ok 5 - rebase --continue remembers merge strategy and options ok 2 - rebase: fast-forward rebase ok 7 - auto squash that matches 2 commits ok 3 - rebase: noop rebase ok 32 - interrupted squash works as expected ok 8 - auto squash that matches a commit after the squash ok 6 - rebase --continue remembers --rerere-autoupdate # passed all 6 test(s) 1..6 *** t3421-rebase-topology-linear.sh *** ok 1 - setup ok 4 - rebase: dirty worktree, non-conflicting rebase ok 2 - simple rebase ok 33 - interrupted squash works as expected (case 2) ok 9 - auto squash that matches a sha1 ok 3 - simple rebase -m ok 5 - rebase: dirty index, non-conflicting rebase ok 34 - --continue tries to commit, even for "edit" ok 6 - rebase: conflicting rebase ok 35 - aborted --continue does not squash commits after "edit" ok 4 - simple rebase -i ok 10 - auto squash that matches longer sha1 ok 36 - auto-amend only edited commits after "edit" ok 7 - rebase: --continue ok 37 - clean error after failed "exec" ok 5 - simple rebase -p ok 11 - use commit --fixup ok 6 - rebase is no-op if upstream is an ancestor ok 38 - rebase a detached HEAD ok 7 - rebase -m is no-op if upstream is an ancestor ok 8 - rebase: --skip ok 39 - rebase a commit violating pre-commit ok 8 - rebase -i is no-op if upstream is an ancestor ok 12 - use commit --squash ok 40 - rebase with a file named HEAD in worktree ok 9 - rebase: --abort ok 9 - rebase -p is no-op if upstream is an ancestor ok 41 - do "noop" when there is nothing to cherry-pick ok 42 - submodule rebase setup ok 10 - rebase: non-conflicting rebase, conflicting stash ok 10 - rebase -f rewrites even if upstream is an ancestor ok 11 - rebase -m -f rewrites even if upstream is an ancestor ok 43 - submodule rebase -i ok 44 - submodule conflict setup ok 13 - fixup! fixup! ok 11 - rebase --merge: dirty worktree, non-conflicting rebase ok 12 - rebase --merge: dirty index, non-conflicting rebase ok 12 - rebase -i -f rewrites even if upstream is an ancestor ok 45 - rebase -i continue with only submodule staged ok 13 - rebase --merge: conflicting rebase ok 14 - fixup! squash! ok 14 - rebase --merge: --continue not ok 13 - rebase -p -f rewrites even if upstream is an ancestor # TODO known breakage ok 46 - rebase -i continue with unstaged submodule ok 14 - rebase fast-forwards from ancestor of upstream ok 15 - rebase -m fast-forwards from ancestor of upstream ok 47 - avoid unnecessary reset ok 15 - rebase --merge: --skip ok 16 - rebase --merge: --abort ok 16 - rebase -i fast-forwards from ancestor of upstream ok 15 - squash! squash! ok 17 - rebase --merge: non-conflicting rebase, conflicting stash ok 17 - rebase -p fast-forwards from ancestor of upstream ok 18 - setup of linear history for range selection tests ok 48 - reword ok 19 - rebase drops patches in upstream ok 16 - squash! fixup! # passed all 16 test(s) 1..16 *** t3425-rebase-topology-merges.sh *** not ok 20 - rebase -m drops patches in upstream # TODO known breakage ok 18 - rebase --interactive: dirty worktree, non-conflicting rebase ok 1 - setup of non-linear-history ok 49 - rebase -i can copy notes ok 2 - rebase after merge from upstream ok 50 - rebase -i can copy notes over a fixup ok 3 - rebase -m after merge from upstream ok 21 - rebase -i drops patches in upstream ok 19 - rebase --interactive: dirty index, non-conflicting rebase ok 51 - rebase while detaching HEAD ok 20 - rebase --interactive: conflicting rebase ok 4 - rebase -i after merge from upstream ok 22 - rebase -p drops patches in upstream ok 52 - always cherry-pick with --no-ff ok 23 - rebase can drop last patch if in upstream ok 53 - set up commits with funny messages ok 5 - rebase of non-linear history is linearized in place not ok 24 - rebase -m can drop last patch if in upstream # TODO known breakage ok 54 - rebase-i history with funny messages ok 6 - rebase -m of non-linear history is linearized in place ok 55 - prepare for rebase -i --exec ok 21 - rebase --interactive: --continue ok 25 - rebase -i can drop last patch if in upstream ok 7 - rebase -i of non-linear history is linearized in place ok 56 - running "git rebase -i --exec git show HEAD" ok 8 - rebase of non-linear history is linearized upstream ok 22 - rebase --interactive: --skip ok 26 - rebase -p can drop last patch if in upstream ok 9 - rebase -m of non-linear history is linearized upstream ok 27 - rebase --onto drops patches in upstream ok 23 - rebase --interactive: --abort not ok 28 - rebase -m --onto drops patches in upstream # TODO known breakage ok 57 - running "git rebase --exec git show HEAD -i" ok 10 - rebase -i of non-linear history is linearized upstream ok 29 - rebase -i --onto drops patches in upstream ok 24 - rebase --interactive: non-conflicting rebase, conflicting stash # passed all 24 test(s) 1..24 *** t3500-cherry.sh *** ok 11 - rebase of non-linear history with merges after upstream merge is linearized ok 1 - prepare repository with topic branch, and check cherry finds the 2 patches from there ok 2 - check that cherry with limit returns only the top patch ok 3 - cherry-pick one of the 2 patches, and check cherry recognized one and only one as new # passed all 3 test(s) 1..3 *** t3501-revert-cherry-pick.sh *** ok 1 - setup ok 2 - cherry-pick --nonsense ok 3 - revert --nonsense ok 4 - cherry-pick after renaming branch ok 12 - rebase -m of non-linear history with merges after upstream merge is linearized ok 5 - revert after renaming branch ok 6 - cherry-pick on stat-dirty working tree ok 7 - revert forbidden on dirty working tree ok 8 - cherry-pick on unborn branch ok 58 - running "git rebase -ix git show HEAD" ok 9 - cherry-pick "-" to pick from previous branch ok 10 - cherry-pick "-" is meaningless without checkout ok 11 - cherry-pick "-" works with arguments # passed all 11 test(s) 1..11 *** t3502-cherry-pick-merge.sh *** ok 30 - rebase -p --onto drops patches in upstream ok 1 - setup ok 2 - cherry-pick a non-merge with -m should fail ok 3 - cherry pick a merge without -m should fail ok 4 - cherry pick a merge (1) ok 5 - cherry pick a merge (2) ok 6 - cherry pick a merge relative to nonexistent parent should fail ok 7 - revert a non-merge with -m should fail ok 8 - revert a merge without -m should fail ok 9 - revert a merge (1) ok 10 - revert a merge (2) ok 11 - revert a merge relative to nonexistent parent should fail # passed all 11 test(s) 1..11 *** t3503-cherry-pick-root.sh *** ok 1 - setup ok 2 - cherry-pick a root commit ok 3 - revert a root commit ok 31 - rebase --onto does not drop patches in onto ok 4 - cherry-pick a root commit with an external strategy ok 5 - revert a root commit with an external strategy ok 13 - rebase -i of non-linear history with merges after upstream merge is linearized ok 6 - cherry-pick two root commits # passed all 6 test(s) 1..6 *** t3504-cherry-pick-rerere.sh *** ok 1 - setup ok 2 - conflicting merge ok 3 - fixup ok 4 - cherry-pick conflict ok 5 - reconfigure ok 6 - cherry-pick conflict without rerere # passed all 6 test(s) 1..6 *** t3505-cherry-pick-empty.sh *** ok 32 - rebase -m --onto does not drop patches in onto ok 1 - setup ok 59 - rebase -ix with several ok 2 - cherry-pick an empty commit ok 3 - index lockfile was removed ok 4 - cherry-pick a commit with an empty message ok 5 - index lockfile was removed ok 6 - cherry-pick a commit with an empty message with --allow-empty-message ok 7 - cherry pick an empty non-ff commit without --allow-empty ok 8 - cherry pick an empty non-ff commit with --allow-empty ok 9 - cherry pick with --keep-redundant-commits ok 10 - cherry-pick a commit that becomes no-op (prep) ok 11 - cherry-pick a no-op without --keep-redundant ok 12 - cherry-pick a no-op with --keep-redundant # passed all 12 test(s) 1..12 *** t3506-cherry-pick-ff.sh *** ok 1 - setup ok 2 - cherry-pick using --ff fast forwards ok 3 - cherry-pick not using --ff does not fast forwards ok 4 - merge setup ok 5 - cherry-pick a non-merge with --ff and -m should fail ok 6 - cherry pick a merge with --ff but without -m should fail ok 7 - cherry pick with --ff a merge (1) ok 8 - cherry pick with --ff a merge (2) ok 9 - cherry pick a merge relative to nonexistent parent with --ff should fail ok 14 - rebase -p is no-op in non-linear history ok 10 - cherry pick a root commit with --ff ok 11 - cherry-pick --ff on unborn branch # passed all 11 test(s) 1..11 *** t3507-cherry-pick-conflict.sh *** ok 33 - rebase -i --onto does not drop patches in onto ok 1 - setup ok 2 - failed cherry-pick does not advance HEAD ok 3 - advice from failed cherry-pick ok 4 - advice from failed cherry-pick --no-commit ok 5 - failed cherry-pick sets CHERRY_PICK_HEAD ok 6 - successful cherry-pick does not set CHERRY_PICK_HEAD ok 7 - cherry-pick --no-commit does not set CHERRY_PICK_HEAD ok 8 - cherry-pick w/dirty tree does not set CHERRY_PICK_HEAD ok 9 - cherry-pick --strategy=resolve w/dirty tree does not set CHERRY_PICK_HEAD ok 10 - GIT_CHERRY_PICK_HELP suppresses CHERRY_PICK_HEAD ok 11 - git reset clears CHERRY_PICK_HEAD ok 12 - failed commit does not clear CHERRY_PICK_HEAD ok 13 - cancelled commit does not clear CHERRY_PICK_HEAD ok 60 - rebase -ix with several instances of --exec ok 14 - successful commit clears CHERRY_PICK_HEAD ok 15 - failed cherry-pick produces dirty index ok 16 - failed cherry-pick registers participants in index ok 15 - rebase -p is no-op when base inside second parent ok 17 - failed cherry-pick describes conflict in work tree ok 18 - diff3 -m style ok 19 - revert also handles conflicts sanely ok 20 - failed revert sets REVERT_HEAD ok 21 - successful revert does not set REVERT_HEAD ok 34 - rebase -p --onto does not drop patches in onto ok 22 - revert --no-commit sets REVERT_HEAD ok 23 - revert w/dirty tree does not set REVERT_HEAD ok 35 - setup of linear history for empty commit tests ok 24 - GIT_CHERRY_PICK_HELP does not suppress REVERT_HEAD ok 25 - git reset clears REVERT_HEAD ok 26 - failed commit does not clear REVERT_HEAD ok 27 - revert conflict, diff3 -m style ok 28 - failed cherry-pick does not forget -s ok 29 - commit after failed cherry-pick does not add duplicated -s ok 30 - commit after failed cherry-pick adds -s at the right place # passed all 30 test(s) 1..30 *** t3508-cherry-pick-many-commits.sh *** ok 36 - rebase drops empty commit ok 1 - setup ok 2 - cherry-pick first..fourth works ok 3 - cherry-pick three one two works ok 4 - cherry-pick three one two: fails ok 37 - rebase -m drops empty commit ok 5 - output to keep user entertained during multi-pick ok 6 - cherry-pick --strategy resolve first..fourth works ok 7 - output during multi-pick indicates merge strategy ok 8 - cherry-pick --ff first..fourth works ok 9 - cherry-pick -n first..fourth works ok 10 - revert first..fourth works not ok 16 - rebase -p --root on non-linear history is a no-op # TODO known breakage ok 11 - revert ^first fourth works ok 12 - revert fourth fourth~1 fourth~2 works ok 13 - cherry-pick -3 fourth works ok 61 - rebase -ix with --autosquash ok 62 - rebase --exec without -i shows error message ok 14 - cherry-pick --stdin works # passed all 14 test(s) 1..14 *** t3509-cherry-pick-merge-df.sh *** ok 63 - rebase -i --exec without ok 1 - Initialize repository ok 38 - rebase -i drops empty commit ok 2 - Setup rename across paths each below D/F conflicts ok 3 - Cherry-pick succeeds with rename across D/F conflicts ok 4 - Setup rename with file on one side matching directory name on other ok 5 - Cherry-pick succeeds with was_a_dir/file -> was_a_dir (resolve) ok 6 - Cherry-pick succeeds with was_a_dir/file -> was_a_dir (recursive) ok 7 - Setup rename with file on one side matching different dirname on other ok 8 - Cherry-pick with rename to different D/F conflict succeeds (resolve) ok 9 - Cherry-pick with rename to different D/F conflict succeeds (recursive) # passed all 9 test(s) 1..9 *** t3510-cherry-pick-sequence.sh *** ok 17 - rebase -p re-creates merge from side branch ok 64 - rebase -i --root re-order and drop commits ok 1 - setup ok 2 - cherry-pick persists data on failure ok 3 - cherry-pick mid-cherry-pick-sequence ok 65 - rebase -i --root retain root commit author and message ok 4 - cherry-pick persists opts correctly ok 5 - cherry-pick cleans up sequencer state upon success ok 6 - --quit does not complain when no cherry-pick is in progress ok 7 - --abort requires cherry-pick in progress ok 39 - rebase -p drops empty commit ok 8 - --quit cleans up sequencer state ok 9 - --quit keeps HEAD and conflicted index intact ok 10 - --abort to cancel multiple cherry-pick ok 40 - rebase --keep-empty ok 66 - rebase -i --root temporary sentinel commit ok 11 - --abort to cancel single cherry-pick ok 12 - cherry-pick --abort to cancel multiple revert ok 13 - revert --abort works, too ok 14 - --abort to cancel single revert ok 15 - --abort keeps unrelated change, easy case not ok 41 - rebase -m --keep-empty # TODO known breakage ok 16 - --abort refuses to clobber unrelated change, harder case ok 17 - cherry-pick still writes sequencer state when one commit is left ok 18 - --abort after last commit in sequence ok 18 - rebase -p re-creates internal merge ok 67 - rebase -i --root fixup root commit ok 19 - cherry-pick does not implicitly stomp an existing operation ok 20 - --continue complains when no cherry-pick is in progress ok 21 - --continue complains when there are unresolved conflicts ok 22 - --continue of single cherry-pick ok 23 - --continue of single revert ok 24 - --continue after resolving conflicts ok 25 - --continue after resolving conflicts and committing ok 68 - rebase --edit-todo does not works on non-interactive rebase ok 26 - --continue asks for help after resolving patch to nil ok 27 - follow advice and skip nil patch ok 42 - rebase -i --keep-empty ok 28 - --continue respects opts ok 29 - --continue of single-pick respects -x ok 30 - --continue respects -x in first commit in multi-pick not ok 31 - --signoff is automatically propagated to resolved conflict # TODO known breakage not ok 32 - --signoff dropped for implicit commit of resolution, multi-pick case # TODO known breakage not ok 33 - sign-off needs to be reaffirmed after conflict resolution, single-pick case # TODO known breakage ok 34 - malformed instruction sheet 1 not ok 43 - rebase -p --keep-empty # TODO known breakage ok 35 - malformed instruction sheet 2 ok 36 - empty commit set ok 69 - rebase --edit-todo can be used to modify todo ok 37 - malformed instruction sheet 3 ok 19 - rebase -p can re-create two branches on onto ok 20 - setup of non-linear-history for patch-equivalence tests ok 38 - instruction sheet, fat-fingers version ok 44 - rebase --keep-empty keeps empty even if already in upstream ok 39 - commit descriptions in insn sheet are optional # still have 3 known breakage(s) # passed all remaining 36 test(s) 1..39 *** t3511-cherry-pick-x.sh *** not ok 45 - rebase -m --keep-empty keeps empty even if already in upstream # TODO known breakage ok 1 - setup ok 2 - cherry-pick -x inserts blank line after one line subject ok 3 - cherry-pick -s inserts blank line after one line subject ok 4 - cherry-pick -s inserts blank line after non-conforming footer ok 5 - cherry-pick -x inserts blank line when conforming footer not found ok 6 - cherry-pick -s inserts blank line when conforming footer not found ok 7 - cherry-pick -x -s inserts blank line when conforming footer not found ok 8 - cherry-pick -s adds sob when last sob doesnt match committer ok 70 - rebase -i produces readable reflog ok 9 - cherry-pick -x -s adds sob when last sob doesnt match committer ok 10 - cherry-pick -s refrains from adding duplicate trailing sob ok 11 - cherry-pick -x -s adds sob even when trailing sob exists for committer ok 12 - cherry-pick -x treats "(cherry picked from..." line as part of footer ok 71 - rebase -i respects core.commentchar ok 13 - cherry-pick -s treats "(cherry picked from..." line as part of footer ok 14 - cherry-pick -x -s treats "(cherry picked from..." line as part of footer # passed all 14 test(s) 1..14 *** t3600-rm.sh *** ok 1 - Initialize test directory ok 2 - add files with funny names not ok 46 - rebase -i --keep-empty keeps empty even if already in upstream # TODO known breakage ok 3 - Pre-check that foo exists and is in index before git rm foo ok 4 - Test that git rm foo succeeds ok 5 - Test that git rm --cached foo succeeds if the index matches the file ok 6 - Test that git rm --cached foo succeeds if the index matches the file ok 7 - Test that git rm --cached foo fails if the index matches neither the file nor HEAD ok 8 - Test that git rm --cached -f foo works in case where --cached only did not ok 9 - Post-check that foo exists but is not in index after git rm foo ok 10 - Pre-check that bar exists and is in index before "git rm bar" ok 11 - Test that "git rm bar" succeeds ok 12 - Post-check that bar does not exist and is not in index after "git rm -f bar" ok 21 - rebase -p re-creates history around dropped commit matching upstream ok 13 - Test that "git rm -- -q" succeeds (remove a file that looks like an option) ok 14 - Test that "git rm -f" succeeds with embedded space, tab, or newline characters. ok 15 - Test that "git rm -f" fails if its rm fails ok 16 - When the rm in "git rm -f" fails, it should not remove the file from the index ok 17 - Remove nonexistent file with --ignore-unmatch ok 18 - "rm" command printed ok 19 - "rm" command suppressed with --quiet ok 20 - Re-add foo and baz ok 21 - Modify foo -- rm should refuse ok 22 - Modified foo -- rm -f should work ok 23 - Re-add foo and baz for HEAD tests ok 24 - foo is different in index from HEAD -- rm should refuse ok 25 - but with -f it should work. ok 26 - refuse to remove cached empty file with modifications ok 27 - remove intent-to-add file without --force ok 28 - Recursive test setup ok 29 - Recursive without -r fails ok 30 - Recursive with -r but dirty ok 31 - Recursive with -r -f ok 32 - Remove nonexistent file returns nonzero exit status ok 33 - Call "rm" from outside the work tree ok 34 - refresh index before checking if it is up-to-date ok 72 - rebase -i, with and specified as :/quuxery ok 35 - choking "git rm" should not let it die with cruft ok 36 - rm removes subdirectories recursively not ok 47 - rebase -p --keep-empty keeps empty even if already in upstream # TODO known breakage ok 37 - rm removes empty submodules from work tree ok 48 - setup of linear history for test involving root ok 38 - rm removes removed submodule from index and .gitmodules ok 73 - rebase -i with --strategy and -X ok 39 - rm removes work tree of unmodified submodules ok 49 - rebase --onto --root ok 22 - rebase -p --onto in merged history drops patches in upstream not ok 50 - rebase -m --onto --root # TODO known breakage ok 74 - rebase -i error on commits with \ in message ok 40 - rm removes a submodule with a trailing / ok 41 - rm fails when given a file with a trailing / ok 75 - short SHA-1 setup ok 42 - rm succeeds when given a directory with a trailing / ok 43 - rm of a populated submodule with different HEAD fails unless forced ok 76 - short SHA-1 collide # still have 1 known breakage(s) # passed all remaining 75 test(s) 1..76 ok 44 - rm --cached leaves work tree of populated submodules and .gitmodules alone *** t3700-add.sh *** ok 1 - Test of git add ok 2 - Post-check that foo is in the index ok 3 - Test that "git add -- -q" works ok 4 - git add: Test that executable bit is not used if core.filemode=0 ok 5 - git add: filemode=0 should not get confused by symlink ok 6 - git update-index --add: Test that executable bit is not used... ok 45 - rm --dry-run does not touch the submodule or .gitmodules ok 7 - git add: filemode=0 should not get confused by symlink ok 8 - git update-index --add: Test that executable bit is not used... ok 9 - .gitignore test setup ok 10 - .gitignore is honored ok 11 - error out when attempting to add ignored ones without -f ok 51 - rebase -i --onto --root ok 12 - error out when attempting to add ignored ones without -f ok 13 - add ignored ones with -f ok 14 - add ignored ones with -f ok 15 - add ignored ones with -f ok 16 - .gitignore with subdirectory ok 17 - check correct prefix detection ok 46 - rm does not complain when no .gitmodules file is found ok 18 - git add with filemode=0, symlinks=0, and unmerged entries ok 19 - git add with filemode=0, symlinks=0 prefers stage 2 over stage 1 ok 20 - git add --refresh ok 21 - git add --refresh with pathspec ok 22 - git add should fail atomically upon an unreadable file ok 23 - git add --ignore-errors ok 47 - rm will error out on a modified .gitmodules file unless staged ok 24 - git add (add.ignore-errors) ok 23 - rebase -p --onto in merged history does not drop patches in onto ok 25 - git add (add.ignore-errors = false) ok 26 - --no-ignore-errors overrides config ok 24 - setup of non-linear-history for dropping whole side ok 27 - git add 'fo\[ou\]bar' ignores foobar ok 28 - git add to resolve conflicts on otherwise ignored path ok 29 - "add non-existent" should fail ok 48 - rm issues a warning when section is not found in .gitmodules ok 30 - git add -A on empty repo does not error out ok 31 - "git add ." in empty repo ok 32 - git add --dry-run of existing changed file ok 33 - git add --dry-run of non-existing file ok 34 - git add --dry-run of an existing file output ok 35 - git add --dry-run --ignore-missing of non-existing file ok 36 - git add --dry-run --ignore-missing of non-existing file output # passed all 36 test(s) 1..36 *** t3701-add-interactive.sh *** ok 1 - setup (initial) ok 2 - status works (initial) ok 3 - setup expected ok 4 - diff works (initial) ok 49 - rm of a populated submodule with modifications fails unless forced ok 52 - rebase -p --onto --root ok 5 - revert works (initial) ok 6 - setup (commit) ok 7 - status works (commit) ok 8 - setup expected ok 50 - rm of a populated submodule with untracked files fails unless forced ok 9 - diff works (commit) ok 53 - rebase without --onto --root with disjoint history ok 51 - setup submodule conflict not ok 25 - rebase -p drops merge commit when entire first-parent side is dropped # TODO known breakage ok 10 - revert works (commit) ok 11 - setup expected ok 12 - setup fake editor not ok 54 - rebase -m without --onto --root with disjoint history # TODO known breakage ok 13 - dummy edit works ok 14 - setup patch ok 15 - setup fake editor ok 52 - rm removes work tree of unmodified conflicted submodule ok 16 - bad edit rejected ok 17 - setup patch ok 18 - garbage edit rejected ok 19 - setup patch ok 20 - setup expected ok 53 - rm of a conflicted populated submodule with different HEAD fails unless forced ok 21 - real edit works ok 22 - skip files similarly as commit -a ok 23 - patch does not affect mode ok 55 - rebase -i without --onto --root with disjoint history ok 54 - rm of a conflicted populated submodule with modifications fails unless forced ok 24 - stage mode but not hunk ok 26 - rebase -p drops merge commit when entire second-parent side is dropped ok 25 - stage mode and hunk ok 26 - setup again ok 27 - setup patch ok 27 - setup of non-linear-history for empty commits ok 28 - setup expected ok 55 - rm of a conflicted populated submodule with untracked files fails unless forced ok 29 - add first line works ok 30 - setup expected ok 31 - deleting a non-empty file ok 32 - setup expected ok 56 - rm of a conflicted populated submodule with a .git directory fails even when forced ok 57 - rm of a conflicted unpopulated submodule succeeds not ok 56 - rebase -p without --onto --root with disjoint history # TODO known breakage ok 33 - deleting an empty file ok 34 - split hunk setup ok 58 - rm of a populated submodule with a .git directory fails even when forced ok 35 - split hunk "add -p (edit)" ok 36 - patch mode ignores unmerged entries ok 57 - rebase --onto --root drops patch in onto # passed all 36 test(s) 1..36 *** t3702-add-edit.sh *** ok 1 - setup ok 2 - add -e # passed all 2 test(s) 1..2 not ok 58 - rebase -m --onto --root drops patch in onto # TODO known breakage *** t3703-add-magic-pathspec.sh *** ok 1 - setup ok 2 - add :/ ok 3 - add :/anothersub ok 4 - add :/non-existent ok 5 - a file with the same (long) magic name exists ok 59 - setup subsubmodule ok 6 - a file with the same (short) magic name exists # passed all 6 test(s) 1..6 *** t3800-mktag.sh *** ok 60 - rm recursively removes work tree of unmodified submodules ok 1 - setup ok 2 - Tag object length check ok 28 - rebase -p re-creates empty internal merge commit ok 3 - "object" line label check ok 4 - "object" line SHA1 check ok 5 - "type" line label check ok 6 - "type" line eol check ok 7 - "tag" line label check #1 ok 8 - "tag" line label check #2 ok 9 - "type" line type-name length check ok 10 - verify object (SHA1/type) check ok 11 - verify tag-name check ok 12 - "tagger" line label check #1 ok 13 - "tagger" line label check #2 ok 14 - disallow missing tag author name ok 15 - disallow malformed tagger ok 16 - allow empty tag email ok 17 - disallow spaces in tag email ok 18 - disallow missing tag timestamp ok 19 - detect invalid tag timestamp1 ok 20 - detect invalid tag timestamp2 ok 21 - detect invalid tag timezone1 ok 22 - detect invalid tag timezone2 ok 23 - detect invalid tag timezone3 ok 24 - detect invalid header entry ok 25 - create valid tag ok 26 - check mytag # passed all 26 test(s) 1..26 *** t3900-i18n-commit.sh *** ok 1 - setup ok 2 - no encoding header for base case ok 3 - UTF-16 refused because of NULs ok 4 - UTF-8 invalid characters refused ok 5 - UTF-8 overlong sequences rejected ok 6 - UTF-8 non-characters refused ok 7 - UTF-8 non-characters refused ok 8 - ISO8859-1 setup ok 9 - eucJP setup ok 10 - ISO-2022-JP setup ok 11 - check encoding header for ISO8859-1 ok 12 - check encoding header for eucJP ok 13 - check encoding header for ISO-2022-JP ok 14 - config to remove customization ok 15 - ISO8859-1 should be shown in UTF-8 now ok 16 - eucJP should be shown in UTF-8 now ok 17 - ISO-2022-JP should be shown in UTF-8 now ok 18 - config to add customization ok 19 - ISO8859-1 should be shown in itself now ok 59 - rebase -i --onto --root drops patch in onto ok 61 - rm of a populated nested submodule with different nested HEAD fails unless forced ok 20 - eucJP should be shown in itself now ok 21 - ISO-2022-JP should be shown in itself now ok 22 - config to tweak customization ok 23 - ISO8859-1 should be shown in UTF-8 now ok 24 - eucJP should be shown in UTF-8 now ok 25 - ISO-2022-JP should be shown in UTF-8 now ok 26 - eucJP should be shown in eucJP now ok 27 - ISO-2022-JP should be shown in eucJP now ok 28 - eucJP should be shown in ISO-2022-JP now ok 29 - ISO-2022-JP should be shown in ISO-2022-JP now ok 30 - No conversion with ISO8859-1 ok 31 - No conversion with eucJP ok 32 - No conversion with ISO-2022-JP ok 29 - rebase -p re-creates empty merge commit # still have 2 known breakage(s) # passed all remaining 27 test(s) 1..29 *** t3901-i18n-patch.sh *** ok 1 - setup ok 2 - format-patch output (ISO-8859-1) ok 3 - format-patch output (UTF-8) ok 62 - rm of a populated nested submodule with nested modifications fails unless forced ok 60 - rebase -p --onto --root drops patch in onto ok 33 - commit --fixup with eucJP encoding ok 4 - rebase (U/U) ok 63 - rm of a populated nested submodule with nested untracked files fails unless forced ok 61 - rebase --onto --root with merge-base does not go to root ok 5 - rebase (U/L) ok 62 - rebase -m --onto --root with merge-base does not go to root ok 64 - rm of a populated nested submodule with a nested .git directory fails even when forced ok 6 - rebase (L/L) ok 34 - commit --squash with ISO-2022-JP encoding # passed all 34 test(s) 1..34 *** t3902-quoted.sh *** ok 1 - setup ok 2 - setup expected files ok 3 - check fully quoted output from ls-files ok 4 - check fully quoted output from diff-files ok 5 - check fully quoted output from diff-index ok 6 - check fully quoted output from diff-tree ok 7 - check fully quoted output from ls-tree ok 8 - setting core.quotepath ok 65 - checking out a commit after submodule removal needs manual updates ok 9 - check fully quoted output from ls-files ok 10 - check fully quoted output from diff-files ok 66 - rm of d/f when d has become a non-directory ok 11 - check fully quoted output from diff-index ok 12 - check fully quoted output from diff-tree ok 67 - rm of d/f when d has become a dangling symlink ok 68 - rm of file when it has become a directory ok 13 - check fully quoted output from ls-tree # passed all 13 test(s) 1..13 ok 69 - rm across a symlinked leading path (no index) *** t3903-stash.sh *** not ok 70 - rm across a symlinked leading path (w/ index) # TODO known breakage ok 71 - setup for testing rm messages ok 72 - rm files with different staged content ok 73 - rm files with different staged content without hints ok 74 - rm file with local modification ok 75 - rm file with local modification without hints ok 76 - rm file with changes in the index ok 7 - rebase (L/U) ok 77 - rm file with changes in the index without hints ok 78 - rm files with two different errors # still have 1 known breakage(s) # passed all remaining 77 test(s) 1..78 *** t3904-stash-patch.sh *** ok 1 - stash some dirty working directory ok 2 - parents of stash ok 8 - cherry-pick(U/U) ok 3 - applying bogus stash does nothing ok 1 - setup ok 4 - apply does not need clean working directory ok 9 - cherry-pick(L/L) ok 63 - rebase -i --onto --root with merge-base does not go to root ok 5 - apply does not clobber working directory changes ok 10 - cherry-pick(U/L) ok 2 - saying "n" does nothing ok 6 - apply stashed changes ok 11 - cherry-pick(L/U) ok 7 - apply stashed changes (including index) ok 12 - rebase --merge (U/U) ok 8 - unstashing in a subdirectory ok 3 - git stash -p ok 13 - rebase --merge (U/L) not ok 64 - rebase -p --onto --root with merge-base does not go to root # TODO known breakage ok 9 - drop top stash ok 14 - rebase --merge (L/L) ok 4 - git stash -p --no-keep-index ok 15 - rebase --merge (L/U) # passed all 15 test(s) 1..15 *** t3905-stash-include-untracked.sh *** ok 65 - rebase without --onto --root with disjoint history drops patch in onto ok 1 - stash save --include-untracked some dirty working directory ok 2 - stash save --include-untracked cleaned the untracked files ok 3 - stash save --include-untracked stashed the untracked files ok 4 - stash save --patch --include-untracked fails not ok 66 - rebase -m without --onto --root with disjoint history drops patch in onto # TODO known breakage ok 5 - git stash --no-keep-index -p ok 6 - none of this moved HEAD # passed all 6 test(s) 1..6 ok 5 - stash save --patch --all fails *** t3910-mac-os-precompose.sh *** ok 10 - drop middle stash 1..0 # SKIP filesystem does not corrupt utf-8 *** t4000-diff-format.sh *** ok 1 - update-index --add two files with and without +x. ok 2 - git diff-files -p after editing work tree. ok 6 - stash pop after save --include-untracked leaves files untracked again ok 3 - validate git diff-files -p output. ok 4 - git diff-files -s after editing work tree ok 5 - git diff-files --no-patch as synonym for -s ok 6 - git diff-files --no-patch --patch shows the patch ok 7 - git diff-files --no-patch --patch-with-raw shows the patch and raw data ok 8 - git diff-files --patch --no-patch does not show the patch # passed all 8 test(s) 1..8 *** t4001-diff-rename.sh *** ok 11 - stash pop ok 1 - update-index --add a file. ok 2 - write that tree. ok 3 - renamed and edited the file. ok 4 - git diff-index -p -M after rename and editing. ok 7 - stash save -u dirty index ok 5 - validate the output. ok 6 - favour same basenames over different ones ok 7 - favour same basenames even with minor differences ok 8 - stash save --include-untracked dirty index got stashed ok 8 - setup for many rename source candidates ok 9 - rename pretty print with nothing in common ok 10 - rename pretty print with common prefix ok 12 - stash branch ok 9 - stash save --include-untracked -q is quiet ok 11 - rename pretty print with common suffix ok 12 - rename pretty print with common prefix and suffix ok 13 - rename pretty print common prefix and suffix overlap # passed all 13 test(s) 1..13 *** t4002-diff-basic.sh *** ok 10 - stash save --include-untracked removed files ok 1 - adding test file NN and Z/NN ok 2 - adding test file ND and Z/ND ok 3 - adding test file NM and Z/NM ok 13 - apply -q is quiet ok 4 - adding test file DN and Z/DN ok 67 - rebase -i without --onto --root with disjoint history drops patch in onto ok 5 - adding test file DD and Z/DD ok 6 - adding test file DM and Z/DM ok 7 - adding test file MN and Z/MN ok 11 - stash save --include-untracked removed files got stashed ok 8 - adding test file MD and Z/MD ok 9 - adding test file MM and Z/MM ok 10 - adding test file SS ok 11 - adding test file TT ok 12 - prepare initial tree ok 13 - change in branch A (removal) ok 14 - change in branch A (modification) ok 14 - save -q is quiet ok 15 - change in branch A (modification) ok 16 - change in branch A (modification) ok 17 - change in branch A (modification) ok 18 - change in branch A (modification) ok 19 - change in branch A (modification) ok 20 - change in branch A (addition) ok 21 - change in branch A (addition) ok 22 - change in branch A (addition) ok 23 - change in branch A (addition) ok 12 - stash save --include-untracked respects .gitignore ok 24 - change in branch A (addition) ok 25 - change in branch A (edit) ok 26 - change in branch A (change file to directory) ok 27 - recording branch A tree ok 15 - pop -q is quiet ok 28 - reading original tree and checking out ok 29 - change in branch B (removal) ok 30 - change in branch B (modification) ok 31 - change in branch B (modification) ok 32 - change in branch B (modification) ok 33 - change in branch B (modification) ok 34 - change in branch B (modification) ok 35 - change in branch B (modification) ok 36 - change in branch B (addition) ok 37 - change in branch B (addition) ok 38 - change in branch B (addition) ok 39 - change in branch B (addition) ok 40 - change in branch B (addition and modification) ok 13 - stash save -u can stash with only untracked files different ok 41 - change in branch B (modification) ok 42 - change in branch B (addition of a file to conflict with directory) ok 43 - recording branch B tree ok 44 - keep contents of 3 trees for easy access ok 45 - diff-tree of known trees. ok 46 - diff-tree of known trees. ok 47 - diff-tree of known trees. ok 48 - diff-tree of known trees. ok 49 - diff-tree of known trees. ok 50 - diff-tree of known trees. ok 51 - diff-tree --stdin of known trees. ok 52 - diff-tree --stdin of known trees. ok 53 - diff-cache O with A in cache ok 16 - pop -q --index works and is quiet ok 54 - diff-cache O with B in cache ok 14 - stash save --all does not respect .gitignore ok 55 - diff-cache A with B in cache ok 56 - diff-files with O in cache and A checked out ok 15 - stash save --all is stash poppable ok 57 - diff-files with O in cache and B checked out # passed all 15 test(s) 1..15 *** t4003-diff-rename-1.sh *** ok 58 - diff-files with A in cache and B checked out ok 59 - diff-tree O A == diff-tree -R A O ok 60 - diff-tree -r O A == diff-tree -r -R A O ok 1 - prepare reference tree ok 61 - diff-tree B A == diff-tree -R A B ok 17 - drop -q is quiet ok 62 - diff-tree -r B A == diff-tree -r -R A B ok 2 - prepare work tree ok 63 - diff can read from stdin # passed all 63 test(s) 1..63 ok 3 - validate output from rename/copy detection (#1) ok 4 - prepare work tree again *** t4004-diff-rename-symlink.sh *** ok 5 - validate output from rename/copy detection (#2) ok 6 - prepare work tree once again ok 7 - validate output from rename/copy detection (#3) # passed all 7 test(s) 1..7 *** t4005-diff-rename-2.sh *** ok 1 - prepare reference tree ok 2 - prepare work tree ok 18 - stash -k ok 3 - setup diff output ok 4 - validate diff output # passed all 4 test(s) 1..4 *** t4006-diff-mode.sh *** not ok 68 - rebase -p without --onto --root with disjoint history drops patch in onto # TODO known breakage ok 1 - prepare reference tree ok 2 - prepare work tree ok 1 - setup ok 3 - validate output from rename/copy detection (#1) ok 2 - chmod ok 4 - prepare work tree again ok 19 - stash --no-keep-index ok 3 - prepare binary file ok 5 - validate output from rename/copy detection (#2) # passed all 3 test(s) 1..3 *** t4007-rename-3.sh *** ok 6 - prepare work tree once again ok 7 - validate output from rename/copy detection (#3) # passed all 7 test(s) 1..7 *** t4008-diff-break-rewrite.sh *** ok 1 - prepare reference tree ok 2 - prepare work tree ok 3 - copy detection ok 1 - setup ok 4 - copy detection, cached ok 2 - change file1 with copy-edit of file0 and remove file0 ok 3 - run diff with -B ok 5 - copy, limited to a subtree ok 4 - validate result of -B (#1) ok 6 - tweak work tree ok 5 - run diff with -B and -M ok 6 - validate result of -B -M (#2) ok 20 - stash --invalid-option ok 7 - rename detection ok 7 - swap file0 and file1 ok 8 - rename, limited to a subtree ok 8 - run diff with -B # passed all 8 test(s) 1..8 *** t4009-diff-rename-4.sh *** ok 9 - validate result of -B (#3) ok 10 - run diff with -B and -M ok 11 - validate result of -B -M (#4) ok 1 - prepare reference tree ok 12 - make file0 into something completely different ok 2 - prepare work tree ok 13 - run diff with -B ok 14 - validate result of -B (#5) ok 3 - validate output from rename/copy detection (#1) ok 4 - prepare work tree again ok 15 - run diff with -B -M ok 16 - validate result of -B -M (#6) ok 17 - run diff with -M ok 5 - validate output from rename/copy detection (#2) ok 6 - prepare work tree once again ok 21 - stash an added file ok 18 - validate result of -M (#7) ok 7 - validate output from rename/copy detection (#3) ok 19 - file1 edited to look like file0 and file0 rename-edited to file2 # passed all 7 test(s) 1..7 ok 20 - run diff with -B *** t4010-diff-pathspec.sh *** ok 21 - validate result of -B (#8) ok 22 - run diff with -B -C ok 23 - validate result of -B -M (#9) # passed all 23 test(s) 1..23 *** t4011-diff-symlink.sh *** ok 1 - setup ok 2 - limit to path should show nothing ok 3 - limit to path1 should show path1/file1 ok 4 - limit to path1/ should show path1/file1 ok 1 - diff new symlink and file ok 5 - "*file1" should show path1/file1 ok 2 - diff unchanged symlink and file ok 6 - limit to file0 should show file0 ok 22 - stash rm then recreate ok 3 - diff removed symlink and file ok 7 - limit to file0/ should emit nothing. ok 8 - diff-tree pathspec ok 9 - diff-tree with wildcard shows dir also matches ok 10 - diff-tree -r with wildcard ok 4 - diff identical, but newly created symlink and file ok 11 - diff-tree with wildcard shows dir also matches ok 5 - diff different symlink and file ok 12 - diff-tree -r with wildcard from beginning ok 6 - diff symlinks with non-existing targets ok 13 - diff-tree -r with wildcard ok 7 - setup symlinks with attributes ok 8 - symlinks do not respect userdiff config by path # passed all 8 test(s) 1..8 *** t4012-diff-binary.sh *** ok 1 - prepare repository ok 14 - setup submodules ok 15 - diff-tree ignores trailing slash on submodule path ok 2 - apply --stat output for binary file change ok 3 - diff --shortstat output for binary file change ok 16 - diff multiple wildcard pathspecs ok 4 - diff --shortstat output for binary file change only ok 23 - stash rm and ignore ok 17 - diff-cache ignores trailing slash on submodule path # passed all 17 test(s) ok 5 - apply --numstat notices binary file change 1..17 ok 6 - apply --numstat understands diff --binary format *** t4013-diff-various.sh *** ok 7 - apply detecting corrupt patch correctly ok 8 - apply detecting corrupt patch correctly ok 9 - initial commit not ok 69 - rebase --root on linear history is a no-op # TODO known breakage ok 10 - diff-index with --binary ok 11 - apply binary patch ok 12 - diff --no-index with binary creation ok 24 - stash rm and ignore (stage .gitignore) ok 13 - diff --stat with binary files and big change count # passed all 13 test(s) 1..13 *** t4014-format-patch.sh *** ok 1 - setup ok 2 - git diff-tree initial ok 3 - git diff-tree -r initial ok 4 - git diff-tree -r --abbrev initial ok 5 - git diff-tree -r --abbrev=4 initial ok 6 - git diff-tree --root initial ok 7 - git diff-tree --root --abbrev initial ok 1 - set up terminal for tests ok 8 - git diff-tree --root -r initial ok 25 - stash file to symlink ok 9 - git diff-tree --root -r --abbrev initial ok 10 - git diff-tree --root -r --abbrev=4 initial ok 11 - git diff-tree -p initial ok 12 - git diff-tree --root -p initial ok 13 - git diff-tree --patch-with-stat initial ok 14 - git diff-tree --root --patch-with-stat initial ok 15 - git diff-tree --patch-with-raw initial ok 2 - setup ok 16 - git diff-tree --root --patch-with-raw initial ok 3 - format-patch --ignore-if-in-upstream ok 17 - git diff-tree --pretty initial ok 4 - format-patch --ignore-if-in-upstream ok 18 - git diff-tree --pretty --root initial ok 19 - git diff-tree --pretty -p initial ok 20 - git diff-tree --pretty --stat initial ok 5 - format-patch doesn't consider merge commits ok 26 - stash file to symlink (stage rm) ok 21 - git diff-tree --pretty --summary initial ok 22 - git diff-tree --pretty --stat --summary initial ok 23 - git diff-tree --pretty --root -p initial ok 24 - git diff-tree --pretty --root --stat initial ok 25 - git diff-tree --pretty --root --summary initial ok 26 - git diff-tree --pretty --root --summary -r initial ok 27 - git diff-tree --pretty --root --stat --summary initial ok 28 - git diff-tree --pretty --patch-with-stat initial ok 29 - git diff-tree --pretty --root --patch-with-stat initial ok 30 - git diff-tree --pretty --patch-with-raw initial ok 31 - git diff-tree --pretty --root --patch-with-raw initial ok 32 - git diff-tree --pretty=oneline initial ok 33 - git diff-tree --pretty=oneline --root initial ok 34 - git diff-tree --pretty=oneline -p initial ok 35 - git diff-tree --pretty=oneline --root -p initial ok 27 - stash file to symlink (full stage) ok 36 - git diff-tree --pretty=oneline --patch-with-stat initial ok 37 - git diff-tree --pretty=oneline --root --patch-with-stat initial ok 38 - git diff-tree --pretty=oneline --patch-with-raw initial ok 39 - git diff-tree --pretty=oneline --root --patch-with-raw initial ok 6 - format-patch result applies ok 40 - git diff-tree --pretty side ok 41 - git diff-tree --pretty -p side ok 42 - git diff-tree --pretty --patch-with-stat side ok 43 - git diff-tree master ok 28 - stash symlink to file ok 29 - this must have re-created the symlink ok 44 - git diff-tree -p master ok 45 - git diff-tree -p -m master not ok 70 - rebase -m --root on linear history is a no-op # TODO known breakage ok 46 - git diff-tree -c master ok 47 - git diff-tree -c --abbrev master ok 30 - unstash must re-create the file ok 48 - git diff-tree --cc master ok 49 - git diff-tree -c --stat master ok 50 - git diff-tree --cc --stat master ok 51 - git diff-tree -c --stat --summary master ok 7 - format-patch --ignore-if-in-upstream result applies ok 8 - commit did not screw up the log message ok 9 - format-patch did not screw up the log message ok 52 - git diff-tree --cc --stat --summary master ok 10 - replay did not screw up the log message ok 53 - git diff-tree -c --stat --summary side ok 54 - git diff-tree --cc --stat --summary side ok 31 - stash symlink to file (stage rm) ok 32 - this must have re-created the symlink ok 11 - extra headers ok 55 - git diff-tree --cc --patch-with-stat master ok 12 - extra headers without newlines ok 13 - extra headers with multiple To:s ok 56 - git diff-tree --cc --patch-with-stat --summary master ok 14 - additional command line cc (ascii) ok 57 - git diff-tree --cc --patch-with-stat --summary side ok 58 - git log master not ok 15 - additional command line cc (rfc822) # TODO known breakage ok 33 - unstash must re-create the file ok 59 - git log -p master ok 16 - command line headers ok 60 - git log --root master ok 17 - configuration headers and command line headers ok 18 - command line To: header (ascii) ok 61 - git log --root -p master not ok 19 - command line To: header (rfc822) # TODO known breakage ok 62 - git log --patch-with-stat master not ok 20 - command line To: header (rfc2047) # TODO known breakage ok 63 - git log --root --patch-with-stat master ok 21 - configuration To: header (ascii) not ok 22 - configuration To: header (rfc822) # TODO known breakage ok 64 - git log --root --patch-with-stat --summary master not ok 23 - configuration To: header (rfc2047) # TODO known breakage ok 65 - git log --root -c --patch-with-stat --summary master ok 24 - --no-to overrides config.to ok 34 - stash symlink to file (full stage) ok 35 - this must have re-created the symlink ok 66 - git log --root --cc --patch-with-stat --summary master ok 25 - --no-to and --to replaces config.to ok 67 - git log -p --first-parent master ok 26 - --no-cc overrides config.cc ok 68 - git log -m -p --first-parent master ok 69 - git log -m -p master ok 27 - --no-add-header overrides config.headers ok 70 - git log -SF master ok 28 - multiple files ok 71 - git log -S F master ok 36 - unstash must re-create the file ok 29 - reroll count ok 72 - git log -SF -p master ok 30 - reroll count (-v) ok 73 - git log -SF master --max-count=0 ok 31 - no threading ok 74 - git log -SF master --max-count=1 ok 32 - thread ok 33 - thread in-reply-to ok 75 - git log -SF master --max-count=2 ok 34 - thread cover-letter ok 35 - thread cover-letter in-reply-to ok 76 - git log -GF master ok 77 - git log -GF -p master ok 36 - thread explicit shallow ok 78 - git log -GF -p --pickaxe-all master ok 37 - thread deep ok 79 - git log --decorate --all ok 38 - thread deep in-reply-to ok 80 - git log --decorate=full --all ok 81 - git rev-list --parents HEAD ok 39 - thread deep cover-letter ok 82 - git rev-list --children HEAD ok 40 - thread deep cover-letter in-reply-to ok 83 - git whatchanged master not ok 37 - stash directory to file # TODO known breakage ok 41 - thread via config ok 84 - git whatchanged -p master ok 85 - git whatchanged --root master ok 42 - thread deep via config ok 86 - git whatchanged --root -p master ok 43 - thread config + override ok 87 - git whatchanged --patch-with-stat master ok 44 - thread config + --no-thread ok 88 - git whatchanged --root --patch-with-stat master ok 89 - git whatchanged --root --patch-with-stat --summary master ok 45 - excessive subject ok 90 - git whatchanged --root -c --patch-with-stat --summary master ok 46 - cover-letter inherits diff options ok 91 - git whatchanged --root --cc --patch-with-stat --summary master ok 47 - shortlog of cover-letter wraps overly-long onelines ok 48 - format-patch respects -U ok 92 - git whatchanged -SF master ok 49 - format-patch -p suppresses stat ok 93 - git whatchanged -SF -p master not ok 38 - stash file to directory # TODO known breakage ok 50 - format-patch from a subdirectory (1) ok 94 - git log --patch-with-stat master -- dir/ ok 51 - format-patch from a subdirectory (2) ok 52 - format-patch from a subdirectory (3) ok 95 - git whatchanged --patch-with-stat master -- dir/ ok 53 - format-patch --in-reply-to not ok 71 - rebase -i --root on linear history is a no-op # TODO known breakage ok 96 - git log --patch-with-stat --summary master -- dir/ ok 54 - format-patch --signoff ok 97 - git whatchanged --patch-with-stat --summary master -- dir/ ok 55 - format-patch --notes --signoff ok 98 - git show initial ok 56 - options no longer allowed for format-patch ok 99 - git show --root initial ok 57 - format-patch --numstat should produce a patch ok 100 - git show side ok 58 - format-patch -- ok 59 - format-patch --ignore-if-in-upstream HEAD ok 60 - format-patch --signature ok 101 - git show master ok 61 - format-patch with format.signature config ok 102 - git show -c master ok 103 - git show -m master ok 62 - format-patch --signature overrides format.signature ok 104 - git show --first-parent master ok 105 - git show --stat side ok 106 - git show --stat --summary side ok 63 - format-patch --no-signature ignores format.signature ok 107 - git show --patch-with-stat side ok 64 - format-patch --signature --cover-letter ok 108 - git show --patch-with-raw side ok 109 - git show --patch-with-stat --summary side ok 39 - stash branch - no stashes on stack, stash-like argument ok 65 - format.signature="" suppresses signatures ok 110 - git format-patch --stdout initial..side ok 111 - git format-patch --stdout initial..master^ ok 66 - format-patch --no-signature suppresses signatures ok 67 - format-patch --signature="" suppresses signatures ok 112 - git format-patch --stdout initial..master ok 113 - git format-patch --stdout --no-numbered initial..master ok 114 - git format-patch --stdout --numbered initial..master ok 68 - format-patch --stdout paginates ok 115 - git format-patch --attach --stdout initial..side ok 116 - git format-patch --attach --stdout --suffix=.diff initial..side ok 117 - git format-patch --attach --stdout initial..master^ ok 118 - git format-patch --attach --stdout initial..master ok 69 - format-patch --stdout pagination can be disabled ok 119 - git format-patch --inline --stdout initial..side ok 70 - format-patch handles multi-line subjects ok 120 - git format-patch --inline --stdout initial..master^ ok 71 - format-patch handles multi-line encoded subjects ok 121 - git format-patch --inline --stdout --numbered-files initial..master ok 72 - format-patch wraps extremely long subject (ascii) ok 122 - git format-patch --inline --stdout initial..master ok 73 - format-patch wraps extremely long subject (rfc2047) ok 123 - git format-patch --inline --stdout --subject-prefix=TESTCASE initial..master ok 74 - format-patch quotes dot in from-headers ok 124 - git config format.subjectprefix DIFFERENT_PREFIX ok 125 - git format-patch --inline --stdout initial..master^^ ok 75 - format-patch quotes double-quote in from-headers ok 126 - git format-patch --stdout --cover-letter -n initial..master^ ok 76 - format-patch uses rfc2047-encoded from-headers when necessary ok 127 - git diff --abbrev initial..side ok 128 - git diff -r initial..side ok 129 - git diff --stat initial..side ok 77 - rfc2047-encoded from-headers leave no rfc822 specials ok 130 - git diff -r --stat initial..side ok 78 - format-patch wraps moderately long from-header (ascii) ok 131 - git diff initial..side ok 79 - format-patch wraps extremely long from-header (ascii) ok 132 - git diff --patch-with-stat initial..side ok 133 - git diff --patch-with-raw initial..side ok 80 - format-patch wraps extremely long from-header (rfc822) ok 134 - git diff --patch-with-stat -r initial..side ok 81 - format-patch wraps extremely long from-header (rfc2047) ok 135 - git diff --patch-with-raw -r initial..side ok 136 - git diff --name-status dir2 dir ok 82 - subject lines do not have 822 atom-quoting ok 137 - git diff --no-index --name-status dir2 dir ok 83 - subject prefixes have space prepended ok 40 - stash branch - stashes on stack, stash-like argument ok 138 - git diff --no-index --name-status -- dir2 dir ok 84 - empty subject prefix does not have extra space ok 85 - --from=ident notices bogus ident ok 139 - git diff --no-index dir dir3 ok 86 - --from=ident replaces author ok 140 - git diff master master^ side ok 87 - --from uses committer ident ok 88 - --from omits redundant in-body header ok 141 - git diff --dirstat master~1 master~2 ok 142 - git diff --dirstat initial rearrange ok 89 - in-body headers trigger content encoding ok 143 - git diff --dirstat-by-file initial rearrange ok 90 - signoff: commit with no body ok 144 - log -S requires an argument ok 145 - diff --cached on unborn branch ok 146 - diff --cached -- file on unborn branch # passed all 146 test(s) 1..146 *** t4015-diff-whitespace.sh *** ok 91 - signoff: commit with only subject ok 92 - signoff: commit with only subject that does not end with NL not ok 72 - rebase -p --root on linear history is a no-op # TODO known breakage ok 93 - signoff: no existing signoffs ok 1 - Ray's example without options ok 2 - Ray's example with -w ok 94 - signoff: no existing signoffs and no trailing NL ok 3 - Ray's example with -b ok 4 - another test, without options ok 5 - another test, with -w ok 95 - signoff: some random signoff ok 6 - another test, with -w -b ok 7 - another test, with -w --ignore-space-at-eol ok 8 - another test, with -w -b --ignore-space-at-eol ok 9 - another test, with -b ok 96 - signoff: misc conforming footer elements ok 10 - another test, with -b --ignore-space-at-eol ok 11 - another test, with --ignore-space-at-eol ok 97 - signoff: some random signoff-alike ok 98 - signoff: not really a signoff ok 12 - ignore-blank-lines: only new lines ok 99 - signoff: not really a signoff (2) ok 13 - ignore-blank-lines: only new lines with space ok 14 - ignore-blank-lines: after change ok 100 - signoff: valid S-o-b paragraph in the middle ok 15 - ignore-blank-lines: before change ok 16 - ignore-blank-lines: between changes ok 101 - signoff: the same signoff at the end ok 102 - signoff: the same signoff at the end, no trailing NL ok 17 - ignore-blank-lines: between changes (with interhunkctx) ok 103 - signoff: the same signoff NOT at the end ok 41 - stash show format defaults to --stat ok 104 - signoff: detect garbage in non-conforming footer ok 105 - signoff: footer begins with non-signoff without @ sign ok 18 - ignore-blank-lines: scattered spaces ok 106 - format patch ignores color.ui ok 19 - ignore-blank-lines: spaces coalesce ok 107 - cover letter using branch description (1) ok 20 - ignore-blank-lines: mix changes and blank lines ok 21 - check mixed spaces and tabs in indent ok 108 - cover letter using branch description (2) ok 22 - check mixed tabs and spaces in indent ok 23 - check with no whitespace errors ok 24 - check with trailing whitespace ok 25 - check with space before tab in indent ok 26 - --check and --exit-code are not exclusive ok 109 - cover letter using branch description (3) ok 27 - --check and --quiet are not exclusive ok 28 - check staged with no whitespace errors ok 29 - check staged with trailing whitespace ok 30 - check staged with space before tab in indent ok 110 - cover letter using branch description (4) ok 31 - check with no whitespace errors (diff-index) ok 111 - cover letter using branch description (5) ok 32 - check with trailing whitespace (diff-index) ok 112 - cover letter using branch description (6) ok 33 - check with space before tab in indent (diff-index) ok 113 - cover letter with nothing ok 34 - check staged with no whitespace errors (diff-index) ok 35 - check staged with trailing whitespace (diff-index) ok 36 - check staged with space before tab in indent (diff-index) ok 37 - check with no whitespace errors (diff-tree) ok 114 - cover letter auto ok 38 - check with trailing whitespace (diff-tree) ok 39 - check with space before tab in indent (diff-tree) ok 40 - check trailing whitespace (trailing-space: off) ok 115 - cover letter auto user override # still have 5 known breakage(s) # passed all remaining 110 test(s) 1..115 ok 41 - check trailing whitespace (trailing-space: on) ok 42 - check space before tab in indent (space-before-tab: off) *** t4016-diff-quote.sh *** ok 43 - check space before tab in indent (space-before-tab: on) ok 44 - check spaces as indentation (indent-with-non-tab: off) ok 45 - check spaces as indentation (indent-with-non-tab: on) ok 42 - stash show - stashes on stack, stash-like argument ok 46 - ditto, but tabwidth=9 ok 47 - check tabs and spaces as indentation (indent-with-non-tab: on) ok 48 - ditto, but tabwidth=10 ok 1 - setup ok 2 - setup expected files ok 49 - ditto, but tabwidth=20 ok 3 - git diff --summary -M HEAD ok 50 - check tabs as indentation (tab-in-indent: off) ok 4 - git diff --numstat -M HEAD ok 51 - check tabs as indentation (tab-in-indent: on) ok 5 - git diff --stat -M HEAD # passed all 5 test(s) 1..5 ok 52 - check tabs and spaces as indentation (tab-in-indent: on) ok 53 - ditto, but tabwidth=1 (must be irrelevant) *** t4017-diff-retval.sh *** ok 54 - check tab-in-indent and indent-with-non-tab conflict ok 55 - check tab-in-indent excluded from wildcard whitespace attribute ok 56 - line numbers in --check output are correct ok 57 - checkdiff detects new trailing blank lines (1) ok 58 - checkdiff detects new trailing blank lines (2) ok 59 - checkdiff allows new blank lines ok 1 - setup ok 2 - git diff --quiet -w HEAD^^ HEAD^ ok 3 - git diff --quiet HEAD^^ HEAD^ ok 4 - git diff --quiet -w HEAD^ HEAD ok 60 - whitespace-only changes not reported ok 5 - git diff-tree HEAD^ HEAD ok 6 - git diff-tree HEAD^ HEAD -- a ok 7 - git diff-tree HEAD^ HEAD -- b ok 73 - rebase -f --root on linear history causes re-write ok 8 - echo HEAD | git diff-tree --stdin ok 9 - git diff-tree HEAD HEAD ok 61 - whitespace-only changes reported across renames ok 10 - git diff-files ok 11 - git diff-index --cached HEAD ok 12 - git diff-index --cached HEAD^ ok 13 - git diff-index --cached HEAD^ ok 14 - git diff-tree -Stext HEAD^ HEAD -- b ok 15 - git diff-tree -Snot-found HEAD^ HEAD -- b ok 16 - git diff-files ok 62 - rename empty ok 17 - git diff-index --cached HEAD ok 18 - --check --exit-code returns 0 for no difference ok 19 - --check --exit-code returns 1 for a clean difference ok 20 - --check --exit-code returns 3 for a dirty difference ok 21 - --check with --no-pager returns 2 for dirty difference ok 22 - check should test not just the last line ok 63 - combined diff with autocrlf conversion ok 23 - check detects leftover conflict markers ok 64 - setup diff colors ok 24 - check honors conflict marker length # passed all 24 test(s) 1..24 *** t4018-diff-funcname.sh *** ok 43 - stash show -p - stashes on stack, stash-like argument ok 65 - diff that introduces a line with only tabs # passed all 65 test(s) 1..65 *** t4019-diff-wserror.sh *** ok 1 - builtin ada pattern compiles ok 2 - builtin ada wordRegex pattern compiles ok 3 - builtin bibtex pattern compiles ok 4 - builtin bibtex wordRegex pattern compiles ok 5 - builtin cpp pattern compiles ok 1 - setup ok 6 - builtin cpp wordRegex pattern compiles ok 7 - builtin csharp pattern compiles ok 2 - default ok 8 - builtin csharp wordRegex pattern compiles ok 9 - builtin fortran pattern compiles ok 10 - builtin fortran wordRegex pattern compiles ok 11 - builtin html pattern compiles ok 3 - default (attribute) ok 12 - builtin html wordRegex pattern compiles ok 13 - builtin java pattern compiles ok 4 - default, tabwidth=10 (attribute) ok 14 - builtin java wordRegex pattern compiles ok 15 - builtin matlab pattern compiles ok 44 - stash show - no stashes on stack, stash-like argument ok 16 - builtin matlab wordRegex pattern compiles ok 5 - no check (attribute) ok 17 - builtin objc pattern compiles ok 18 - builtin objc wordRegex pattern compiles ok 19 - builtin pascal pattern compiles ok 6 - no check, tabwidth=10 (attribute), must be irrelevant ok 20 - builtin pascal wordRegex pattern compiles ok 21 - builtin perl pattern compiles ok 7 - without -trail ok 22 - builtin perl wordRegex pattern compiles ok 23 - builtin php pattern compiles ok 24 - builtin php wordRegex pattern compiles ok 8 - without -trail (attribute) ok 25 - builtin python pattern compiles ok 26 - builtin python wordRegex pattern compiles ok 27 - builtin ruby pattern compiles ok 28 - builtin ruby wordRegex pattern compiles ok 9 - without -space ok 29 - builtin tex pattern compiles ok 30 - builtin tex wordRegex pattern compiles ok 31 - default behaviour ok 32 - set up .gitattributes declaring drivers to test ok 10 - without -space (attribute) ok 33 - preset java pattern ok 11 - with indent-non-tab only ok 34 - preset perl pattern ok 35 - perl pattern accepts K&R style brace placement, too ok 36 - but is not distracted by end of <= N ok 3 - word diff with runs of whitespace ok 17 - diff -U1 --inter-hunk-context=1, 3 common lines: count hunks (1) ok 4 - --word-diff=porcelain ok 4 - git diff-tree HEAD^ HEAD -- b ok 18 - diff -U1 --inter-hunk-context=2, 3 common lines: count hunks (1) ok 5 - echo HEAD | git diff-tree --stdin ok 6 - git diff-tree HEAD HEAD ok 5 - --word-diff=plain ok 7 - git diff-files ok 6 - --word-diff=plain --color ok 8 - git diff-index --cached HEAD ok 9 - git diff-index --cached HEAD^ ok 7 - word diff without context ok 19 - diff -U3, 9 common lines: count hunks (2) ok 10 - git diff-index --cached HEAD^ ok 20 - diff -U3 --inter-hunk-context=2, 9 common lines: count hunks (2) ok 8 - word diff with a regular expression ok 21 - diff -U3 --inter-hunk-context=3, 9 common lines: count hunks (1) ok 11 - git diff-tree -Stext HEAD^ HEAD -- b # passed all 21 test(s) 1..21 ok 12 - git diff-tree -Snot-found HEAD^ HEAD -- b ok 9 - set up a diff driver ok 13 - git diff-files *** t4036-format-patch-signer-mime.sh *** ok 10 - option overrides .gitattributes ok 14 - git diff-index --cached HEAD ok 11 - use regex supplied by driver ok 15 - git diff, one file outside repo ok 12 - set up diff.wordRegex option ok 16 - git diff, both files outside repo ok 17 - git diff --ignore-space-at-eol, one file outside repo ok 18 - git diff --ignore-space-at-eol, both files outside repo ok 13 - command-line overrides config ok 1 - setup ok 2 - format normally ok 14 - command-line overrides config: --word-diff-regex ok 19 - git diff --ignore-all-space, one file outside repo ok 3 - format with signoff without funny signer name ok 15 - .gitattributes override config ok 4 - format with non ASCII signer name ok 16 - setup: remove diff driver regex ok 20 - git diff --ignore-all-space, both files outside repo ok 5 - attach and signoff do not duplicate mime headers ok 21 - git diff --quiet ignores stat-change only entries # passed all 5 test(s) 1..5 ok 17 - use configured regex # passed all 21 test(s) 1..21 ok 18 - test parsing words for newline *** t4037-diff-r-t-dirs.sh *** ok 19 - test when words are only removed at the end *** t4038-diff-combined.sh *** ok 20 - --word-diff=none ok 50 - stash branch should not drop the stash if the branch exists ok 21 - unset default driver ok 1 - setup ok 22 - diff driver 'ada' ok 2 - verify # passed all 2 test(s) 1..2 ok 23 - diff driver 'bibtex' *** t4039-diff-assume-unchanged.sh *** ok 24 - diff driver 'cpp' ok 25 - diff driver 'csharp' ok 26 - diff driver 'fortran' ok 27 - diff driver 'html' ok 1 - setup ok 2 - diff-index does not examine assume-unchanged entries ok 28 - diff driver 'java' ok 3 - diff-files does not examine assume-unchanged entries # passed all 3 test(s) 1..3 *** t4040-whitespace-status.sh *** ok 29 - diff driver 'matlab' ok 30 - diff driver 'objc' ok 31 - diff driver 'pascal' ok 32 - diff driver 'perl' ok 1 - setup ok 2 - diff-tree --exit-code ok 33 - diff driver 'php' ok 3 - diff-tree -b --exit-code ok 34 - diff driver 'python' ok 4 - diff-index --cached --exit-code ok 35 - diff driver 'ruby' ok 5 - diff-index -b -p --cached --exit-code ok 36 - diff driver 'tex' ok 1 - setup ok 6 - diff-index --exit-code ok 7 - diff-index -b -p --exit-code ok 2 - check combined output (1) ok 8 - diff-files --exit-code ok 37 - word-diff with diff.sbe ok 51 - stash apply shows status same as git status (relative to current directory) ok 38 - word-diff with no newline at EOF ok 9 - diff-files -b -p --exit-code ok 3 - check combined output (2) ok 39 - setup history with two files ok 4 - diagnose truncated file ok 10 - diff-files --diff-filter --quiet ok 11 - diff-tree --diff-filter --quiet ok 40 - wordRegex for the first file does not apply to the second # passed all 11 test(s) 1..11 # passed all 40 test(s) 1..40 *** t4041-diff-submodule-option.sh *** *** t4042-diff-textconv-caching.sh *** ok 52 - stash where working directory contains "HEAD" file ok 1 - setup ok 2 - first textconv works ok 53 - store called with invalid commit ok 3 - cached textconv produces same output ok 4 - cached textconv does not run helper ok 1 - added submodule ok 5 - changing textconv invalidates cache ok 6 - switching diff driver produces correct results ok 2 - added submodule, set diff.submodule ok 3 - --submodule=short overrides diff.submodule ok 7 - log notes cache and still use cache for -p # passed all 7 test(s) 1..7 *** t4043-diff-rename-binary.sh *** ok 4 - diff.submodule does not affect plumbing ok 1 - prepare repository ok 5 - modified submodule(forward) ok 2 - move the files into a "sub" directory ok 6 - modified submodule(forward) ok 3 - git show -C -C report renames # passed all 3 test(s) 1..3 ok 7 - modified submodule(forward) --submodule *** t4044-diff-index-unique-abbrev.sh *** ok 8 - modified submodule(forward) --submodule=short ok 54 - store updates stash ref and reflog ok 9 - modified submodule(backward) ok 1 - setup ok 2 - diff does not produce ambiguous index line # passed all 2 test(s) 1..2 *** t4045-diff-relative.sh *** ok 10 - modified submodule(backward and forward) ok 11 - typechanged submodule(submodule->blob), --cached ok 5 - setup for --cc --raw ok 6 - check --cc --raw with four trees ok 12 - typechanged submodule(submodule->blob) ok 7 - check --cc --raw with forty trees ok 1 - setup ok 13 - typechanged submodule(submodule->blob) ok 2 - -p --relative=subdir/ ok 3 - -p --relative=subdir ok 4 - -p --relative=sub ok 5 - --numstat --relative=subdir/ ok 6 - --numstat --relative=subdir ok 7 - --numstat --relative=sub ok 8 - --stat --relative=subdir/ ok 8 - setup combined ignore spaces ok 9 - --stat --relative=subdir ok 14 - nonexistent commit ok 9 - check combined output (no ignore space) ok 10 - --stat --relative=sub ok 10 - check combined output (ignore space at eol) ok 11 - --raw --relative=subdir/ ok 15 - typechanged submodule(blob->submodule) ok 12 - --raw --relative=subdir ok 11 - check combined output (ignore space change) ok 13 - --raw --relative=sub # passed all 13 test(s) 1..13 ok 16 - submodule is up to date *** t4046-diff-unmerged.sh *** ok 12 - check combined output (ignore all spaces) ok 17 - submodule contains untracked content ok 18 - submodule contains untracked content (untracked ignored) ok 19 - submodule contains untracked content (dirty ignored) ok 20 - submodule contains untracked content (all ignored) ok 21 - submodule contains untracked and modifed content ok 22 - submodule contains untracked and modifed content (untracked ignored) ok 23 - submodule contains untracked and modifed content (dirty ignored) ok 24 - submodule contains untracked and modifed content (all ignored) ok 25 - submodule contains modifed content ok 1 - setup ok 2 - diff-files -0 ok 3 - diff-files -1 ok 13 - combine diff coalesce simple ok 26 - submodule is modified ok 4 - diff-files -2 ok 27 - modified submodule contains untracked content ok 5 - diff-files -3 # passed all 5 test(s) 1..5 ok 28 - modified submodule contains untracked content (untracked ignored) *** t4047-diff-dirstat.sh *** ok 29 - modified submodule contains untracked content (dirty ignored) ok 30 - modified submodule contains untracked content (all ignored) ok 55 - handle stash specification with spaces # still have 2 known breakage(s) # passed all remaining 53 test(s) 1..55 ok 31 - modified submodule contains untracked and modifed content *** t4048-diff-combined-binary.sh *** ok 32 - modified submodule contains untracked and modifed content (untracked ignored) ok 33 - modified submodule contains untracked and modifed content (dirty ignored) ok 34 - modified submodule contains untracked and modifed content (all ignored) ok 35 - modified submodule contains modifed content ok 14 - combine diff coalesce tricky ok 36 - deleted submodule ok 37 - multiple submodules ok 1 - setup binary merge conflict ok 2 - diff -m indicates binary-ness ok 38 - path filter ok 3 - diff -c indicates binary-ness ok 1 - setup ok 4 - diff --cc indicates binary-ness ok 39 - given commit not ok 15 - combine diff coalesce three parents # TODO known breakage ok 2 - sanity check setup (--numstat) ok 40 - given commit --submodule ok 3 - various ways to misspell --dirstat ok 41 - given commit --submodule=short ok 4 - vanilla --dirstat ok 42 - setup .git file for sm2 ok 43 - diff --submodule with .git file ok 5 - vanilla -X ok 5 - setup non-binary with binary attribute ok 6 - diff -m respects binary attribute ok 16 - combine diff missing delete bug ok 6 - explicit defaults: --dirstat=changes,noncumulative,3 # still have 1 known breakage(s) # passed all remaining 15 test(s) 1..16 ok 7 - diff -c respects binary attribute ok 8 - diff --cc respects binary attribute ok 7 - explicit defaults: -Xchanges,noncumulative,3 ok 9 - setup textconv attribute *** t4049-diff-stat-count.sh *** ok 10 - diff -m respects textconv attribute ok 8 - later options override earlier options: ok 44 - diff --submodule with objects referenced by alternates # passed all 44 test(s) 1..44 ok 11 - diff -c respects textconv attribute ok 1 - setup ok 9 - non-defaults in config overridden by explicit defaults on command line *** t4050-diff-histogram.sh *** ok 12 - diff --cc respects textconv attribute ok 2 - mode-only change show as a 0-line change ok 10 - --dirstat=0 ok 3 - binary changes do not count in lines ok 13 - diff-tree plumbing does not respect textconv ok 11 - -X0 ok 1 - histogram diff ok 14 - diff --cc respects textconv on worktree file ok 4 - exclude unmerged entries from total file count ok 2 - histogram diff output is valid # passed all 4 test(s) 1..4 # passed all 14 test(s) 1..14 *** t4051-diff-function-context.sh *** ok 12 - diff.dirstat=0 ok 3 - completely different files # passed all 3 test(s) 1..3 *** t4052-stat-output.sh *** *** t4053-diff-no-index.sh *** ok 13 - --dirstat=0 --cumulative ok 1 - setup ok 14 - --dirstat=0,cumulative ok 2 - diff -U0 -W ok 1 - setup ok 15 - -X0,cumulative ok 1 - set up terminal for tests ok 2 - git diff --no-index directories ok 3 - git diff --no-index relative path outside repo ok 4 - git diff --no-index with broken index ok 3 - diff -W ok 16 - diff.dirstat=0,cumulative # passed all 3 test(s) 1..3 ok 2 - preparation ok 5 - git diff outside repo with broken index ok 6 - git diff --no-index executed outside repo gives correct error message *** t4054-diff-bogus-tree.sh *** # passed all 6 test(s) 1..6 ok 3 - format-patch: small change with long name gives more space to the name *** t4055-diff-context.sh *** ok 17 - diff.dirstat=0 & --dirstat=cumulative ok 4 - format-patch --stat=width: a long name is given more room when the bar is short ok 1 - create bogus tree ok 2 - create tree with matching file ok 3 - raw diff shows null sha1 (addition) ok 4 - raw diff shows null sha1 (removal) ok 5 - format-patch --stat-width=width with long name ok 18 - --dirstat-by-file ok 5 - raw diff shows null sha1 (modification) ok 6 - format-patch --stat=...,name-width with long name ok 6 - raw diff shows null sha1 (other direction) ok 7 - raw diff shows null sha1 (reverse) ok 7 - format-patch --stat-name-width with long name ok 19 - --dirstat=files ok 8 - raw diff shows null sha1 (index) ok 1 - setup ok 9 - patch fails due to bogus sha1 (addition) ok 10 - patch fails due to bogus sha1 (removal) ok 11 - patch fails due to bogus sha1 (modification) ok 8 - diff: small change with long name gives more space to the name ok 12 - patch fails due to bogus sha1 (other direction) ok 13 - patch fails due to bogus sha1 (reverse) ok 20 - diff.dirstat=files ok 2 - the default number of context lines is 3 ok 14 - patch fails due to bogus sha1 (index) # passed all 14 test(s) 1..14 ok 9 - diff --stat=width: a long name is given more room when the bar is short *** t4056-diff-order.sh *** ok 10 - diff --stat-width=width with long name ok 3 - diff.context honored by "log" ok 11 - diff --stat=...,name-width with long name ok 12 - diff --stat-name-width with long name ok 21 - --dirstat-by-file=10 ok 4 - The -U option overrides diff.context ok 5 - diff.context honored by "diff" ok 6 - plumbing not affected ok 13 - show: small change with long name gives more space to the name ok 7 - non-integer config parsing ok 22 - --dirstat=files,10 ok 14 - show --stat=width: a long name is given more room when the bar is short ok 1 - setup ok 8 - negative integer config parsing ok 2 - no order (=tree object order) ok 15 - show --stat-width=width with long name ok 3 - missing orderfile ok 4 - unreadable orderfile ok 5 - orderfile using option (1) ok 16 - show --stat=...,name-width with long name ok 23 - diff.dirstat=10,files ok 9 - -U0 is valid, so is diff.context=0 ok 6 - orderfile is fifo (1) ok 17 - show --stat-name-width with long name ok 7 - orderfile using config (1) # passed all 9 test(s) 1..9 ok 8 - cancelling configured orderfile (1) ok 9 - orderfile using option (2) *** t4100-apply-stat.sh *** ok 18 - log: small change with long name gives more space to the name ok 24 - --dirstat-by-file --cumulative ok 10 - orderfile is fifo (2) ok 19 - log --stat=width: a long name is given more room when the bar is short ok 11 - orderfile using config (2) ok 12 - cancelling configured orderfile (2) ok 20 - log --stat-width=width with long name # passed all 12 test(s) 1..12 ok 1 - rename ok 2 - rename with recount ok 21 - log --stat=...,name-width with long name ok 25 - --dirstat=files,cumulative ok 3 - copy *** t4101-apply-nonl.sh *** ok 22 - log --stat-name-width with long name ok 4 - copy with recount ok 5 - rewrite ok 26 - diff.dirstat=cumulative,files ok 6 - rewrite with recount ok 7 - mode ok 1 - apply diff between 0 and 1 ok 27 - --dirstat=files,cumulative,10 ok 2 - apply diff between 0 and 2 ok 23 - preparation for big change tests ok 8 - mode with recount ok 9 - non git (1) ok 10 - non git (1) with recount ok 3 - apply diff between 0 and 3 ok 24 - format-patch ignores COLUMNS (big change) ok 4 - apply diff between 1 and 0 ok 11 - non git (2) ok 28 - diff.dirstat=10,cumulative,files ok 5 - apply diff between 1 and 2 ok 25 - format-patch --graph ignores COLUMNS (big change) ok 12 - non git (2) with recount ok 13 - non git (3) ok 6 - apply diff between 1 and 3 ok 26 - diff respects COLUMNS (big change) ok 14 - non git (3) with recount ok 15 - incomplete (1) ok 29 - --dirstat=files,cumulative,16.7 ok 7 - apply diff between 2 and 0 ok 27 - show respects COLUMNS (big change) ok 16 - incomplete (1) with recount ok 8 - apply diff between 2 and 1 ok 17 - incomplete (2) ok 28 - show --graph respects COLUMNS (big change) ok 9 - apply diff between 2 and 3 ok 18 - incomplete (2) with recount ok 29 - log respects COLUMNS (big change) # passed all 18 test(s) 1..18 ok 10 - apply diff between 3 and 0 ok 30 - log --graph respects COLUMNS (big change) *** t4102-apply-rename.sh *** ok 11 - apply diff between 3 and 1 ok 30 - diff.dirstat=16.7,cumulative,files ok 31 - format-patch ignores not enough COLUMNS (big change) ok 12 - apply diff between 3 and 2 # passed all 12 test(s) 1..12 ok 32 - format-patch --graph ignores not enough COLUMNS (big change) ok 33 - diff respects not enough COLUMNS (big change) ok 31 - diff.dirstat=16.70,cumulative,files *** t4103-apply-binary.sh *** ok 34 - show respects not enough COLUMNS (big change) ok 35 - show --graph respects not enough COLUMNS (big change) ok 1 - setup ok 32 - --dirstat=files,cumulative,27.2 ok 2 - apply ok 36 - log respects not enough COLUMNS (big change) ok 3 - validate ok 37 - log --graph respects not enough COLUMNS (big change) ok 4 - apply reverse ok 33 - --dirstat=files,cumulative,27.09 ok 5 - apply copy ok 38 - format-patch ignores statGraphWidth config # passed all 5 test(s) 1..5 *** t4104-apply-boundary.sh *** ok 34 - --dirstat=lines ok 39 - format-patch --graph ignores statGraphWidth config ok 40 - diff respects statGraphWidth config ok 35 - diff.dirstat=lines ok 41 - show respects statGraphWidth config ok 42 - show --graph respects statGraphWidth config ok 43 - log respects statGraphWidth config ok 1 - setup ok 36 - --dirstat=lines,0 ok 2 - stat binary diff -- should not fail. ok 44 - log --graph respects statGraphWidth config ok 3 - stat binary -p0 diff -- should not fail. ok 45 - format-patch --stat=width with big change ok 37 - diff.dirstat=0,lines ok 46 - format-patch --stat-width=width with big change ok 4 - stat binary diff (copy) -- should not fail. ok 1 - setup ok 38 - --dirstat=future_param,lines,0 should fail loudly ok 39 - --dirstat=dummy1,cumulative,2dummy should report both unrecognized parameters ok 5 - check binary diff -- should fail. ok 2 - apply add-a-patch with context ok 47 - format-patch --stat-graph-width with big change ok 6 - check binary diff (copy) -- should fail. ok 3 - apply add-z-patch with context ok 7 - check incomplete binary diff with replacement -- should fail. ok 48 - format-patch --stat-width=width --graph with big change ok 4 - apply insert-a-patch with context ok 8 - check incomplete binary diff with replacement (copy) -- should fail. ok 40 - diff.dirstat=future_param,0,lines should warn, but still work # passed all 40 test(s) 1..40 ok 49 - format-patch --stat-graph-width --graph with big change ok 9 - check binary diff with replacement. ok 5 - apply mod-a-patch with context ok 10 - check binary diff with replacement (copy). *** t4105-apply-fuzz.sh *** ok 50 - diff --stat=width with big change ok 6 - apply mod-z-patch with context ok 51 - diff --stat-width=width with big change ok 11 - apply binary diff -- should fail. ok 52 - diff --stat-graph-width with big change ok 7 - apply del-a-patch with context ok 53 - show --stat=width with big change ok 12 - apply binary diff -- should fail. ok 54 - show --stat-width=width with big change ok 8 - apply del-z-patch with context ok 55 - show --stat-graph-width with big change ok 56 - show --stat-width=width --graph with big change ok 13 - apply binary diff (copy) -- should fail. ok 9 - apply add-a-patch without context ok 57 - show --stat-graph-width --graph with big change ok 10 - apply add-z-patch without context ok 58 - log --stat=width with big change ok 14 - apply binary diff (copy) -- should fail. ok 1 - setup ok 15 - apply binary diff with full-index ok 59 - log --stat-width=width with big change ok 2 - unmodified patch ok 11 - apply insert-a-patch without context ok 60 - log --stat-graph-width with big change ok 16 - apply binary diff with full-index (copy) ok 12 - apply mod-a-patch without context ok 61 - log --stat-width=width --graph with big change ok 3 - minus offset ok 13 - apply mod-z-patch without context ok 62 - log --stat-graph-width --graph with big change ok 4 - plus offset ok 17 - apply full-index binary diff in new repo ok 5 - big offset ok 63 - preparation for long filename tests ok 14 - apply del-a-patch without context ok 6 - fuzz with no offset ok 18 - apply binary diff without replacement. ok 64 - format-patch --stat=width with big change is more balanced ok 7 - fuzz with minus offset ok 65 - format-patch --stat=width --graph with big change is balanced ok 15 - apply del-z-patch without context ok 8 - fuzz with plus offset ok 19 - apply binary diff without replacement (copy). ok 66 - diff --stat=width with big change is more balanced ok 9 - fuzz with big offset # passed all 9 test(s) 1..9 *** t4106-apply-stdin.sh *** ok 16 - apply non-git add-a-patch without context ok 67 - show --stat=width with big change is more balanced ok 68 - show --stat=width --graph with big change is balanced ok 17 - apply non-git add-z-patch without context ok 20 - apply binary diff. ok 18 - apply non-git insert-a-patch without context ok 69 - log --stat=width with big change is more balanced ok 1 - setup ok 70 - log --stat=width --graph with big change is balanced ok 2 - git apply --numstat - < patch ok 19 - apply non-git mod-a-patch without context ok 3 - git apply --numstat - < patch patch # passed all 3 test(s) 1..3 ok 71 - format-patch ignores COLUMNS (long filename) ok 21 - apply binary diff (copy). *** t4107-apply-ignore-whitespace.sh *** ok 72 - format-patch --graph ignores COLUMNS (long filename) ok 20 - apply non-git mod-z-patch without context ok 73 - diff respects COLUMNS (long filename) ok 22 - apply binary -p0 diff # passed all 22 test(s) 1..22 ok 74 - show respects COLUMNS (long filename) ok 75 - show --graph respects COLUMNS (long filename) ok 21 - apply non-git del-a-patch without context ok 76 - log respects COLUMNS (long filename) *** t4108-apply-threeway.sh *** ok 77 - log --graph respects COLUMNS (long filename) ok 22 - apply non-git del-z-patch without context ok 78 - format-patch ignores prefix greater than COLUMNS (big change) ok 79 - format-patch --graph ignores prefix greater than COLUMNS (big change) ok 1 - file creation ok 2 - patch2 fails (retab) ok 80 - diff respects prefix greater than COLUMNS (big change) ok 23 - two lines ok 3 - patch2 applies with --ignore-whitespace ok 4 - patch2 reverse applies with --ignore-space-change ok 24 - apply patch with 3 context lines matching at end ok 5 - patch2 applies (apply.ignorewhitespace = change) ok 6 - patch3 fails (missing string at EOL) # passed all 24 test(s) 1..24 ok 7 - patch4 fails (missing EOL at EOF) ok 8 - patch5 applies (leading whitespace) ok 81 - show respects prefix greater than COLUMNS (big change) ok 9 - patches do not mangle whitespace ok 10 - re-create file (with --ignore-whitespace) ok 11 - patch5 fails (--no-ignore-whitespace) ok 82 - show --graph respects prefix greater than COLUMNS (big change) ok 83 - log respects prefix greater than COLUMNS (big change) *** t4109-apply-multifrag.sh *** ok 84 - log --graph respects prefix greater than COLUMNS (big change) # passed all 11 test(s) 1..11 *** t4110-apply-scan.sh *** ok 1 - setup ok 85 - merge --stat respects COLUMNS (big change) ok 1 - git apply (1) ok 2 - apply without --3way ok 1 - git apply scan ok 86 - merge --stat respects COLUMNS (long filename) ok 2 - git apply (2) # passed all 86 test(s) 1..86 # passed all 1 test(s) 1..1 *** t4111-apply-subdir.sh *** ok 3 - git apply (3) *** t4112-apply-renames.sh *** # passed all 3 test(s) 1..3 *** t4113-apply-ending.sh *** ok 1 - setup ok 1 - setup ok 2 - setup: subdir ok 2 - apply at the end ok 3 - apply at the beginning # passed all 3 test(s) 1..3 ok 3 - apply with --3way ok 1 - check rename/copy patch *** t4114-apply-typechange.sh *** ok 2 - apply rename/copy patch # passed all 2 test(s) 1..2 *** t4115-apply-symlink.sh *** ok 3 - apply from subdir of toplevel ok 4 - apply with --3way with rerere enabled ok 1 - setup ok 2 - apply symlink patch ok 4 - apply --cached from subdir of toplevel ok 5 - apply -3 with add/add conflict setup ok 3 - apply --index symlink patch # passed all 3 test(s) 1..3 *** t4116-apply-reverse.sh *** ok 6 - apply -3 with add/add conflict ok 1 - setup repository and commits ok 2 - file renamed from foo to foo/baz ok 3 - file renamed from foo/baz to foo ok 4 - directory becomes file ok 7 - apply -3 with add/add conflict (dirty working tree) # passed all 7 test(s) 1..7 ok 1 - setup ok 5 - file becomes directory *** t4117-apply-reject.sh *** ok 2 - apply in forward ok 6 - file becomes symlink ok 3 - apply in reverse ok 7 - symlink becomes file ok 5 - apply --index from subdir of toplevel ok 4 - setup separate repository lacking postimage ok 8 - binary file becomes symlink ok 6 - apply half-broken patch from subdir of toplevel ok 7 - apply from .git dir ok 8 - apply from subdir of .git dir ok 5 - apply in forward without postimage ok 9 - symlink becomes binary file ok 1 - setup ok 10 - symlink becomes directory ok 6 - apply in reverse without postimage ok 2 - apply --reject is incompatible with --3way ok 7 - reversing a whitespace introduction ok 3 - apply without --reject should fail ok 11 - directory becomes symlink ok 4 - apply without --reject should fail # passed all 7 test(s) 1..7 # passed all 11 test(s) 1..11 *** t4118-apply-empty-context.sh *** ok 5 - apply with --reject should fail but update the file ok 9 - apply --cached from .git dir *** t4119-apply-config.sh *** ok 6 - apply with --reject should fail but update the file ok 7 - the same test with --verbose ok 8 - apply cleanly with --verbose ok 1 - setup # passed all 8 test(s) 1..8 *** t4120-apply-popt.sh *** ok 2 - apply --whitespace=strip ok 1 - setup ok 2 - apply --numstat ok 10 - apply --cached from subdir of .git dir # passed all 10 test(s) 1..10 *** t4121-apply-diffs.sh *** ok 3 - apply --whitespace=strip from config ok 3 - apply --apply ok 4 - apply --whitespace=strip in subdir # passed all 3 test(s) 1..3 *** t4122-apply-symlink-inside.sh *** ok 1 - setup ok 5 - apply --whitespace=strip from config in subdir ok 2 - apply git diff with -p2 ok 3 - apply with too large -p ok 1 - setup ok 2 - check if contextually independent diffs for the same file apply ok 6 - same in subdir but with traditional patch input # passed all 2 test(s) 1..2 *** t4123-apply-shrink.sh *** ok 4 - apply (-p2) traditional diff with funny filenames ok 5 - apply with too large -p and fancy filename ok 7 - same but with traditional patch input of depth 1 ok 6 - apply (-p2) diff, mode change only ok 1 - setup ok 2 - apply should fail gracefully ok 8 - same but with traditional patch input of depth 2 # passed all 2 test(s) 1..2 ok 1 - setup ok 7 - file mode was changed *** t4124-apply-ws-rule.sh *** ok 8 - apply (-p2) diff, rename # passed all 8 test(s) 1..8 ok 9 - same but with traditional patch input of depth 1 *** t4125-apply-ws-fuzz.sh *** ok 2 - apply ok 3 - check result # passed all 3 test(s) 1..3 ok 10 - same but with traditional patch input of depth 2 # passed all 10 test(s) 1..10 *** t4126-apply-empty.sh *** ok 1 - setup ok 2 - whitespace=nowarn, default rule *** t4127-apply-same-fn.sh *** ok 3 - whitespace=warn, default rule ok 4 - whitespace=error-all, default rule ok 5 - whitespace=error-all, no rule ok 6 - whitespace=error-all, no rule (attribute) ok 1 - setup ok 1 - setup ok 2 - nofix ok 1 - setup ok 2 - apply empty ok 7 - spaces inserted by tab-in-indent ok 3 - withfix (forward) ok 3 - apply --index empty ok 8 - rule=-trailing,-space,-indent,-tab ok 4 - apply create ok 9 - rule=-trailing,-space,-indent,-tab,tabwidth=16 ok 4 - withfix (backward) ok 2 - apply same filename with independent changes # passed all 4 test(s) 1..4 *** t4128-apply-root.sh *** ok 10 - rule=-trailing,-space,-indent,-tab (attributes) ok 5 - apply --index create # passed all 5 test(s) 1..5 ok 11 - rule=-trailing,-space,-indent,-tab,tabwidth=16 (attributes) *** t4129-apply-samemode.sh *** ok 3 - apply same filename with overlapping changes ok 1 - setup ok 12 - rule=-trailing,-space,-indent,tab ok 2 - apply --directory -p (1) ok 13 - rule=-trailing,-space,-indent,tab,tabwidth=16 ok 1 - setup ok 4 - apply same new filename after rename ok 3 - apply --directory -p (2) ok 2 - same mode (no index) ok 14 - rule=-trailing,-space,-indent,tab (attributes) ok 4 - apply --directory (new file) ok 3 - same mode (with index) ok 15 - rule=-trailing,-space,-indent,tab,tabwidth=16 (attributes) ok 5 - apply --directory -p (new file) ok 5 - apply same old filename after rename -- should fail. ok 4 - same mode (index only) ok 5 - mode update (no index) ok 16 - rule=-trailing,-space,indent,-tab ok 6 - apply --directory (delete file) ok 6 - mode update (with index) ok 17 - rule=-trailing,-space,indent,-tab,tabwidth=16 ok 7 - mode update (index only) ok 7 - apply --directory (quoted filename) # passed all 7 test(s) 1..7 # passed all 7 test(s) 1..7 *** t4130-apply-criss-cross-rename.sh *** *** t4131-apply-fake-ancestor.sh *** ok 6 - apply A->B (rename), C->A (rename), A->A -- should pass. # passed all 6 test(s) 1..6 *** t4132-apply-removal.sh *** ok 18 - rule=-trailing,-space,indent,-tab (attributes) ok 1 - setup ok 2 - criss-cross rename ok 3 - diff -M -B ok 19 - rule=-trailing,-space,indent,-tab,tabwidth=16 (attributes) ok 4 - apply ok 1 - setup ok 20 - rule=-trailing,space,-indent,-tab ok 2 - test addEast.patch ok 3 - test addGMT.patch ok 5 - criss-cross rename ok 21 - rule=-trailing,space,-indent,-tab,tabwidth=16 ok 4 - test addWest.patch ok 6 - diff -M -B ok 22 - rule=-trailing,space,-indent,-tab (attributes) ok 5 - test createEast.patch ok 7 - apply # passed all 7 test(s) 1..7 ok 1 - setup *** t4133-apply-filenames.sh *** ok 6 - test createGMT.patch ok 2 - apply --build-fake-ancestor ok 23 - rule=-trailing,space,-indent,-tab,tabwidth=16 (attributes) ok 7 - test createWest.patch ok 1 - setup ok 2 - apply diff with inconsistent filenames in headers ok 8 - test emptyEast.patch # passed all 2 test(s) 1..2 *** t4134-apply-submodule.sh *** ok 3 - apply --build-fake-ancestor in a subdirectory # passed all 3 test(s) 1..3 ok 9 - test emptyGMT.patch *** t4135-apply-weird-filenames.sh *** ok 24 - rule=-trailing,space,-indent,tab ok 10 - test emptyWest.patch ok 11 - test removeEast.patch ok 1 - setup ok 25 - rule=-trailing,space,-indent,tab,tabwidth=16 ok 1 - setup ok 2 - removing a submodule also removes all leading subdirectories ok 12 - test removeGMT.patch # passed all 2 test(s) 1..2 ok 13 - test removeWest.patch *** t4136-apply-check.sh *** ok 26 - rule=-trailing,space,-indent,tab (attributes) ok 2 - plain, git-style file creation patch ok 14 - test removeWest2.patch # passed all 14 test(s) 1..14 *** t4150-am.sh *** ok 27 - rule=-trailing,space,-indent,tab,tabwidth=16 (attributes) ok 3 - plain, traditional patch ok 1 - setup ok 2 - apply --check exits non-zero with unrecognized input # passed all 2 test(s) 1..2 ok 4 - plain, traditional file creation patch *** t4151-am-abort.sh *** ok 28 - rule=-trailing,space,indent,-tab ok 5 - with spaces, git-style file creation patch ok 1 - setup: messages ok 29 - rule=-trailing,space,indent,-tab,tabwidth=16 ok 6 - with spaces, traditional patch ok 7 - with spaces, traditional file creation patch ok 30 - rule=-trailing,space,indent,-tab (attributes) ok 8 - with tab, git-style file creation patch ok 9 - with tab, traditional patch ok 31 - rule=-trailing,space,indent,-tab,tabwidth=16 (attributes) ok 10 - with tab, traditional file creation patch ok 1 - setup ok 32 - rule=trailing,-space,-indent,-tab ok 11 - with backslash, git-style file creation patch ok 2 - setup ok 12 - with backslash, traditional patch ok 33 - rule=trailing,-space,-indent,-tab,tabwidth=16 ok 13 - with backslash, traditional file creation patch ok 34 - rule=trailing,-space,-indent,-tab (attributes) ok 14 - with quote, git-style file creation patch ok 35 - rule=trailing,-space,-indent,-tab,tabwidth=16 (attributes) not ok 15 - with quote, traditional patch # TODO known breakage ok 16 - with quote, traditional file creation patch ok 36 - rule=trailing,-space,-indent,tab ok 17 - whitespace-damaged traditional patch ok 37 - rule=trailing,-space,-indent,tab,tabwidth=16 ok 18 - traditional patch with colon in timezone ok 19 - traditional, whitespace-damaged, colon in timezone # still have 1 known breakage(s) # passed all remaining 18 test(s) 1..19 *** t4152-am-subjects.sh *** ok 38 - rule=trailing,-space,-indent,tab (attributes) ok 39 - rule=trailing,-space,-indent,tab,tabwidth=16 (attributes) ok 3 - am applies patch correctly ok 1 - setup baseline commit ok 40 - rule=trailing,-space,indent,-tab ok 2 - create patches with short subject ok 2 - am stops at a patch that does not apply ok 3 - create patches with long subject ok 41 - rule=trailing,-space,indent,-tab,tabwidth=16 ok 4 - create patches with multiline subject ok 42 - rule=trailing,-space,indent,-tab (attributes) ok 43 - rule=trailing,-space,indent,-tab,tabwidth=16 (attributes) ok 4 - am applies patch e-mail not in a mbox ok 44 - rule=trailing,space,-indent,-tab ok 3 - am --skip continue after failed am ok 45 - rule=trailing,space,-indent,-tab,tabwidth=16 ok 5 - short subject preserved (format-patch | am) ok 46 - rule=trailing,space,-indent,-tab (attributes) ok 47 - rule=trailing,space,-indent,-tab,tabwidth=16 (attributes) ok 4 - am --abort goes back after failed am ok 48 - rule=trailing,space,-indent,tab ok 5 - am applies patch e-mail not in a mbox with CRLF ok 6 - short subject preserved (format-patch -k | am) ok 49 - rule=trailing,space,-indent,tab,tabwidth=16 ok 50 - rule=trailing,space,-indent,tab (attributes) ok 51 - rule=trailing,space,-indent,tab,tabwidth=16 (attributes) ok 52 - rule=trailing,space,indent,-tab ok 53 - rule=trailing,space,indent,-tab,tabwidth=16 ok 6 - am applies patch e-mail with preceding whitespace ok 7 - setup: new author and committer ok 54 - rule=trailing,space,indent,-tab (attributes) ok 55 - rule=trailing,space,indent,-tab,tabwidth=16 (attributes) ok 56 - trailing whitespace & no newline at the end of file ok 7 - short subject preserved (format-patch -k | am -k) ok 57 - blank at EOF with --whitespace=fix (1) ok 58 - blank at EOF with --whitespace=fix (2) ok 59 - blank at EOF with --whitespace=fix (3) ok 5 - am -3 stops at a patch that does not apply ok 60 - blank at end of hunk, not at EOF with --whitespace=fix ok 61 - blank at EOF with --whitespace=warn ok 62 - blank at EOF with --whitespace=error ok 8 - long subject preserved (format-patch | am) ok 63 - blank but not empty at EOF ok 8 - am changes committer and keeps author ok 64 - applying beyond EOF requires one non-blank context line ok 65 - tons of blanks at EOF should not apply ok 66 - missing blank line at end with --whitespace=fix ok 67 - two missing blank lines at end with --whitespace=fix ok 6 - am -3 --skip continue after failed am -3 ok 68 - missing blank line at end, insert before end, --whitespace=fix ok 9 - long subject preserved (format-patch -k | am) ok 69 - shrink file with tons of missing blanks at end of file ok 7 - am --abort goes back after failed am -3 ok 70 - missing blanks at EOF must only match blank lines ok 9 - am --signoff adds Signed-off-by: line ok 71 - missing blank line should match context line with spaces ok 10 - am stays in branch ok 72 - same, but with the --ignore-space-option ok 10 - long subject preserved (format-patch -k | am -k) ok 73 - same, but with CR-LF line endings && cr-at-eol set ok 74 - same, but with CR-LF line endings && cr-at-eol unset ok 75 - whitespace=fix to expand # passed all 75 test(s) 1..75 *** t4200-rerere.sh *** ok 11 - am --signoff does not add Signed-off-by: line if already there ok 11 - multiline subject unwrapped (format-patch | am) ok 12 - am without --keep removes Re: and [PATCH] stuff ok 8 - am --abort will keep the local commits intact # passed all 8 test(s) 1..8 *** t4201-shortlog.sh *** ok 1 - setup ok 2 - nothing recorded without rerere ok 3 - activate rerere, old style (conflicting merge) ok 4 - rerere.enabled works, too ok 5 - set up rr-cache ok 6 - rr-cache looks sane ok 7 - rerere diff ok 12 - multiline subject unwrapped (format-patch -k | am) ok 8 - rerere status ok 13 - am --keep really keeps the subject ok 1 - setup ok 2 - default output format ok 3 - pretty format ok 9 - first postimage wins ok 10 - rerere updates postimage timestamp ok 4 - --abbrev ok 11 - rerere clear ok 5 - output from user-defined format is re-wrapped ok 6 - shortlog wrapping ok 12 - set up for garbage collection tests ok 7 - shortlog from non-git directory ok 13 - gc preserves young or recently used records ok 8 - shortlog should add newline when input line matches wraplen ok 14 - old records rest in peace ok 13 - multiline subject preserved (format-patch -k | am -k) ok 9 - shortlog encoding # passed all 13 test(s) 1..13 ok 14 - am --keep-non-patch really keeps the non-patch part *** t4202-log.sh *** ok 15 - setup: file2 added differently in two branches ok 10 - shortlog ignores commits with missing authors # passed all 10 test(s) 1..10 *** t4203-mailmap.sh *** ok 16 - resolution was recorded properly ok 1 - setup ok 2 - check-mailmap no arguments ok 17 - rerere.autoupdate ok 1 - setup ok 2 - pretty ok 3 - check-mailmap arguments ok 4 - check-mailmap --stdin ok 3 - pretty (tformat) ok 18 - merge --rerere-autoupdate ok 5 - check-mailmap --stdin arguments ok 6 - check-mailmap bogus contact ok 4 - pretty (shortcut) ok 7 - No mailmap ok 5 - format ok 8 - default .mailmap ok 6 - format %w(11,1,2) ok 7 - format %w(,1,2) ok 9 - mailmap.file set ok 8 - oneline ok 10 - mailmap.file override ok 19 - merge --no-rerere-autoupdate ok 11 - mailmap.file non-existent ok 12 - name entry after email entry ok 9 - diff-filter=A ok 10 - diff-filter=M ok 13 - name entry after email entry, case-insensitive ok 11 - diff-filter=D ok 14 - No mailmap files, but configured ok 12 - diff-filter=R ok 13 - diff-filter=C ok 20 - set up an unresolved merge ok 14 - git log --follow ok 15 - setup mailmap blob tests ok 15 - git log --no-walk sorts by commit time ok 15 - am -3 falls back to 3-way merge ok 21 - explicit rerere ok 16 - mailmap.blob set ok 16 - git log --no-walk=sorted sorts by commit time ok 17 - git log --no-walk=unsorted leaves list of commits as given ok 17 - mailmap.blob overrides .mailmap ok 22 - explicit rerere with autoupdate ok 18 - git show leaves list of commits as given ok 18 - mailmap.file overrides mailmap.blob ok 19 - mailmap.blob can be missing ok 19 - setup case sensitivity tests ok 20 - log --grep ok 21 - log --grep option parsing ok 22 - log -i --grep ok 23 - log --grep -i ok 24 - log -F -E --grep= uses ere ok 20 - mailmap.blob defaults to off in non-bare repo ok 25 - simple log --graph ok 21 - mailmap.blob defaults to HEAD:.mailmap in bare repo ok 22 - mailmap.blob can handle blobs without trailing newline ok 23 - cleanup after mailmap.blob tests ok 23 - explicit rerere --rerere-autoupdate overrides ok 24 - single-character name ok 25 - preserve canonical email case ok 26 - set up merge history ok 24 - rerere --no-no-rerere-autoupdate ok 27 - log --graph with merge ok 25 - rerere -h # passed all 25 test(s) 1..25 ok 28 - log --raw --graph -m with merge ok 29 - diff-tree --graph *** t4204-patch-id.sh *** ok 30 - log --graph with full output ok 26 - Shortlog output (complex mapping) ok 27 - Log output (complex mapping) ok 28 - Log output with --use-mailmap ok 29 - Log output with log.mailmap ok 30 - Grep author with --use-mailmap ok 16 - am -3 -p0 can read --no-prefix patch ok 31 - Grep author with log.mailmap ok 32 - Only grep replaced author with --use-mailmap ok 1 - setup ok 33 - Blame output (complex mapping) ok 2 - patch-id output is well-formed ok 34 - commit --author honors mailmap # passed all 34 test(s) 1..34 ok 3 - patch-id detects equality *** t4205-log-pretty-formats.sh *** ok 4 - patch-id detects inequality ok 5 - patch-id supports git-format-patch output ok 6 - whitespace is irrelevant in footer ok 17 - am can rename a file ok 1 - set up basic repos ok 31 - set up more tangled history ok 7 - patch-id supports git-format-patch MIME output ok 32 - log --graph with merge ok 2 - alias builtin format ok 8 - patch-id handles no-nl-at-eof markers # passed all 8 test(s) 1..8 *** t4206-log-follow-harder-copies.sh *** ok 3 - alias masking builtin format ok 4 - alias user-defined format ok 1 - add a file path0 and commit. ok 5 - alias user-defined tformat with %s (iso8859-1 encoding) ok 2 - Change path0. ok 6 - alias user-defined tformat with %s (utf-8 encoding) ok 3 - copy path0 to path1. ok 4 - find the copy path0 -> path1 harder ok 7 - alias user-defined tformat ok 5 - validate the output. ok 8 - alias non-existent format # passed all 5 test(s) 1..5 *** t4207-log-decoration-colors.sh *** ok 9 - alias of an alias ok 18 - am -3 can rename a file ok 10 - alias masking an alias ok 11 - alias loop ok 12 - NUL separation ok 13 - NUL termination ok 14 - NUL separation with --stat not ok 15 - NUL termination with --stat # TODO known breakage ok 33 - log.decorate configuration ok 34 - reflog is expected format ok 35 - whatchanged is expected format ok 16 - setup more commits ok 17 - left alignment formatting ok 18 - left alignment formatting at the nth column ok 19 - left alignment formatting with no padding ok 20 - left alignment formatting with trunc ok 21 - left alignment formatting with ltrunc ok 22 - left alignment formatting with mtrunc ok 23 - right alignment formatting ok 24 - right alignment formatting at the nth column ok 19 - am -3 can rename a file after falling back to 3-way merge ok 25 - right alignment formatting with no padding ok 26 - center alignment formatting ok 36 - log.abbrevCommit configuration ok 27 - center alignment formatting at the nth column ok 28 - center alignment formatting with no padding ok 29 - left/right alignment formatting with stealing ok 1 - setup ok 37 - show added path under "--follow -M" ok 2 - Commit Decorations Colored Correctly # passed all 2 test(s) 1..2 ok 30 - log decoration properly follows tag chain # still have 1 known breakage(s) # passed all remaining 29 test(s) 1..30 *** t4208-log-magic-pathspec.sh *** *** t4209-log-pickaxe.sh *** ok 1 - setup ok 2 - "git log :/" should not be ambiguous ok 3 - "git log :/a" should be ambiguous (applied both rev and worktree) ok 4 - "git log :/a -- " should not be ambiguous ok 5 - "git log -- :/a" should not be ambiguous ok 1 - setup ok 6 - "git log :" should be ambiguous ok 38 - git log -c --follow ok 7 - git log -- : ok 2 - log --grep ok 8 - git log HEAD -- :/ ok 39 - log --graph with diff and stats ok 40 - dotdot is a parent directory ok 3 - log --grep --regexp-ignore-case # passed all 40 test(s) 1..40 *** t4210-log-i18n.sh *** ok 4 - log --grep -i ok 5 - log --author --regexp-ignore-case ok 6 - log --author -i ok 7 - log -G (nomatch) ok 20 - am -3 -q is quiet ok 8 - log -G (match) ok 9 - log -G --regexp-ignore-case (nomatch) ok 1 - create commits in different encodings ok 10 - log -G -i (nomatch) ok 9 - command line pathspec parsing for "git log" ok 2 - log --grep searches in log output encoding (utf8) # passed all 9 test(s) 1..9 ok 11 - log -G --regexp-ignore-case (match) *** t4211-line-log.sh *** ok 3 - log --grep searches in log output encoding (latin1) ok 12 - log -G -i (match) ok 4 - log --grep does not find non-reencoded values (utf8) ok 13 - log -G --textconv (missing textconv tool) ok 5 - log --grep does not find non-reencoded values (latin1) # passed all 5 test(s) 1..5 ok 14 - log -G --no-textconv (missing textconv tool) ok 15 - log -S (nomatch) *** t4212-log-corrupt.sh *** ok 16 - log -S (match) ok 1 - setup (import history) ok 17 - log -S --regexp-ignore-case (match) ok 2 - -L 4,12:a.c simple ok 3 - -L 4,+9:a.c simple ok 4 - -L '/long f/,/^}/:a.c' simple ok 18 - log -S -i (match) ok 5 - -L :f:a.c simple ok 19 - log -S --regexp-ignore-case (nomatch) ok 6 - -L '/main/,/^}/:a.c' simple ok 1 - setup ok 2 - fsck notices broken commit ok 7 - -L :main:a.c simple ok 21 - am pauses on conflict ok 3 - git log with broken author email ok 4 - git log --format with broken author email ok 20 - log -S -i (nomatch) ok 8 - -L 1,+4:a.c simple ok 21 - log -S --textconv (missing textconv tool) ok 22 - log -S --no-textconv (missing textconv tool) ok 9 - -L 20:a.c simple # passed all 22 test(s) 1..22 ok 10 - -L '/long f/',/^}/:a.c -L /main/,/^}/:a.c simple ok 5 - unparsable dates produce sentinel value ok 6 - unparsable dates produce sentinel value (%ad) *** t4252-am-options.sh *** ok 11 - -L 24,+1:a.c simple ok 12 - -M -L '/long f/,/^}/:b.c' move-support ok 13 - -M -L ':f:b.c' parallel-change ok 7 - date parser recognizes integer overflow ok 14 - -L 4,12:a.c -L :main:a.c simple ok 15 - -L 4,18:a.c -L ^:main:a.c simple ok 16 - -L :main:a.c -L 4,18:a.c simple ok 8 - date parser recognizes time_t overflow ok 17 - -L 4:a.c -L 8,12:a.c simple ok 1 - setup ok 18 - -L 8,12:a.c -L 4:a.c simple ok 19 - invalid args: -L ok 9 - absurdly far-in-future dates produce sentinel # passed all 9 test(s) 1..9 *** t4253-am-keep-cr-dos.sh *** ok 20 - invalid args: -L b.c ok 21 - invalid args: -L 1: ok 22 - invalid args: -L 1:nonexistent ok 23 - invalid args: -L 1:simple ok 24 - invalid args: -L '/foo:b.c' ok 25 - invalid args: -L 1000:b.c ok 26 - invalid args: -L 1,1000:b.c ok 22 - am --skip works ok 27 - invalid args: -L :b.c ok 28 - invalid args: -L :foo:b.c ok 29 - -L X (X == nlines) ok 30 - -L X (X == nlines + 1) ok 31 - -L X (X == nlines + 2) ok 1 - setup repository with dos files ok 32 - -L ,Y (Y == nlines) ok 23 - am --abort removes a stray directory ok 33 - -L ,Y (Y == nlines + 1) ok 34 - -L ,Y (Y == nlines + 2) # passed all 34 test(s) 1..34 *** t4254-am-corrupt.sh *** ok 1 - setup ok 2 - interrupted am --whitespace=fix ok 2 - try to apply corrupted patch ok 3 - compare diagnostic; ensure file is still here # passed all 3 test(s) 1..3 *** t4300-merge-tree.sh *** ok 2 - am with dos files without --keep-cr ok 24 - am --resolved works ok 1 - setup ok 2 - file add A, !B ok 3 - file add !A, B ok 25 - am takes patches from a Pine mailbox ok 4 - file add A, B (same) ok 3 - am with dos files with --keep-cr ok 5 - file add A, B (different) ok 3 - interrupted am -C1 ok 6 - file change A, !B ok 26 - am fails on mail without patch ok 7 - file change !A, B ok 8 - file change A, B (same) ok 9 - file change A, B (different) ok 4 - am with dos files config am.keepcr ok 10 - file change A, B (mixed) ok 27 - am fails on empty patch ok 4 - interrupted am -p2 ok 11 - file remove A, !B ok 12 - file remove !A, B ok 13 - file remove A, B (same) ok 28 - am works from stdin in subdirectory ok 5 - am with dos files config am.keepcr overridden by --no-keep-cr ok 14 - file change A, remove B ok 15 - file remove A, change B ok 29 - am works from file (relative path given) in subdirectory ok 16 - tree add A, B (same) ok 5 - interrupted am -C1 -p2 ok 17 - tree add A, B (different) ok 18 - tree unchanged A, removed B ok 30 - am works from file (absolute path given) in subdirectory ok 19 - turn file to tree ok 20 - turn tree to file # passed all 20 test(s) 1..20 *** t5000-tar-tree.sh *** ok 6 - am with dos files with --keep-cr continue ok 31 - am --committer-date-is-author-date ok 1 - populate workdir ok 2 - add ignored file ok 6 - interrupted am --directory="frotz nitfol" ok 3 - add files to repository ok 4 - setup export-subst ok 5 - create bare clone ok 6 - remove ignored file ok 7 - git archive ok 8 - extract tar archive ok 9 # skip interpret pax headers (missing TAR_NEEDS_PAX_FALLBACK) ok 32 - am without --committer-date-is-author-date ok 10 - validate filenames ok 11 - validate file contents ok 12 - git archive --prefix=prefix/ ok 13 - extract tar archive ok 14 # skip interpret pax headers (missing TAR_NEEDS_PAX_FALLBACK) ok 15 - validate filenames ok 16 - validate file contents ok 17 - git-archive --prefix=olde- ok 18 - extract tar archive ok 19 # skip interpret pax headers (missing TAR_NEEDS_PAX_FALLBACK) ok 20 - validate filenames ok 21 - validate file contents ok 7 - apply to a funny path ok 22 - git archive on large files ok 7 - am with unix files config am.keepcr overridden by --no-keep-cr ok 23 - git archive in a bare repo ok 24 - git archive vs. the same in a bare repo ok 25 - git archive with --output # passed all 7 test(s) 1..7 ok 26 - git archive --remote *** t5001-archive-attr.sh *** ok 27 - validate file modification time ok 28 - git get-tar-commit-id ok 29 - git archive with --output, override inferred format ok 30 - git archive --list outside of a git repo ok 1 - setup ok 2 - git archive ok 3 - archive/ignored does not exist ok 4 - archive/ignored-by-tree does not exist ok 5 - archive/ignored-by-worktree exists ok 33 - am --ignore-date ok 31 - clients cannot access unreachable commits ok 6 - git archive with worktree attributes ok 7 - worktree/ignored does not exist ok 8 - worktree/ignored-by-tree exists ok 9 - worktree/ignored-by-worktree does not exist ok 10 - git archive --worktree-attributes option ok 11 - worktree2/ignored does not exist ok 12 - worktree2/ignored-by-tree exists ok 13 - worktree2/ignored-by-worktree does not exist ok 14 - git archive vs. bare ok 32 - setup tar filters ok 33 - archive --list mentions user filter ok 15 - git archive with worktree attributes, bare ok 16 - bare-worktree/ignored does not exist ok 17 - bare-worktree/ignored-by-tree exists ok 18 - bare-worktree/ignored-by-worktree exists ok 34 - archive --list shows only enabled remote filters ok 19 - export-subst # passed all 19 test(s) 1..19 *** t5002-archive-attr-pattern.sh *** ok 8 - am --reject # passed all 8 test(s) 1..8 *** t5003-archive-zip.sh *** ok 35 - invoke tar filter by format ok 36 - invoke tar filter by extension ok 37 - default output format remains tar ok 38 - extension matching requires dot ok 1 - populate workdir ok 39 - only enabled filters are available remotely ok 2 - add symlink ok 3 - prepare file list ok 4 - add ignored file ok 1 - setup ok 2 - git archive ok 3 - archive/ignored does not exist ok 4 - archive/not-ignored-dir/ignored does not exist ok 5 - archive/not-ignored-dir/ignored-only-if-dir exists ok 6 - archive/not-ignored-dir/ exists ok 7 - archive/ignored-only-if-dir/ does not exist ok 8 - archive/ignored-ony-if-dir/ignored-by-ignored-dir does not exist ok 9 - archive/ignored-without-slash/ does not exist ok 10 - archive/ignored-without-slash/foo does not exist ok 11 - archive/wildcard-without-slash/ does not exist ok 12 - archive/wildcard-without-slash/foo does not exist ok 13 - archive/deep/and/slashless/ does not exist ok 14 - archive/deep/and/slashless/foo does not exist ok 15 - archive/deep/with/wildcard/ does not exist ok 16 - archive/deep/with/wildcard/foo does not exist ok 17 - archive/one-level-lower/ exists ok 18 - archive/one-level-lower/two-levels-lower/ignored-only-if-dir/ does not exist 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 ok 40 - git archive --format=tgz *** t5004-archive-corner-cases.sh *** ok 34 - am into an unborn branch ok 5 - add files to repository ok 41 - git archive --format=tar.gz ok 6 - setup export-subst ok 42 - infer tgz from .tgz filename ok 7 - create bare clone ok 8 - remove ignored file ok 1 - create commit with empty tree ok 43 - infer tgz from .tar.gz filename ok 9 - git archive --format=zip ok 2 - tar archive of commit with empty tree ok 44 - extract tgz file ok 3 - tar archive of empty tree is empty ok 10 - extract ZIP archive ok 45 - remote tar.gz is allowed by default ok 46 - remote tar.gz can be disabled # passed all 46 test(s) 1..46 ok 11 - validate filenames ok 12 - validate file contents *** t5100-mailinfo.sh *** ok 13 - git archive --format=zip in a bare repo ok 14 - git archive --format=zip vs. the same in a bare repo ok 4 - tar archive of empty tree with prefix ok 15 - git archive --format=zip with --output ok 35 - am newline in subject ok 16 - git archive with --output, inferring format ok 5 - zip archive of empty tree is empty ok 1 - split sample box ok 17 - git archive --format=zip with prefix ok 2 - mailinfo 0001 ok 18 - extract ZIP archive ok 3 - mailinfo 0002 ok 4 - mailinfo 0003 ok 19 - validate filenames ok 20 - validate file contents ok 6 - zip archive of empty tree with prefix ok 5 - mailinfo 0004 ok 7 - archive complains about pathspec on empty tree ok 8 - create a commit with an empty subtree ok 21 - git archive -0 --format=zip on large files ok 6 - mailinfo 0005 ok 7 - mailinfo 0006 ok 22 - extract ZIP archive ok 8 - mailinfo 0007 ok 23 - validate filenames ok 9 - mailinfo 0008 ok 24 - validate file contents ok 9 - archive empty subtree with no pathspec ok 10 - mailinfo 0009 ok 11 - mailinfo 0010 ok 25 - git archive --format=zip on large files ok 26 - extract ZIP archive ok 12 - mailinfo 0011 ok 10 - archive empty subtree by direct pathspec ok 27 - validate filenames # passed all 10 test(s) 1..10 ok 28 - validate file contents ok 13 - mailinfo 0012 # passed all 28 test(s) 1..28 *** t5150-request-pull.sh *** *** t5300-pack-object.sh *** ok 14 - mailinfo 0013 ok 15 - mailinfo 0014 ok 36 - am -q is quiet ok 16 - mailinfo 0015 ok 17 - mailinfo 0016 ok 18 - mailinfo 0017 ok 37 - am empty-file does not infloop ok 19 - split box with rfc2047 samples # passed all 37 test(s) 1..37 ok 20 - mailinfo rfc2047/0001 ok 21 - mailinfo rfc2047/0002 *** t5301-sliding-window.sh *** ok 22 - mailinfo rfc2047/0003 ok 23 - mailinfo rfc2047/0004 ok 24 - mailinfo rfc2047/0005 ok 25 - mailinfo rfc2047/0006 ok 26 - mailinfo rfc2047/0007 ok 27 - mailinfo rfc2047/0008 ok 28 - mailinfo rfc2047/0009 ok 29 - mailinfo rfc2047/0010 ok 30 - mailinfo rfc2047/0011 ok 31 - respect NULs ok 32 - Preserve NULs out of MIME encoded message ok 33 - mailinfo on from header without name works ok 1 - setup # passed all 33 test(s) 1..33 ok 1 - setup ok 2 - verify-pack -v, defaults ok 2 - setup: two scripts for reading pull requests *** t5302-pack-index.sh *** ok 3 - verify-pack -v, packedGitWindowSize == 1 page ok 4 - verify-pack -v, packedGit{WindowSize,Limit} == 1 page ok 5 - repack -a -d, packedGit{WindowSize,Limit} == 1 page ok 6 - verify-pack -v, defaults # passed all 6 test(s) 1..6 *** t5303-pack-corruption-resilience.sh *** ok 3 - pull request when forgot to push ok 1 - setup ok 2 - pack without delta ok 3 - pack-objects with bogus arguments ok 1 - initial setup validation ok 2 - create corruption in header of first object ok 3 - ... but having a loose copy allows for full recovery ok 4 - ... and loose copy of first delta allows for partial recovery ok 4 - pull request after push ok 4 - unpack without delta ok 5 - create corruption in data of first object ok 5 - check unpack without delta ok 6 - ... but having a loose copy allows for full recovery ok 7 - ... and loose copy of second object allows for partial recovery ok 5 - request names an appropriate branch ok 8 - create corruption in header of first delta ok 9 - ... but having a loose copy allows for full recovery ok 10 - ... and then a repack "clears" the corruption ok 6 - pack with REF_DELTA ok 11 - create corruption in data of first delta ok 6 - pull request format ok 12 - ... but having a loose copy allows for full recovery ok 13 - ... and then a repack "clears" the corruption ok 7 - unpack with REF_DELTA ok 7 - request-pull ignores OPTIONS_KEEPDASHDASH poison # passed all 7 test(s) 1..7 ok 8 - check unpack with REF_DELTA ok 14 - corruption in delta base reference of first delta (OBJ_REF_DELTA) *** t5304-prune.sh *** ok 15 - ... but having a loose copy allows for full recovery ok 16 - ... and then a repack "clears" the corruption ok 1 - setup ok 2 - prune stale packs ok 9 - pack with OFS_DELTA ok 17 - corruption #0 in delta base reference of first delta (OBJ_OFS_DELTA) ok 3 - prune --expire ok 18 - ... but having a loose copy allows for full recovery ok 19 - ... and then a repack "clears" the corruption ok 4 - gc: implicit prune --expire ok 5 - gc: refuse to start with invalid gc.pruneExpire ok 20 - corruption #1 in delta base reference of first delta (OBJ_OFS_DELTA) ok 6 - gc: start with ok gc.pruneExpire ok 21 - ... but having a loose copy allows for full recovery ok 10 - unpack with OFS_DELTA ok 7 - prune: prune nonsense parameters ok 22 - ... and then a repack "clears" the corruption ok 11 - check unpack with OFS_DELTA ok 12 - compare delta flavors ok 8 - prune: prune unreachable heads ok 9 - prune: do not prune heads listed as an argument ok 23 - ... and a redundant pack allows for full recovery too ok 13 - use packed objects ok 10 - gc --no-prune ok 24 - corruption of delta base reference pointing to wrong object ok 25 - ... but having a loose copy allows for full recovery ok 26 - ... and then a repack "clears" the corruption ok 14 - use packed deltified (REF_DELTA) objects ok 11 - gc respects gc.pruneExpire ok 27 - corrupting header to have too small output buffer fails unpack # passed all 27 test(s) 1..27 *** t5305-include-tag.sh *** ok 15 - use packed deltified (OFS_DELTA) objects ok 1 - setup ok 12 - gc --prune= ok 2 - pack without --include-tag ok 3 - unpack objects ok 4 - check unpacked result (have commit, no tag) ok 5 - pack with --include-tag ok 16 - survive missing objects/pack directory ok 6 - unpack objects ok 7 - check unpacked result (have commit, have tag) # passed all 7 test(s) 1..7 *** t5306-pack-nobase.sh *** ok 13 - gc --prune=never ok 17 - verify pack ok 1 - setup base ok 2 - setup patch_clone ok 14 - gc respects gc.pruneExpire=never ok 15 - prune --expire=never ok 18 - verify pack -v ok 19 - verify-pack catches mismatched .idx and .pack files ok 20 - verify-pack catches a corrupted pack signature ok 21 - verify-pack catches a corrupted pack version ok 22 - verify-pack catches a corrupted type/size of the 1st packed object data ok 16 - gc: prune old objects after local clone ok 23 - verify-pack catches a corrupted sum of the index file itself ok 17 - garbage report in count-objects -v ok 18 - prune .git/shallow ok 3 - indirectly clone patch_clone # passed all 18 test(s) 1..18 *** t5307-pack-missing-commit.sh *** ok 4 - clone of patch_clone is incomplete # passed all 4 test(s) 1..4 *** t5308-pack-detect-duplicates.sh *** ok 1 - pack with no duplicates ok 1 - setup ok 2 - index-pack will allow duplicate objects by default ok 2 - check corruption ok 3 - create batch-check test vectors ok 3 - rev-list notices corruption (1) ok 4 - lookup in duplicated pack (binary search) ok 4 - rev-list notices corruption (2) ok 5 - pack-objects notices corruption ok 5 - lookup in duplicated pack (GIT_USE_LOOKUP) # passed all 5 test(s) 1..5 *** t5309-pack-delta-cycles.sh *** ok 6 - index-pack can reject packs with duplicates # passed all 6 test(s) 1..6 *** t5400-send-pack.sh *** ok 1 - index-pack works with a single delta (A->B) ok 2 - index-pack works with a single delta (B->A) ok 3 - index-pack detects missing base objects ok 4 - index-pack detects REF_DELTA cycles ok 24 - build pack index for an existing pack not ok 5 - failover to an object in another pack # TODO known breakage 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 *** t5401-update-hooks.sh *** ok 1 - setup ok 25 - unpacking with --strict ok 1 - setup ok 2 - push ok 3 - updated as expected ok 4 - hooks ran ok 5 - pre-receive hook input ok 6 - update hook arguments ok 7 - post-receive hook input ok 8 - post-update hook arguments ok 9 - all hook stdin is /dev/null ok 10 - all *-receive hook args are empty ok 11 - send-pack produced no output ok 12 - send-pack stderr contains hook messages # passed all 12 test(s) 1..12 *** t5402-post-merge-hook.sh *** ok 2 - pack-objects with index version 1 ok 1 - setup ok 2 - post-merge does not run for up-to-date ok 3 - post-merge runs as expected ok 3 - pack-objects with index version 2 ok 4 - post-merge from normal merge receives the right argument ok 4 - both packs should be identical ok 5 - index v1 and index v2 should be different ok 5 - post-merge from squash merge runs as expected ok 6 - post-merge from squash merge receives the right argument # passed all 6 test(s) 1..6 *** t5403-post-checkout-hook.sh *** ok 6 - index-pack with index version 1 ok 7 - index-pack with index version 2 ok 8 - index-pack results should match pack-objects ones ok 9 - index-pack --verify on index version 1 ok 10 - index-pack --verify on index version 2 ok 11 - pack-objects --index-version=2, is not accepted ok 1 - setup ok 12 - index v2: force some 64-bit offsets with pack-objects ok 2 - post-checkout runs as expected ok 3 - post-checkout receives the right arguments with HEAD unchanged ok 4 - post-checkout runs as expected ok 5 - post-checkout args are correct with git checkout -b ok 6 - post-checkout receives the right args with HEAD changed ok 13 - index v2: verify a pack with some 64-bit offsets ok 14 - 64-bit offsets: should be different from previous index v2 results ok 7 - post-checkout receives the right args when not switching branches ok 15 - index v2: force some 64-bit offsets with index-pack ok 16 - 64-bit offsets: index-pack result should match pack-objects one ok 26 - index-pack with --strict ok 8 - post-checkout hook is triggered by clone # passed all 8 test(s) 1..8 ok 17 - index-pack --verify on 64-bit offset v2 (cheat) *** t5404-tracking-branches.sh *** ok 18 - index-pack --verify on 64-bit offset v2 ok 19 - [index v1] 1) stream pack to repository ok 1 - setup ok 20 - [index v1] 2) create a stealth corruption in a delta base reference ok 21 - [index v1] 3) corrupted delta happily returned wrong data ok 2 - prepare pushable branches ok 22 - [index v1] 4) confirm that the pack is actually corrupted ok 23 - [index v1] 5) pack-objects happily reuses corrupted data ok 3 - mixed-success push returns error ok 4 - check tracking branches updated correctly after push ok 5 - check tracking branches not updated for failed refs ok 6 - deleted branches have their tracking branches removed ok 7 - already deleted tracking branches ignored ok 24 - [index v1] 6) newly created pack is BAD ! # passed all 7 test(s) 1..7 ok 27 - honor pack.packSizeLimit *** t5405-send-pack-rewind.sh *** ok 28 - verify resulting packs ok 25 - [index v2] 1) stream pack to repository ok 26 - [index v2] 2) create a stealth corruption in a delta base reference ok 27 - [index v2] 3) corrupted delta happily returned wrong data ok 28 - [index v2] 4) confirm that the pack is actually corrupted ok 1 - setup ok 2 - non forced push should die not segfault ok 3 - forced push should succeed # passed all 3 test(s) 1..3 ok 29 - [index v2] 5) pack-objects refuses to reuse corrupted data *** t5406-remote-rejects.sh *** ok 1 - setup ok 2 - push reports error ok 3 - individual ref reports error # passed all 3 test(s) 1..3 *** t5407-post-rewrite-hook.sh *** ok 1 - setup ok 29 - tolerate packsizelimit smaller than biggest object ok 2 - git commit --amend ok 3 - git commit --amend --no-post-rewrite ok 30 - verify resulting packs ok 31 - fake a SHA1 hash collision ok 32 - make sure index-pack detects the SHA1 collision ok 33 - make sure index-pack detects the SHA1 collision (large blobs) # passed all 33 test(s) 1..33 *** t5500-fetch-pack.sh *** ok 1 - setup ok 4 - git rebase ok 2 - 1st pull ok 30 - [index v2] 6) verify-pack detects CRC mismatch ok 31 - running index-pack in the object store # passed all 31 test(s) 1..31 ok 1 - setup *** t5501-fetch-push-alternates.sh *** ok 5 - git rebase --skip ok 2 - pack the source repository ok 3 - pack the destination repository ok 4 - refuse pushing rewound head without --force ok 5 - push can be used to delete a ref ok 6 - refuse deleting push with denyDeletes ok 7 - cannot override denyDeletes with git -c send-pack ok 8 - override denyDeletes with git -c receive-pack ok 9 - denyNonFastforwards trumps --force ok 10 - push --all excludes remote-tracking hierarchy ok 6 - git rebase --skip the last one ok 11 - receive-pack runs auto-gc in remote repo ok 12 - pushing explicit refspecs respects forcing ok 3 - post 1st pull setup ok 7 - git rebase -m ok 13 - pushing wildcard refspecs respects forcing ok 4 - 2nd pull ok 14 - deny pushing to delete current branch # passed all 14 test(s) 1..14 *** t5502-quickfetch.sh *** ok 5 - 3rd pull ok 1 - setup ok 2 - clone without alternate ok 6 - single branch clone ok 3 - further commits in the original ok 7 - single branch object count ok 4 - copy commit and tree but not blob by hand ok 5 - quickfetch should not leave a corrupted repository ok 8 - single given branch clone ok 6 - quickfetch should not copy from alternate ok 9 - clone shallow depth 1 ok 10 - clone shallow depth 1 with fsck ok 11 - clone shallow ok 12 - clone shallow depth count ok 13 - clone shallow object count ok 14 - clone shallow object count (part 2) ok 15 - fsck in shallow repo ok 16 - simple fetch in shallow repo ok 17 - no changes expected ok 18 - fetch same depth in shallow repo ok 19 - no changes expected ok 20 - add two more ok 8 - git rebase -m --skip ok 1 - setup ok 2 - pushing into a repository with the same alternate ok 21 - pull in shallow repo ok 22 - clone shallow object count ok 7 - quickfetch should handle ~1000 refs (on Windows) # passed all 7 test(s) 1..7 ok 3 - fetching from a repository with the same alternate # passed all 3 test(s) 1..3 ok 23 - add two more (part 2) *** t5503-tagfollow.sh *** *** t5504-fetch-receive-strict.sh *** ok 24 - deepening pull in shallow repo ok 25 - clone shallow object count ok 1 - setup ok 26 - deepening fetch in shallow repo ok 27 - clone shallow object count ok 1 - setup ok 2 - setup expect ok 2 - fetch without strict ok 3 - fetch A (new commit : 1 connection) ok 3 - fetch with !fetch.fsckobjects ok 28 - pull in shallow repo with missing merge base ok 4 - create tag T on A, create C on branch cat ok 5 - setup expect ok 4 - fetch with fetch.fsckobjects ok 6 - fetch C, T (new branch, tag : 1 connection) ok 5 - fetch with transfer.fsckobjects ok 29 - additional simple shallow deepenings ok 9 - git rebase -i (unchanged) ok 30 - clone shallow depth count ok 7 - create commits O, B, tag S on B ok 6 - push without strict ok 8 - setup expect ok 31 - clone shallow object count ok 32 - fetch --no-shallow on full repo ok 33 - fetch --depth --no-shallow ok 7 - push with !receive.fsckobjects ok 9 - fetch B, S (commit and tag : 1 connection) ok 10 - setup expect ok 8 - push with receive.fsckobjects ok 34 - turn shallow to complete repository ok 9 - push with transfer.fsckobjects # passed all 9 test(s) 1..9 ok 11 - new clone fetch master and tags # passed all 11 test(s) 1..11 *** t5505-remote.sh *** ok 35 - clone shallow without --no-single-branch ok 36 - clone shallow object count *** t5506-remote-groups.sh *** ok 37 - clone shallow with --branch ok 38 - clone shallow object count ok 1 - setup ok 39 - clone shallow with detached HEAD ok 1 - setup ok 40 - shallow clone pulling tags ok 2 - no group updates all ok 2 - remote information for the origin ok 10 - git rebase -i (skip) ok 41 - shallow cloning single tag ok 3 - nonexistent group produces error ok 42 - clone shallow with packed refs ok 3 - add another remote ok 4 - check remote-tracking ok 5 - remote forces tracking branches ok 4 - updating group updates all members (remote update) ok 6 - remove remote ok 7 - remove remote ok 43 - fetch in shallow repo unreachable shallow objects ok 5 - updating group updates all members (fetch) ok 8 - remove remote protects local branches ok 6 - updating group does not update non-members (remote update) ok 44 - fetch creating new shallow root ok 9 - show ok 10 - show -n ok 7 - updating group does not update non-members (fetch) ok 45 - setup tests for the --stdin parameter ok 11 - prune ok 12 - set-head --delete ok 46 - fetch refs from cmdline ok 8 - updating remote name updates that remote # passed all 8 test(s) 1..8 ok 13 - set-head --auto *** t5509-fetch-push-namespaces.sh *** ok 47 - fetch refs from stdin ok 11 - git rebase -i (squash) ok 14 - set-head --auto has no problem w/multiple HEADs ok 15 - set-head explicit ok 48 - fetch mixed refs from cmdline and stdin ok 49 - test duplicate refs from stdin ok 50 - set up tests of missing reference ok 51 - test lonely missing ref ok 16 - prune --dry-run ok 52 - test missing ref after existing ok 53 - test missing ref before existing ok 1 - setup ok 54 - test --all, --depth, and explicit head ok 17 - add --mirror && prune ok 55 - test --all, --depth, and explicit tag ok 18 - add --mirror=fetch ok 19 - fetch mirrors act as mirrors during fetch ok 20 - fetch mirrors can prune ok 2 - pushing into a repository using a ref namespace ok 21 - fetch mirrors do not act as mirrors during push ok 56 - shallow fetch with tags does not break the repository ok 12 - git rebase -i (fixup without conflict) ok 57 - fetch-pack --diag-url ssh+git://host/repo ok 22 - add fetch mirror with specific branches ok 58 - fetch-pack --diag-url ssh+git://host/~repo ok 59 - fetch-pack --diag-url ssh+git://host:12/repo ok 60 - fetch-pack --diag-url ssh+git://host:12/~repo ok 3 - pulling from a repository using a ref namespace ok 23 - fetch mirror respects specific branches ok 61 - fetch-pack --diag-url ssh+git://[::1]/repo ok 62 - fetch-pack --diag-url ssh+git://[::1]/~repo ok 4 - mirroring a repository using a ref namespace # passed all 4 test(s) 1..4 ok 63 - fetch-pack --diag-url ssh+git://[::1]:23/repo ok 64 - fetch-pack --diag-url ssh+git://[::1]:23/~repo ok 24 - add --mirror=push *** t5510-fetch.sh *** ok 65 - fetch-pack --diag-url git+ssh://host/repo ok 66 - fetch-pack --diag-url git+ssh://host/~repo ok 67 - fetch-pack --diag-url git+ssh://host:12/repo ok 68 - fetch-pack --diag-url git+ssh://host:12/~repo ok 69 - fetch-pack --diag-url git+ssh://[::1]/repo ok 1 - setup ok 25 - push mirrors act as mirrors during push ok 70 - fetch-pack --diag-url git+ssh://[::1]/~repo ok 71 - fetch-pack --diag-url git+ssh://[::1]:23/repo ok 72 - fetch-pack --diag-url git+ssh://[::1]:23/~repo ok 73 - fetch-pack --diag-url git://host/repo ok 74 - fetch-pack --diag-url git://host/~repo ok 26 - push mirrors do not act as mirrors during fetch ok 75 - fetch-pack --diag-url git://host:12/repo ok 76 - fetch-pack --diag-url git://host:12/~repo ok 27 - push mirrors do not allow you to specify refs ok 77 - fetch-pack --diag-url git://[::1]/repo ok 78 - fetch-pack --diag-url git://[::1]/~repo ok 79 - fetch-pack --diag-url git://[::1]:23/repo ok 80 - fetch-pack --diag-url git://[::1]:23/~repo ok 81 - fetch-pack --diag-url ssh://host/repo ok 2 - clone and setup child repos ok 82 - fetch-pack --diag-url ssh://host/~repo ok 83 - fetch-pack --diag-url ssh://host:12/repo ok 84 - fetch-pack --diag-url ssh://host:12/~repo ok 85 - fetch-pack --diag-url ssh://[::1]/repo ok 86 - fetch-pack --diag-url ssh://[::1]/~repo ok 87 - fetch-pack --diag-url ssh://[::1]:23/repo ok 88 - fetch-pack --diag-url ssh://[::1]:23/~repo ok 3 - fetch test ok 89 - fetch-pack --diag-url file://[::1]:23/repo ok 90 - fetch-pack --diag-url file://[::1]:23/~repo ok 91 - fetch-pack --diag-url ./nohost:repo ok 28 - add alt && prune ok 92 - fetch-pack --diag-url ./file:nohost/~repo ok 93 - fetch-pack --diag-url ./nohost:12:repo ok 4 - fetch test for-merge ok 94 - fetch-pack --diag-url ./file:nohost:12/~repo ok 95 - fetch-pack --diag-url ./[::1]:repo ok 96 - fetch-pack --diag-url ./file:[::1]/~repo ok 97 - fetch-pack --diag-url ./[::1]:23:repo ok 98 - fetch-pack --diag-url ./file:[::1]:23/~repo ok 5 - fetch --prune on its own works as expected ok 99 - fetch-pack --diag-url ./[:repo ok 100 - fetch-pack --diag-url ./file:[/~repo ok 101 - fetch-pack --diag-url ./[:aa:repo ok 102 - fetch-pack --diag-url ./file:[:aa/~repo ok 29 - add with reachable tags (default) ok 6 - fetch --prune with a branch name keeps branches ok 103 - fetch-pack --diag-url host:repo ok 104 - fetch-pack --diag-url host:/~repo ok 105 - fetch-pack --diag-url [::1]:repo ok 106 - fetch-pack --diag-url [::1]:/~repo ok 7 - fetch --prune with a namespace keeps other namespaces ok 107 - fetch-pack --diag-url ssh+git://host/re:po ok 108 - fetch-pack --diag-url ssh+git://host/~re:po ok 109 - fetch-pack --diag-url ssh+git://host:12/re:po ok 30 - add --tags ok 110 - fetch-pack --diag-url ssh+git://host:12/~re:po ok 111 - fetch-pack --diag-url ssh+git://[::1]/re:po ok 112 - fetch-pack --diag-url ssh+git://[::1]/~re:po ok 8 - fetch --prune --tags prunes branches but not tags ok 113 - fetch-pack --diag-url ssh+git://[::1]:23/re:po ok 114 - fetch-pack --diag-url ssh+git://[::1]:23/~re:po ok 115 - fetch-pack --diag-url git+ssh://host/re:po ok 116 - fetch-pack --diag-url git+ssh://host/~re:po ok 117 - fetch-pack --diag-url git+ssh://host:12/re:po ok 118 - fetch-pack --diag-url git+ssh://host:12/~re:po ok 31 - add --no-tags ok 119 - fetch-pack --diag-url git+ssh://[::1]/re:po ok 120 - fetch-pack --diag-url git+ssh://[::1]/~re:po ok 32 - reject --no-no-tags ok 9 - fetch --prune --tags with branch does not prune other things ok 121 - fetch-pack --diag-url git+ssh://[::1]:23/re:po ok 122 - fetch-pack --diag-url git+ssh://[::1]:23/~re:po ok 123 - fetch-pack --diag-url git://host/re:po ok 124 - fetch-pack --diag-url git://host/~re:po ok 125 - fetch-pack --diag-url git://host:12/re:po ok 13 - git rebase -i (double edit) ok 126 - fetch-pack --diag-url git://host:12/~re:po # passed all 13 test(s) 1..13 ok 127 - fetch-pack --diag-url git://[::1]/re:po *** t5511-refspec.sh *** ok 128 - fetch-pack --diag-url git://[::1]/~re:po ok 129 - fetch-pack --diag-url git://[::1]:23/re:po ok 10 - fetch --prune --tags with refspec prunes based on refspec ok 33 - update ok 130 - fetch-pack --diag-url git://[::1]:23/~re:po ok 131 - fetch-pack --diag-url ssh://host/re:po ok 132 - fetch-pack --diag-url ssh://host/~re:po ok 133 - fetch-pack --diag-url ssh://host:12/re:po ok 11 - fetch tags when there is no tags ok 1 - push (invalid) ok 134 - fetch-pack --diag-url ssh://host:12/~re:po ok 135 - fetch-pack --diag-url ssh://[::1]/re:po ok 136 - fetch-pack --diag-url ssh://[::1]/~re:po ok 137 - fetch-pack --diag-url ssh://[::1]:23/re:po ok 138 - fetch-pack --diag-url ssh://[::1]:23/~re:po ok 2 - push : ok 3 - push :: (invalid) ok 139 - fetch-pack --diag-url file://[::1]:23/re:po ok 140 - fetch-pack --diag-url file://[::1]:23/~re:po ok 4 - push +: ok 141 - fetch-pack --diag-url ./nohost:re:po ok 12 - fetch following tags ok 142 - fetch-pack --diag-url ./file:nohost/~re:po ok 143 - fetch-pack --diag-url ./nohost:12:re:po ok 5 - fetch ok 144 - fetch-pack --diag-url ./file:nohost:12/~re:po ok 145 - fetch-pack --diag-url ./[::1]:re:po ok 146 - fetch-pack --diag-url ./file:[::1]/~re:po ok 34 - update with arguments ok 6 - fetch : ok 147 - fetch-pack --diag-url ./[::1]:23:re:po ok 148 - fetch-pack --diag-url ./file:[::1]:23/~re:po ok 7 - fetch :: (invalid) ok 149 - fetch-pack --diag-url ./[:re:po ok 150 - fetch-pack --diag-url ./file:[/~re:po ok 151 - fetch-pack --diag-url ./[:aa:re:po ok 8 - push refs/heads/*:refs/remotes/frotz/* ok 152 - fetch-pack --diag-url ./file:[:aa/~re:po ok 153 - fetch-pack --diag-url host:re:po ok 154 - fetch-pack --diag-url host:/~re:po ok 155 - fetch-pack --diag-url [::1]:re:po ok 9 - push refs/heads/*:refs/remotes/frotz (invalid) ok 35 - update --prune ok 156 - fetch-pack --diag-url [::1]:/~re:po ok 157 - fetch-pack --diag-url ssh+git://host/re/po ok 10 - push refs/heads:refs/remotes/frotz/* (invalid) ok 158 - fetch-pack --diag-url ssh+git://host/~re/po ok 13 - fetch uses remote ref names to describe new refs ok 159 - fetch-pack --diag-url ssh+git://host:12/re/po ok 11 - push refs/heads/master:refs/remotes/frotz/xyzzy ok 160 - fetch-pack --diag-url ssh+git://host:12/~re/po ok 161 - fetch-pack --diag-url ssh+git://[::1]/re/po ok 12 - fetch refs/heads/*:refs/remotes/frotz/* ok 14 - fetch must not resolve short tag name ok 162 - fetch-pack --diag-url ssh+git://[::1]/~re/po ok 163 - fetch-pack --diag-url ssh+git://[::1]:23/re/po ok 164 - fetch-pack --diag-url ssh+git://[::1]:23/~re/po ok 13 - fetch refs/heads/*:refs/remotes/frotz (invalid) ok 165 - fetch-pack --diag-url git+ssh://host/re/po ok 14 - fetch refs/heads:refs/remotes/frotz/* (invalid) ok 166 - fetch-pack --diag-url git+ssh://host/~re/po ok 36 - update default ok 15 - fetch refs/heads/master:refs/remotes/frotz/xyzzy ok 167 - fetch-pack --diag-url git+ssh://host:12/re/po ok 15 - fetch can now resolve short remote name ok 168 - fetch-pack --diag-url git+ssh://host:12/~re/po ok 169 - fetch-pack --diag-url git+ssh://[::1]/re/po ok 170 - fetch-pack --diag-url git+ssh://[::1]/~re/po ok 16 - create bundle 1 ok 16 - fetch refs/heads/master::refs/remotes/frotz/xyzzy (invalid) ok 171 - fetch-pack --diag-url git+ssh://[::1]:23/re/po ok 17 - header of bundle looks right ok 172 - fetch-pack --diag-url git+ssh://[::1]:23/~re/po ok 173 - fetch-pack --diag-url git://host/re/po ok 18 - create bundle 2 ok 17 - fetch refs/heads/maste :refs/remotes/frotz/xyzzy (invalid) ok 174 - fetch-pack --diag-url git://host/~re/po ok 175 - fetch-pack --diag-url git://host:12/re/po ok 19 - unbundle 1 ok 176 - fetch-pack --diag-url git://host:12/~re/po ok 177 - fetch-pack --diag-url git://[::1]/re/po ok 37 - update default (overridden, with funny whitespace) ok 178 - fetch-pack --diag-url git://[::1]/~re/po ok 179 - fetch-pack --diag-url git://[::1]:23/re/po ok 18 - push master~1:refs/remotes/frotz/backup ok 20 - bundle 1 has only 3 files ok 180 - fetch-pack --diag-url git://[::1]:23/~re/po ok 181 - fetch-pack --diag-url ssh://host/re/po ok 19 - fetch master~1:refs/remotes/frotz/backup (invalid) ok 182 - fetch-pack --diag-url ssh://host/~re/po ok 21 - unbundle 2 ok 183 - fetch-pack --diag-url ssh://host:12/re/po ok 184 - fetch-pack --diag-url ssh://host:12/~re/po ok 20 - push HEAD~4:refs/remotes/frotz/new ok 185 - fetch-pack --diag-url ssh://[::1]/re/po ok 186 - fetch-pack --diag-url ssh://[::1]/~re/po ok 38 - update (with remotes.default defined) ok 187 - fetch-pack --diag-url ssh://[::1]:23/re/po ok 21 - fetch HEAD~4:refs/remotes/frotz/new (invalid) ok 188 - fetch-pack --diag-url ssh://[::1]:23/~re/po ok 22 - bundle does not prerequisite objects ok 189 - fetch-pack --diag-url file://[::1]:23/re/po ok 23 - bundle should be able to create a full history Skipping rsync tests because rsync was not found ok 190 - fetch-pack --diag-url file://[::1]:23/~re/po ok 22 - push HEAD ok 39 - "remote show" does not show symbolic refs ok 40 - reject adding remote with an invalid name ok 191 - fetch-pack --diag-url ./nohost:re/po ok 192 - fetch-pack --diag-url ./file:nohost/~re/po ok 23 - fetch HEAD ok 193 - fetch-pack --diag-url ./nohost:12:re/po ok 194 - fetch-pack --diag-url ./file:nohost:12/~re/po ok 195 - fetch-pack --diag-url ./[::1]:re/po ok 24 - fetch with a non-applying branch..merge ok 24 - push refs/heads/ nitfol (invalid) ok 41 - rename a remote ok 196 - fetch-pack --diag-url ./file:[::1]/~re/po ok 197 - fetch-pack --diag-url ./[::1]:23:re/po ok 25 - fetch from GIT URL with a non-applying branch..merge [1] ok 25 - fetch refs/heads/ nitfol (invalid) ok 198 - fetch-pack --diag-url ./file:[::1]:23/~re/po ok 42 - rename does not update a non-default fetch refspec ok 26 - push HEAD: (invalid) ok 199 - fetch-pack --diag-url ./[:re/po ok 200 - fetch-pack --diag-url ./file:[/~re/po ok 201 - fetch-pack --diag-url ./[:aa:re/po ok 26 - fetch from GIT URL with a non-applying branch..merge [2] ok 202 - fetch-pack --diag-url ./file:[:aa/~re/po ok 27 - fetch HEAD: ok 203 - fetch-pack --diag-url host:re/po ok 204 - fetch-pack --diag-url host:/~re/po ok 43 - rename a remote with name part of fetch spec ok 27 - fetch from GIT URL with a non-applying branch..merge [3] ok 205 - fetch-pack --diag-url [::1]:re/po ok 28 - push refs/heads/ nitfol: (invalid) ok 206 - fetch-pack --diag-url [::1]:/~re/po ok 207 # skip fetch-pack --diag-url file://c:/repo (missing MINGW) ok 208 # skip fetch-pack --diag-url c:repo (missing MINGW) ok 28 - quoting of a strangely named repo # passed all 208 test(s) 1..208 ok 29 - fetch refs/heads/ nitfol: (invalid) ok 44 - rename a remote with name prefix of other remote ok 29 - bundle should record HEAD correctly ok 30 - mark initial state of origin/master ok 30 - push :refs/remotes/frotz/deleteme *** t5512-ls-remote.sh *** ok 31 - fetch :refs/remotes/frotz/HEAD-to-me ok 32 - push :refs/remotes/frotz/delete me (invalid) ok 45 - migrate a remote from named file in $GIT_DIR/remotes ok 31 - explicit fetch should update tracking ok 33 - fetch :refs/remotes/frotz/HEAD to me (invalid) ok 1 - setup ok 2 - ls-remote --tags .git ok 3 - ls-remote .git ok 34 - fetch refs/heads/*/for-linus:refs/remotes/mine/*-blah (invalid) ok 4 - ls-remote --tags self ok 46 - migrate a remote from named file in $GIT_DIR/branches ok 5 - ls-remote self ok 35 - push refs/heads/*/for-linus:refs/remotes/mine/*-blah (invalid) ok 6 - dies when no remote specified and no default remotes found ok 36 - fetch refs/heads*/for-linus:refs/remotes/mine/* (invalid) ok 7 - use "origin" when no remote specified ok 8 - suppress "From " with -q ok 37 - push refs/heads*/for-linus:refs/remotes/mine/* (invalid) ok 47 - migrate a remote from named file in $GIT_DIR/branches (2) ok 32 - explicit pull should update tracking ok 38 - fetch refs/heads/*/*/for-linus:refs/remotes/mine/* (invalid) ok 9 - use branch..remote if possible ok 39 - push refs/heads/*/*/for-linus:refs/remotes/mine/* (invalid) ok 10 - confuses pattern as remote when no remote specified ok 48 - remote prune to cause a dangling symref ok 11 - die with non-2 for wrong repository even with --exit-code ok 33 - configured fetch updates tracking ok 40 - fetch refs/heads/*/for-linus:refs/remotes/mine/* ok 12 - Report success even when nothing matches ok 13 - Report no-match with --exit-code ok 49 - show empty remote ok 50 - remote set-branches requires a remote ok 14 - Report match with --exit-code ok 41 - push refs/heads/*/for-linus:refs/remotes/mine/* ok 34 - non-matching refspecs do not confuse tracking update # passed all 41 test(s) 1..41 *** t5513-fetch-track.sh *** ok 35 - pushing nonexistent branch by mistake should not segv ok 15 - Hide some refs with transfer.hiderefs ok 16 - Hide some refs with uploadpack.hiderefs # passed all 16 test(s) 1..16 ok 1 - setup *** t5514-fetch-multiple.sh *** ok 51 - remote set-branches ok 2 - fetch # passed all 2 test(s) 1..2 *** t5515-fetch-merge-logic.sh *** ok 52 - remote set-branches with --mirror ok 53 - new remote ok 54 - remote set-url bar ok 55 - remote set-url baz bar ok 36 - auto tag following fetches minimum ok 37 - refuse to fetch into the current branch ok 56 - remote set-url zot bar ok 57 - remote set-url --push zot baz ok 38 - fetch into the current branch with --update-head-ok ok 58 - remote set-url --push zot ok 59 - remote set-url --push qux zot ok 1 - setup ok 60 - remote set-url --push foo qu+x ok 39 - fetch --dry-run ok 61 - remote set-url --push --add aaa ok 62 - remote set-url --push bar aaa ok 63 - remote set-url --push --delete bar ok 64 - remote set-url --push --delete foo ok 40 - should be able to fetch with duplicate refspecs ok 65 - remote set-url --add bbb ok 66 - remote set-url --delete .* ok 2 - git fetch --all ok 67 - remote set-url --delete bbb ok 68 - remote set-url --delete baz ok 69 - remote set-url --add ccc ok 70 - remote set-url --delete baz ok 71 - extra args: setup ok 72 - extra args: add nick url ok 73 - extra args: rename origin newname ok 41 - prune fetch.prune=unset remote.origin.prune=unset; kept ok 74 - extra args: remove origin ok 75 - extra args: set-head origin master ok 76 - extra args: set-url origin newurl oldurl # passed all 76 test(s) 1..76 ok 1 - setup ok 42 - prune fetch.prune=unset remote.origin.prune=unset --no-prune; kept *** t5516-fetch-push.sh *** ok 3 - git fetch --all should continue if a remote has errors ok 43 - prune fetch.prune=unset remote.origin.prune=unset --prune; pruned ok 1 - setup ok 4 - git fetch --all does not allow non-option arguments ok 2 - br-config-explicit ok 2 - fetch without wildcard ok 5 - git fetch --multiple (but only one remote) ok 44 - prune fetch.prune=false remote.origin.prune=unset; kept ok 3 - fetch with wildcard ok 3 - br-config-explicit config-explicit ok 45 - prune fetch.prune=false remote.origin.prune=unset --no-prune; kept ok 6 - git fetch --multiple (two remotes) ok 7 - git fetch --multiple (bad remote names) ok 4 - fetch with insteadOf ok 46 - prune fetch.prune=false remote.origin.prune=unset --prune; pruned ok 4 - br-config-explicit-merge ok 8 - git fetch --all (skipFetchAll) ok 5 - fetch with pushInsteadOf (should not rewrite) ok 47 - prune fetch.prune=true remote.origin.prune=unset; pruned ok 6 - push without wildcard ok 5 - br-config-explicit-merge config-explicit ok 48 - prune fetch.prune=true remote.origin.prune=unset --prune; pruned ok 7 - push with wildcard ok 9 - git fetch --multiple (ignoring skipFetchAll) ok 49 - prune fetch.prune=true remote.origin.prune=unset --no-prune; kept ok 6 - br-config-explicit-octopus ok 10 - git fetch --all --no-tags ok 8 - push with insteadOf ok 50 - prune fetch.prune=unset remote.origin.prune=false; kept ok 9 - push with pushInsteadOf ok 11 - git fetch --all --tags # passed all 11 test(s) 1..11 *** t5517-push-mirror.sh *** ok 7 - br-config-explicit-octopus config-explicit ok 51 - prune fetch.prune=unset remote.origin.prune=false --no-prune; kept ok 10 - push with pushInsteadOf and explicit pushurl (pushInsteadOf should not rewrite) ok 52 - prune fetch.prune=unset remote.origin.prune=false --prune; pruned ok 1 - push mirror creates new branches ok 8 - br-config-glob ok 11 - push with matching heads ok 53 - prune fetch.prune=false remote.origin.prune=false; kept ok 9 - br-config-glob config-glob ok 12 - push with matching heads on the command line ok 2 - push mirror updates existing branches ok 54 - prune fetch.prune=false remote.origin.prune=false --no-prune; kept ok 10 - br-config-glob-merge ok 55 - prune fetch.prune=false remote.origin.prune=false --prune; pruned ok 13 - failed (non-fast-forward) push with matching heads ok 3 - push mirror force updates existing branches ok 11 - br-config-glob-merge config-glob ok 56 - prune fetch.prune=true remote.origin.prune=false; kept ok 4 - push mirror removes branches ok 12 - br-config-glob-octopus ok 14 - push --force with matching heads ok 57 - prune fetch.prune=true remote.origin.prune=false --prune; pruned ok 13 - br-config-glob-octopus config-glob ok 58 - prune fetch.prune=true remote.origin.prune=false --no-prune; kept ok 14 - br-remote-explicit ok 15 - push with matching heads and forced update ok 5 - push mirror adds, updates and removes branches together ok 59 - prune fetch.prune=unset remote.origin.prune=true; pruned ok 16 - push with no ambiguity (1) ok 60 - prune fetch.prune=unset remote.origin.prune=true --no-prune; kept ok 15 - br-remote-explicit remote-explicit ok 6 - push mirror creates new tags ok 17 - push with no ambiguity (2) ok 61 - prune fetch.prune=unset remote.origin.prune=true --prune; pruned ok 16 - br-remote-explicit-merge ok 7 - push mirror updates existing tags ok 62 - prune fetch.prune=false remote.origin.prune=true; pruned ok 17 - br-remote-explicit-merge remote-explicit ok 18 - push with colon-less refspec, no ambiguity ok 63 - prune fetch.prune=false remote.origin.prune=true --no-prune; kept ok 8 - push mirror force updates existing tags ok 18 - br-remote-explicit-octopus ok 19 - push with weak ambiguity (1) ok 64 - prune fetch.prune=false remote.origin.prune=true --prune; pruned ok 19 - br-remote-explicit-octopus remote-explicit ok 9 - push mirror removes tags ok 65 - prune fetch.prune=true remote.origin.prune=true; pruned ok 20 - br-remote-glob ok 66 - prune fetch.prune=true remote.origin.prune=true --prune; pruned ok 20 - push with weak ambiguity (2) ok 10 - push mirror adds, updates and removes tags together ok 67 - prune fetch.prune=true remote.origin.prune=true --no-prune; kept ok 21 - br-remote-glob remote-glob ok 11 - remote.foo.mirror adds and removes branches ok 21 - push with ambiguity ok 22 - br-remote-glob-merge ok 68 - all boundary commits are excluded ok 12 - remote.foo.mirror=no has no effect # passed all 12 test(s) 1..12 *** t5518-fetch-exit-status.sh *** ok 69 - fetch --prune prints the remotes url ok 23 - br-remote-glob-merge remote-glob ok 22 - push with colon-less refspec (1) ok 1 - setup ok 2 - non-fast-forward fetch ok 70 - branchname D/F conflict resolved by --prune ok 3 - forced update # passed all 3 test(s) 1..3 *** t5519-push-alternates.sh *** ok 24 - br-remote-glob-octopus ok 71 - fetching a one-level ref works # passed all 71 test(s) 1..71 ok 23 - push with colon-less refspec (2) ok 25 - br-remote-glob-octopus remote-glob *** t5520-pull.sh *** ok 24 - push with colon-less refspec (3) ok 1 - setup ok 1 - setup ok 2 - alice works and pushes ok 26 - br-branches-default ok 25 - push with colon-less refspec (4) ok 2 - pulling into void ok 3 - checking the results ok 26 - push head with non-existent, incomplete dest ok 27 - br-branches-default branches-default ok 3 - bob fetches from alice, works and pushes ok 4 - clean-up in case the previous failed ok 5 - alice works and pushes again ok 4 - pulling into void using master:master ok 27 - push tag with non-existent, incomplete dest ok 6 - bob works and pushes ok 28 - push sha1 with non-existent, incomplete dest ok 28 - br-branches-default-merge ok 29 - push ref expression with non-existent, incomplete dest ok 7 - alice works and pushes yet again ok 5 - pulling into void does not overwrite untracked files ok 8 - bob works and pushes again # passed all 8 test(s) 1..8 *** t5521-pull-options.sh *** ok 29 - br-branches-default-merge branches-default ok 30 - push with HEAD ok 1 - setup ok 6 - pulling into void does not overwrite staged files ok 30 - br-branches-default-octopus ok 31 - push with HEAD nonexisting at remote ok 2 - git pull -q ok 7 - pulling into void does not remove new staged files ok 31 - br-branches-default-octopus branches-default ok 8 - test . as a remote ok 32 - br-branches-one ok 32 - push with +HEAD ok 33 - push HEAD with non-existent, incomplete dest ok 9 - the default remote . should not break explicit pull ok 33 - br-branches-one branches-one ok 3 - git pull -q --rebase ok 34 - br-branches-one-merge ok 4 - git pull ok 34 - push with config remote.*.push = HEAD ok 35 - br-branches-one-merge branches-one ok 5 - git pull --rebase ok 36 - br-branches-one-octopus ok 35 - push with remote.pushdefault ok 6 - git pull -v ok 37 - br-branches-one-octopus branches-one ok 10 - --rebase ok 7 - git pull -v --rebase ok 38 - master ok 36 - push with config remote.*.pushurl ok 8 - git pull -v -q ok 39 - master config-explicit ok 9 - git pull -q -v ok 40 - master config-glob ok 41 - master remote-explicit ok 37 - push with config branch.*.pushremote ok 11 - pull.rebase ok 42 - master remote-glob ok 10 - git pull --force ok 43 - master branches-default ok 38 - branch.*.pushremote config order is irrelevant ok 11 - git pull --all # passed all 11 test(s) 1..11 ok 44 - master branches-one *** t5522-pull-symlink.sh *** ok 39 - push with dry-run ok 45 - br-unconfig ok 1 - setup ok 12 - branch.to-rebase.rebase ok 46 - br-unconfig config-explicit ok 2 - pulling from real subdir ok 13 - branch.to-rebase.rebase should override pull.rebase ok 40 - push updates local refs ok 47 - br-unconfig config-glob ok 14 - preserve merge setup ok 3 - pulling from symlinked subdir ok 4 - pushing from symlinked subdir # passed all 4 test(s) 1..4 ok 48 - br-unconfig remote-explicit *** t5523-push-upstream.sh *** ok 15 - pull.rebase=false create a new merge commit ok 1 - set up terminal for tests ok 49 - br-unconfig remote-glob ok 2 - setup bare parent ok 3 - setup local commit ok 4 - push -u master:master ok 41 - push updates up-to-date local refs ok 5 - push -u master:other ok 50 - br-unconfig branches-default ok 6 - push -u --dry-run master:otherX ok 7 - push -u master2:master2 ok 42 - push preserves up-to-date packed refs ok 8 - push -u master2:other2 ok 51 - br-unconfig branches-one ok 9 - push -u :master2 ok 10 - push -u --all ok 52 - master ../.git ok 11 - push -u HEAD ok 53 - master ../.git one ok 43 - push does not update local refs on failure ok 54 - master ../.git one two ok 12 - progress messages go to tty ok 16 - pull.rebase=true flattens keep-merge ok 13 - progress messages do not go to non-tty ok 44 - allow deleting an invalid remote ref ok 55 - master --tags ../.git ok 14 - progress messages go to non-tty (forced) ok 56 - master ../.git tag tag-one tag tag-three ok 15 - push -q suppresses progress ok 45 - pushing valid refs triggers post-receive and post-update hooks ok 57 - master ../.git tag tag-one-tree tag tag-three-file ok 16 - push --no-progress suppresses progress ok 46 - deleting dangling ref triggers hooks with correct args ok 58 - master ../.git one tag tag-one tag tag-three-file ok 17 - quiet push # passed all 17 test(s) 1..17 *** t5524-pull-msg.sh *** ok 59 - br-unconfig ../.git ok 47 - deletion of a non-existent ref is not fed to post-receive and post-update hooks ok 17 - pull.rebase=1 is treated as true and flattens keep-merge ok 1 - setup ok 60 - br-unconfig ../.git one ok 61 - br-unconfig ../.git one two ok 48 - deletion of a non-existent ref alone does trigger post-receive and post-update hooks ok 62 - br-unconfig --tags ../.git ok 2 - pull # passed all 2 test(s) 1..2 *** t5525-fetch-tagopt.sh *** ok 63 - br-unconfig ../.git tag tag-one tag tag-three ok 1 - setup ok 64 - br-unconfig ../.git tag tag-one-tree tag tag-three-file ok 49 - mixed ref updates, deletes, invalid deletes trigger hooks with correct input ok 2 - fetch with tagopt=--no-tags does not get tag ok 3 - fetch --tags with tagopt=--no-tags gets tag ok 50 - allow deleting a ref using --delete ok 65 - br-unconfig ../.git one tag tag-one tag tag-three-file # passed all 65 test(s) 1..65 ok 4 - fetch --no-tags with tagopt=--tags does not get tag *** t5526-fetch-submodules.sh *** ok 5 - fetch with tagopt=--tags gets tag # passed all 5 test(s) 1..5 *** t5527-fetch-odd-refs.sh *** ok 51 - allow deleting a tag using --delete ok 1 - setup repo with odd suffix ref ok 52 - push --delete without args aborts ok 2 - suffix ref is ignored during fetch # passed all 2 test(s) 1..2 *** t5528-push-default.sh *** ok 53 - push --delete refuses src:dest refspecs ok 1 - setup bare remotes ok 54 - warn on push to HEAD of non-bare repository ok 2 - "upstream" pushes to configured upstream ok 55 - deny push to HEAD of non-bare repository ok 3 - "upstream" does not push on unconfigured remote ok 4 - "upstream" does not push on unconfigured branch ok 56 - allow push to HEAD of bare repository (bare) ok 5 - "upstream" does not push when remotes do not match ok 18 - pull.rebase=preserve rebases and merges keep-merge ok 6 - push from/to new branch with upstream, matching and simple ok 19 - pull.rebase=invalid fails ok 57 - allow push to HEAD of non-bare repository (config) ok 7 - push from/to new branch with current creates remote branch ok 1 - setup ok 8 - push to existing branch, with no upstream configured ok 58 - fetch with branches ok 20 - --rebase=false create a new merge commit ok 59 - fetch with branches containing # ok 60 - push with branches ok 9 - push to existing branch, upstream configured with same name ok 2 - fetch --recurse-submodules recurses into submodules ok 61 - push with branches containing # ok 3 - fetch alone only fetches superproject ok 4 - fetch --no-recurse-submodules only fetches superproject ok 5 - using fetchRecurseSubmodules=true in .gitmodules recurses into submodules ok 62 - push into aliased refs (consistent) ok 10 - push to existing branch, upstream configured with different name ok 6 - --no-recurse-submodules overrides .gitmodules config ok 7 - using fetchRecurseSubmodules=false in .git/config overrides setting in .gitmodules ok 21 - --rebase=true rebases and flattens keep-merge ok 11 - push.default = current success in central workflows ok 8 - --recurse-submodules overrides fetchRecurseSubmodules setting from .git/config ok 63 - push into aliased refs (inconsistent) ok 12 - push.default = upstream success in central workflows ok 9 - --quiet propagates to submodules ok 13 - push.default = simple failure in central workflows ok 14 - push.default = matching success in central workflows ok 10 - --dry-run propagates to submodules ok 64 - push requires --force to update lightweight tag ok 65 - push --porcelain ok 11 - Without --dry-run propagates to submodules ok 66 - push --porcelain bad url ok 15 - push.default = current success in triangular workflows ok 16 - push.default = upstream failure in triangular workflows ok 67 - push --porcelain rejected ok 12 - recurseSubmodules=true propagates into submodules ok 68 - push --porcelain --dry-run rejected ok 17 - push.default = simple success in triangular workflows ok 18 - push.default = matching success in triangular workflows # passed all 18 test(s) 1..18 ok 13 - --recurse-submodules overrides config in submodule *** t5530-upload-pack-error.sh *** ok 1 - setup and corrupt repository ok 14 - --no-recurse-submodules overrides config setting ok 2 - fsck fails ok 69 - push --prune ok 3 - upload-pack fails due to error in pack-objects packing ok 4 - corrupt repo differently ok 5 - fsck fails ok 15 - Recursion doesn't happen when no new commits are fetched in the superproject ok 6 - upload-pack fails due to error in rev-list ok 7 - upload-pack error message when bad ref requested ok 8 - upload-pack fails due to error in pack-objects enumeration ok 9 - create empty repository ok 16 - Recursion stops when no new submodule commits are fetched ok 10 - fetch fails # passed all 10 test(s) 1..10 *** t5531-deep-submodule-push.sh *** ok 22 - --rebase=preserve rebases and merges keep-merge ok 17 - Recursion doesn't happen when new superproject commits don't change any submodules ok 70 - push --prune refspec ok 23 - --rebase=invalid fails ok 1 - setup ok 2 - push ok 3 - push if submodule has no remote ok 4 - push fails if submodule commit not on remote ok 5 - push succeeds after commit was pushed to remote ok 18 - Recursion picks up config in submodule ok 71 - push to update a ref hidden by transfer.hiderefs ok 6 - push fails when commit on multiple branches if one branch has no remote ok 7 - push succeeds if submodule has no remote and is on the first superproject commit ok 24 - --rebase overrides pull.rebase=preserve and flattens keep-merge ok 8 - push unpushed submodules when not needed ok 19 - Recursion picks up all submodules when necessary ok 72 - push to update a ref hidden by receive.hiderefs ok 9 - push unpushed submodules when not needed 2 ok 20 - '--recurse-submodules=on-demand' doesn't recurse when no new commits are fetched in the superproject (and ignores config) ok 10 - push unpushed submodules recursively ok 21 - '--recurse-submodules=on-demand' recurses as deep as necessary (and ignores config) ok 73 - fetch exact SHA1 ok 11 - push unpushable submodule recursively fails # passed all 11 test(s) 1..11 *** t5532-fetch-proxy.sh *** ok 22 - '--recurse-submodules=on-demand' stops when no new submodule commits are found in the superproject (and ignores config) ok 25 - --rebase with rebased upstream ok 1 - setup remote repo ok 2 - setup local repo ok 3 - fetch through proxy works # passed all 3 test(s) 1..3 *** t5533-push-cas.sh *** ok 1 - setup ok 74 - fetch follows tags by default ok 23 - 'fetch.recurseSubmodules=on-demand' overrides global config ok 2 - push to update (protected) ok 75 - pushing a specific ref applies remote.$name.push as refmap ok 26 - --rebase with rebased default upstream ok 3 - push to update (protected, forced) ok 24 - 'submodule..fetchRecurseSubmodules=on-demand' overrides fetch.recurseSubmodules ok 25 - don't fetch submodule when newly recorded commits are already present # passed all 25 test(s) 1..25 ok 4 - push to update (protected, tracking) *** t5535-fetch-push-symref.sh *** ok 76 - with no remote.$name.push, it is not used as refmap ok 1 - setup ok 5 - push to update (protected, tracking, forced) ok 2 - push ok 77 - with no remote.$name.push, upstream mapping is used ok 3 - fetch # passed all 3 test(s) 1..3 *** t5536-fetch-conflicts.sh *** ok 27 - rebased upstream + fetch + pull --rebase ok 6 - push to update (allowed) ok 1 - setup ok 2 - fetch with no conflict ok 78 - push does not follow tags by default ok 3 - fetch conflict: config vs. config ok 7 - push to update (allowed, tracking) ok 4 - fetch duplicate: config vs. config ok 5 - fetch conflict: arg overrides config ok 6 - fetch conflict: arg vs. arg ok 7 - fetch conflict: criss-cross args # passed all 7 test(s) 1..7 ok 79 - push --follow-tag only pushes relevant tags *** t5537-fetch-shallow.sh *** ok 8 - push to update (allowed even though no-ff) ok 1 - setup ok 2 - setup shallow clone ok 9 - push to delete (protected) ok 80 - push --no-thin must produce non-thin pack # passed all 80 test(s) 1..80 *** t5538-push-shallow.sh *** ok 3 - clone from shallow clone ok 4 - fetch from shallow clone ok 10 - push to delete (protected, forced) ok 5 - fetch --depth from shallow clone ok 6 - fetch --unshallow from shallow clone ok 11 - push to delete (allowed) ok 7 - fetch something upstream has but hidden by clients shallow boundaries ok 1 - setup ok 12 - cover everything with default force-with-lease (protected) ok 8 - fetch that requires changes in .git/shallow is filtered ok 2 - push from shallow clone ok 3 - push from shallow clone, with grafted roots ok 28 - pull --rebase dies early with dirty working directory ok 9 - fetch --update-shallow # passed all 9 test(s) 1..9 ok 4 - add new shallow root with receive.updateshallow on *** t5539-fetch-http-shallow.sh *** ok 13 - cover everything with default force-with-lease (allowed) ok 5 - push from shallow to shallow 1..0 # SKIP Network testing disabled (define GIT_TEST_HTTPD to enable) *** t5540-http-push-webdav.sh *** # passed all 13 test(s) 1..13 *** t5541-http-push-smart.sh *** ok 29 - pull --rebase works on branch yet to be born 1..0 # SKIP Network testing disabled (define GIT_TEST_HTTPD to enable) *** t5550-http-fetch-dumb.sh *** 1..0 # SKIP Network testing disabled (define GIT_TEST_HTTPD to enable) *** t5551-http-fetch-smart.sh *** 1..0 # SKIP Network testing disabled (define GIT_TEST_HTTPD to enable) ok 6 - push from full to shallow skipping remaining tests, git built without http support # passed all 6 test(s) 1..6 *** t5560-http-backend-noserver.sh *** 1..0 # SKIP Network testing disabled (define GIT_TEST_HTTPD to enable) ok 30 - setup for detecting upstreamed changes *** t5561-http-backend.sh *** *** t5570-git-daemon.sh *** 1..0 # SKIP Network testing disabled (define GIT_TEST_HTTPD to enable) 1..0 # SKIP git-daemon testing disabled (define GIT_TEST_GIT_DAEMON to enable) *** t5571-pre-push-hook.sh *** *** t5600-clone-fail-cleanup.sh *** ok 1 - clone of non-existent source should fail ok 2 - failed clone should not leave a directory ok 3 - clone of non-existent (relative to $PWD) source should fail ok 1 - setup repository ok 4 - clone should work now that source exists ok 5 - successful clone must leave the directory ok 1 - setup ok 2 - direct refs/heads/master not found ok 6 - failed clone --separate-git-dir should not leave any directories # passed all 6 test(s) 1..6 *** t5601-clone.sh *** ok 2 - push with failing hook ok 3 - --no-verify bypasses hook ok 3 - static file is ok ok 1 - setup ok 4 - push with hook ok 2 - clone with excess parameters (1) ok 5 - add a branch ok 3 - clone with excess parameters (2) ok 31 - git pull --rebase detects upstreamed changes ok 4 - no export by default ok 4 - output from clone ok 6 - push to default ok 7 - push non-branches ok 5 - clone does not keep pack ok 8 - push delete ok 9 - push to URL ok 6 - clone checks out files # passed all 9 test(s) 1..9 ok 5 - export if git-daemon-export-ok *** t5602-clone-remote-exec.sh *** ok 7 - clone respects GIT_WORK_TREE ok 32 - setup for avoiding reapplying old patches ok 8 - clone creates intermediate directories ok 1 - setup ok 9 - clone creates intermediate directories for bare repo ok 2 - clone calls git upload-pack unqualified with no -u option ok 10 - clone --mirror ok 6 - static file if http.getanyfile true is ok ok 3 - clone calls specified git upload-pack with -u option # passed all 3 test(s) 1..3 ok 11 - clone --mirror with detached HEAD *** t5700-clone-reference.sh *** ok 1 - preparing first repository ok 7 - static file if http.getanyfile false fails ok 12 - clone --bare with detached HEAD ok 13 - clone --bare names the local repository .git ok 8 - http.uploadpack default enabled ok 2 - preparing second repository ok 3 - cloning with reference (-l -s) ok 14 - clone --mirror does not repeat tags ok 4 - existence of info/alternates ok 9 - http.uploadpack true ok 15 - clone to destination with trailing / ok 10 - http.uploadpack false ok 16 - clone to destination with extra trailing / ok 11 - http.receivepack default disabled ok 17 - clone to an existing empty directory ok 18 - clone to an existing non-empty directory ok 19 - clone to an existing path ok 12 - http.receivepack true ok 5 - pulling from reference ok 6 - that reference gets used ok 13 - http.receivepack false ok 7 - cloning with reference (no -l -s) ok 8 - fetched no objects ok 9 - existence of info/alternates ok 33 - git pull --rebase does not reapply old patches ok 20 - clone a void ok 14 - http-backend blocks bad PATH_INFO # passed all 14 test(s) 1..14 ok 10 - pulling from reference *** t5701-clone-local.sh *** ok 21 - clone respects global branch.autosetuprebase ok 11 - that reference gets used ok 22 - respect url-encoding of file:// ok 12 - updating origin ok 23 - do not query-string-decode + in URLs ok 24 - do not respect url-encoding of non-url path ok 25 - clone separate gitdir ok 26 - clone separate gitdir: output ok 1 - preparing origin repository ok 13 - pulling changes from origin ok 27 - clone from .git file ok 14 - that alternate to origin gets used ok 2 - local clone without .git suffix ok 28 - fetch from .git gitfile ok 3 - local clone with .git suffix ok 29 - fetch from gitfile parent ok 30 - clone separate gitdir where target already exists ok 34 - git pull --rebase against local branch # passed all 34 test(s) 1..34 ok 4 - local clone from x ok 5 - local clone from x.git that does not exist ok 15 - pulling changes from origin ok 31 - clone --reference from original ok 6 - With -no-hardlinks, local will make a copy ok 16 - check objects expected to exist locally ok 7 - Even without -l, local will make a hardlink ok 17 - preparing alternate repository #1 *** t5702-clone-options.sh *** ok 8 - local clone of repo with nonexistent ref in HEAD ok 18 - cloning alternate repo #2 and adding changes to repo #1 ok 32 - clone with more than one --reference ok 1 - setup ok 19 - cloning alternate repo #1, using #2 as reference ok 9 - bundle clone without .bundle suffix ok 33 - clone from original with relative alternate ok 2 - clone -o ok 20 - cloning with reference being subset of source (-l -s) ok 34 - clone checking out a tag ok 35 - setup ssh wrapper ok 21 - clone with reference from a tagged repository ok 10 - bundle clone with .bundle suffix ok 3 - redirected clone does not show progress ok 22 - prepare branched repository ok 36 - clone myhost:src uses ssh ok 11 - bundle clone from b4 ok 4 - redirected clone -v does show progress ok 12 - bundle clone from b4.bundle that does not exist # passed all 4 test(s) 1..4 *** t5704-bundle.sh *** ok 13 - bundle clone with nonexistent HEAD ok 37 - clone local path foo:bar ok 23 - fetch with incomplete alternates ok 38 - bracketed hostnames are still ssh ok 14 - clone empty repository ok 24 - clone using repo with gitfile as a reference ok 39 - clone c:temp is ssl ok 40 # skip clone c:temp is dos drive (missing MINGW) ok 25 - clone using repo pointed at by gitfile as reference # passed all 25 test(s) 1..25 ok 1 - setup ok 15 - clone empty repository, and then push should not segfault. ok 16 - cloning non-existent directory fails ok 2 - tags can be excluded by rev-list options ok 17 - cloning non-git directory fails ok 41 - clone host:rep *** t5705-clone-2gb.sh *** ok 3 - die if bundle file cannot be created ok 42 - clone host:rep/home/project not ok 4 - bundle --stdin # TODO known breakage ok 43 - clone host:123 ok 18 - cloning file:// does not hardlink not ok 5 - bundle --stdin # TODO known breakage Skipping expensive 2GB clone test; enable it with GIT_TEST_CLONE_2GB=t ok 1 # skip setup (missing CLONE_2GB) ok 2 # skip clone - bare (missing CLONE_2GB) ok 3 # skip clone - with worktree, file:// protocol (missing CLONE_2GB) # passed all 3 test(s) 1..3 ok 44 - clone [::1]:rep *** t5706-clone-branch.sh *** ok 6 - empty bundle file is rejected ok 45 - clone [::1]:rep/home/project ok 19 - cloning a local path with --no-local does not hardlink ok 46 - clone [::1]:123 ok 20 - cloning locally respects "-u" for fetching refs # passed all 20 test(s) 1..20 ok 47 - clone host:/~repo *** t5707-clone-detached.sh *** ok 7 - ridiculously long subject in boundary ok 48 - clone [::1]:/~repo ok 1 - setup ok 49 - clone foo/bar:baz is not ssh ok 8 - prerequisites with an empty commit message # still have 2 known breakage(s) # passed all remaining 6 test(s) 1..8 ok 50 - clone [foo]bar/baz:qux is not ssh *** t5708-clone-config.sh *** ok 2 - vanilla clone chooses HEAD ok 1 - setup ok 51 - clone [foo/bar]:baz is not ssh ok 3 - clone -b chooses specified branch ok 4 - clone -b sets up tracking ok 52 - clone ssh://host.xz/home/user/repo ok 5 - clone -b does not munge remotes/origin/HEAD ok 1 - clone -c sets config in cloned repo ok 2 - clone repo (detached HEAD points to branch) ok 6 - clone -b with bogus branch ok 53 - clone ssh://host.xz/~repo ok 3 - cloned HEAD matches not ok 4 - cloned HEAD is detached # TODO known breakage ok 7 - clone -b not allowed with empty repos ok 54 - clone ssh://host.xz:22/home/user/repo ok 2 - clone -c can set multi-keys # passed all 7 test(s) 1..7 ok 55 - clone ssh://host.xz:22/~repo ok 3 - clone -c without a value is boolean true *** t5709-clone-refspec.sh *** ok 4 - clone -c config is available during clone ok 56 - clone ssh://[::1]/home/user/repo # passed all 4 test(s) 1..4 ok 5 - clone repo (detached HEAD points to tag) ok 6 - cloned HEAD matches ok 57 - clone ssh://[::1]/~repo *** t5710-info-alternate.sh *** ok 7 - cloned HEAD is detached ok 58 - clone ssh://[::1]:22/home/user/repo ok 8 - clone repo (detached HEAD points to history) ok 59 - clone ssh://[::1]:22/~repo ok 9 - cloned HEAD matches ok 10 - cloned HEAD is detached ok 60 - clone from a repository with two identical branches ok 1 - preparing first repository ok 11 - clone repo (orphan detached HEAD) ok 12 - cloned HEAD matches ok 13 - cloned HEAD is detached # still have 1 known breakage(s) # passed all remaining 12 test(s) 1..13 ok 2 - preparing second repository ok 61 - shallow clone locally *** t5801-remote-helpers.sh *** # passed all 61 test(s) 1..61 *** t5802-connect-helper.sh *** ok 1 - setup repository ok 3 - preparing third repository ok 2 - cloning from local repo ok 3 - create new commit on remote ok 1 - setup ok 1 - setup ok 2 - by default all branches will be kept updated ok 4 - creating too deep nesting ok 5 - invalidity of deepest repository ok 2 - clone ok 6 - validity of third repository ok 3 - by default no tags will be kept updated ok 7 - validity of fourth repository ok 4 - pulling from local repo ok 8 - breaking of loops ok 9 - that info/alternates is necessary ok 4 - --single-branch while HEAD pointing at master ok 10 - that relative alternate is possible for current dir ok 5 - pushing to local repo ok 11 - that relative alternate is only possible for current dir # passed all 11 test(s) 1..11 ok 5 - --single-branch while HEAD pointing at side *** t5810-proto-disable-local.sh *** ok 3 - update following tag ok 1 - setup repository to clone ok 6 - --single-branch with explicit --branch side ok 6 - fetch new branch ok 2 - clone file:// (enabled) ok 7 - --single-branch with explicit --branch with tag fetches updated tag ok 3 - fetch file:// (enabled) ok 7 - fetch multiple branches ok 4 - push file:// (enabled) ok 5 - push file:// (disabled) ok 4 - update backfilled tag ok 6 - fetch file:// (disabled) ok 8 - --single-branch with --mirror ok 7 - clone file:// (disabled) ok 8 - clone path (enabled) ok 9 - fetch path (enabled) ok 9 - --single-branch with explicit --branch and --mirror ok 8 - push when remote has extra refs ok 10 - push path (enabled) ok 11 - push path (disabled) ok 12 - fetch path (disabled) ok 10 - --single-branch with detached ok 13 - clone path (disabled) # passed all 10 test(s) 1..10 # passed all 13 test(s) 1..13 *** t5811-proto-disable-git.sh *** *** t5812-proto-disable-http.sh *** ok 9 - push new branch by name not ok 10 - push new branch with old:new refspec # TODO known breakage ok 5 - update backfilled tag without primary transfer # passed all 5 test(s) 1..5 *** t5813-proto-disable-ssh.sh *** 1..0 # SKIP git-daemon testing disabled (define GIT_TEST_GIT_DAEMON to enable) 1..0 # SKIP Network testing disabled (define GIT_TEST_HTTPD to enable) *** t5814-proto-disable-ext.sh *** *** t5815-submodule-protos.sh *** ok 1 - setup ssh wrapper ok 11 - cloning without refspec ok 1 - setup ext wrapper ok 1 - setup ext wrapper ok 2 - setup ssh wrapper ok 2 - setup repository to clone ok 3 - clone host:path (enabled) ok 2 - setup repository to clone ok 4 - fetch host:path (enabled) ok 5 - push host:path (enabled) ok 6 - push host:path (disabled) ok 12 - pulling without refspecs ok 7 - fetch host:path (disabled) ok 3 - clone remote-helper (enabled) ok 8 - clone host:path (disabled) ok 13 - pushing without refspecs ok 4 - fetch remote-helper (enabled) ok 9 - clone ssh:// (enabled) ok 10 - fetch ssh:// (enabled) ok 11 - push ssh:// (enabled) ok 5 - push remote-helper (enabled) ok 6 - push remote-helper (disabled) ok 12 - push ssh:// (disabled) ok 7 - fetch remote-helper (disabled) ok 8 - clone remote-helper (disabled) ok 13 - fetch ssh:// (disabled) # passed all 8 test(s) 1..8 ok 14 - clone ssh:// (disabled) *** t5900-repo-selection.sh *** ok 15 - clone git+ssh:// (enabled) ok 14 - pulling without marks ok 16 - fetch git+ssh:// (enabled) ok 17 - push git+ssh:// (enabled) ok 18 - push git+ssh:// (disabled) ok 19 - fetch git+ssh:// (disabled) ok 20 - clone git+ssh:// (disabled) # passed all 20 test(s) 1..20 not ok 15 - pushing without marks # TODO known breakage *** t6000-rev-list-misc.sh *** ok 1 - find .git dir in worktree ok 3 - setup repository with submodules ok 1 - setup ok 16 - push all with existing object ok 2 - rev-list --objects heeds pathspecs ok 3 - rev-list --objects with pathspecs and deeper paths ok 17 - push ref with existing object ok 2 - automagically add .git suffix ok 4 - rev-list --objects with pathspecs and copied files ok 5 - rev-list A..B and rev-list ^A B are the same ok 6 - propagate uninteresting flag down correctly ok 7 - symleft flag bit is propagated down from tag # passed all 7 test(s) 1..7 *** t6001-rev-list-graft.sh *** ok 18 - push signed tag ok 3 - automagically add .git suffix to worktree ok 4 - clone with recurse-submodules fails ok 19 - push signed tag with signed-tags capability ok 1 - setup ok 2 - without grafts ok 4 - prefer worktree foo over bare foo.git ok 3 - with grafts ok 4 - without grafts, with pathlimit ok 5 - with grafts, with pathlimit ok 6 - without grafts ok 7 - with grafts ok 8 - without grafts, with pathlimit ok 20 - push update refs ok 9 - with grafts, with pathlimit ok 10 - without grafts ok 11 - with grafts ok 12 - without grafts, with pathlimit ok 5 - setup individual updates ok 13 - with grafts, with pathlimit # passed all 13 test(s) 1..13 ok 21 - push update refs disabled by no-private-update *** t6002-rev-list-bisect.sh *** ok 5 - prefer bare foo over bare foo.git ok 22 - push update refs failure ok 23 - proper failure checks for fetching ok 6 - update of ssh allowed ok 24 - proper failure checks for pushing ok 6 - disambiguate with full foo.git ok 7 - update of ext not allowed ok 7 - we are not fooled by non-git foo directory ok 25 - push messages # still have 2 known breakage(s) # passed all remaining 23 test(s) 1..25 ok 8 - prefer inner .git over outer bare # passed all 8 test(s) 1..8 *** t6003-rev-list-topo-order.sh *** *** t6004-rev-list-path-optim.sh *** ok 8 - user can override whitelist # passed all 8 test(s) 1..8 ok 1 - setup *** t6005-rev-list-count.sh *** ok 2 - path-optimization ok 1 - setup ok 2 - no options ok 3 - further setup ok 4 - path optimization 2 ok 3 - --max-count ok 5 - pathspec with leading path ok 4 - --max-count all forms ok 6 - pathspec with glob (1) ok 7 - pathspec with glob (2) # passed all 7 test(s) 1..7 *** t6006-rev-list-format.sh *** ok 5 - --skip ok 1 - set up terminal for tests ok 6 - --skip --max-count # passed all 6 test(s) 1..6 *** t6007-rev-list-cherry-pick-file.sh *** ok 1 - bisection diff --bisect l0 ^root <= 0 ok 2 - setup ok 3 - format percent ok 2 - bisection diff --bisect l1 ^root <= 0 ok 4 - format hash ok 3 - bisection diff --bisect l2 ^root <= 0 ok 5 - format tree ok 6 - format parents ok 4 - bisection diff --bisect a0 ^root <= 0 ok 7 - format author ok 8 - format committer ok 5 - bisection diff --bisect a1 ^root <= 0 ok 9 - format encoding ok 10 - format subject ok 1 - setup ok 6 - bisection diff --bisect a2 ^root <= 0 ok 11 - format body ok 12 - format raw-body ok 13 - format colors ok 2 - --left-right ok 14 - format advanced-colors ok 3 - --count ok 7 - bisection diff --bisect a3 ^root <= 0 ok 4 - --cherry-pick foo comes up empty ok 15 - %C(auto) does not enable color by default ok 16 - %C(auto) enables colors for color.diff ok 17 - %C(auto) enables colors for color.ui ok 18 - %C(auto) respects --color ok 8 - bisection diff --bisect b1 ^root <= 0 ok 19 - %C(auto) respects --no-color ok 5 - --cherry-pick bar does not come up empty ok 6 - bar does not come up empty ok 9 - bisection diff --bisect b2 ^root <= 0 ok 10 - bisection diff --bisect b3 ^root <= 0 ok 7 - --cherry-pick bar does not come up empty (II) ok 20 - %C(auto) respects --color=auto (stdout is tty) ok 11 - bisection diff --bisect c1 ^root <= 0 ok 21 - %C(auto) respects --color=auto (stdout not tty) ok 8 - --cherry-mark ok 9 - --cherry-mark --left-right ok 12 - bisection diff --bisect c2 ^root <= 0 ok 22 - setup complex body ok 23 - format complex-encoding ok 10 - --cherry-pick --right-only ok 24 - format complex-subject ok 25 - prepare expected messages (for test %b) ok 13 - bisection diff --bisect c3 ^root <= 0 ok 11 - --cherry-pick --left-only ok 26 - format complex-body ok 12 - --cherry ok 13 - --cherry --count ok 27 - format complex-subject-commitencoding-unset ok 14 - bisection diff --bisect E ^F <= 0 ok 28 - format complex-body-commitencoding-unset ok 14 - --cherry-mark --count ok 29 - %x00 shows NUL ok 30 - %ad respects --date= ok 15 - --cherry-mark --left-right --count ok 15 - bisection diff --bisect e1 ^F <= 0 ok 31 - empty email ok 32 - del LF before empty (1) ok 33 - del LF before empty (2) ok 16 - bisection diff --bisect e2 ^F <= 0 ok 16 - --cherry-pick with independent, but identical branches ok 17 - --count --left-right ok 34 - add LF before non-empty (1) # passed all 17 test(s) 1..17 ok 35 - add LF before non-empty (2) ok 36 - add SP before non-empty (1) ok 17 - bisection diff --bisect e3 ^F <= 0 *** t6008-rev-list-submodule.sh *** ok 37 - add SP before non-empty (2) ok 18 - bisection diff --bisect e4 ^F <= 0 ok 38 - --abbrev ok 39 - %H is not affected by --abbrev-commit ok 40 - %h is not affected by --abbrev-commit ok 19 - bisection diff --bisect e5 ^F <= 0 ok 41 - "%h %gD: %gs" is same as git-reflog ok 1 - rev-list has correct number of entries ok 42 - "%h %gD: %gs" is same as git-reflog (with date) ok 20 - bisection diff --bisect e6 ^F <= 0 ok 21 - bisection diff --bisect e7 ^F <= 0 ok 2 - simple topo order ok 43 - "%h %gD: %gs" is same as git-reflog (with --abbrev) ok 44 - %gd shortens ref name ok 45 - reflog identity ok 3 - simple date order ok 22 - bisection diff --bisect f1 ^F <= 0 ok 23 - bisection diff --bisect f2 ^F <= 0 ok 4 - simple author-date order ok 24 - bisection diff --bisect f3 ^F <= 0 ok 5 - two diamonds topo order (g6) ok 25 - bisection diff --bisect f4 ^F <= 0 ok 6 - multiple heads ok 7 - multiple heads, prune at a1 ok 26 - bisection diff --bisect E ^F <= 0 ok 8 - multiple heads, prune at l1 ok 9 - cross-epoch, head at l5, prune at l1 ok 27 - bisection diff --bisect V ^U <= 1 ok 28 - bisection diff --bisect V ^U ^u1 ^u2 ^u3 <= 0 ok 1 - setup ok 10 - duplicated head arguments ok 2 - Ilari's test # passed all 2 test(s) 1..2 ok 29 - bisection diff --bisect u1 ^U <= 0 ok 11 - prune near topo ok 46 - oneline with empty message *** t6009-rev-list-parent.sh *** ok 47 - single-character name is parsed correctly # passed all 47 test(s) 1..47 ok 12 - head has no parent ok 30 - bisection diff --bisect u2 ^U <= 0 *** t6010-merge-base.sh *** ok 13 - two nodes - one head, one base ok 31 - bisection diff --bisect u3 ^U <= 0 ok 14 - three nodes one head, one internal, one base ok 1 - setup ok 15 - linear prune l2 ^root ok 32 - bisection diff --bisect u4 ^U <= 0 ok 16 - linear prune l2 ^l0 ok 33 - bisection diff --bisect u5 ^U <= 0 ok 17 - linear prune l2 ^l1 ok 18 - linear prune l5 ^a4 ok 34 - --bisect l5 ^root ok 2 - set up G and H ok 1 - setup ok 35 - --bisect l5 ^root ^c3 ok 19 - linear prune l5 ^l3 ok 2 - one is ancestor of others and should not be shown ok 36 - --bisect l5 ^root ^c3 ^b4 ok 20 - linear prune l5 ^l4 ok 3 - merge-base G H ok 37 - --bisect l3 ^root ^c3 ^b4 ok 21 - max-count 10 - topo order ok 38 - --bisect l5 ^b3 ^a3 ^b4 ^a4 ok 22 - max-count 10 - non topo order ok 39 - --bisect l4 ^a2 ^a3 ^b ^a4 ok 4 - merge-base/show-branch --independent ok 23 - --max-age=c3, no --topo-order ok 40 - --bisect l3 ^a2 ^a3 ^b ^a4 ok 41 - --bisect a4 ^a2 ^a3 ^b4 ok 24 - one specified head reachable from another a4, c3, --topo-order ok 42 - --bisect a4 ^a2 ^a3 ^b4 ^c2 ok 25 - one specified head reachable from another c3, a4, --topo-order ok 43 - --bisect a4 ^a2 ^a3 ^b4 ^c2 ^c3 ok 26 - one specified head reachable from another a4, c3, no --topo-order ok 44 - --bisect a4 ^a2 ^a3 ^b4 ok 45 - --bisect c3 ^a2 ^a3 ^b4 ^c2 # passed all 45 test(s) 1..45 *** t6011-rev-list-with-bad-commit.sh *** ok 27 - one specified head reachable from another c3, a4, no --topo-order ok 5 - unsynchronized clocks ok 28 - graph with c3 and a4 parents of head ok 29 - graph with a4 and c3 parents of head ok 30 - head ^head --topo-order ok 31 - head ^head no --topo-order ok 3 - setup roots, merges and octopuses ok 4 - rev-list roots ok 32 - simple topo order (l5r1) ok 6 - --independent with unsynchronized clocks ok 5 - rev-list no merges ok 33 - simple topo order (r1l5) ok 1 - setup ok 6 - rev-list no octopuses ok 7 - rev-list no roots ok 2 - verify number of revisions ok 3 - corrupt second commit object ok 4 - rev-list should fail ok 8 - rev-list merges ok 5 - git repack _MUST_ fail ok 6 - first commit is still available ok 34 - don't print things unreachable from one branch # passed all 6 test(s) 1..6 ok 9 - rev-list octopus ok 35 - --topo-order a4 l3 *** t6012-rev-list-simplify.sh *** # passed all 35 test(s) 1..35 ok 10 - rev-list ordinary commits *** t6013-rev-list-reverse-parents.sh *** ok 11 - rev-list --merges --no-merges yields empty set ok 12 - rev-list override and infinities ok 1 - set up --reverse example ok 2 - --reverse --parents --full-history combines correctly ok 3 - --boundary does too # passed all 3 test(s) 1..3 *** t6014-rev-list-all.sh *** ok 7 - merge-base for octopus-step (setup) ok 1 - setup ok 2 - rev-list --all lists detached HEAD ok 8 - merge-base A B C ok 1 - setup ok 3 - repack does not lose detached HEAD # passed all 3 test(s) 1..3 ok 2 - log --full-history *** t6015-rev-list-show-all-parents.sh *** ok 3 - log --full-history -- file ok 4 - log --full-history --topo-order -- file ok 5 - log --full-history --date-order -- file ok 6 - log --simplify-merges -- file ok 7 - log -- file ok 9 - criss-cross merge-base for octopus-step ok 1 - set up --show-all --parents test ok 2 - --parents rewrites TREESAME parents correctly ok 8 - log --topo-order -- file ok 3 - --parents --show-all does not rewrites TREESAME parents ok 9 - log --first-parent -- another-file # passed all 3 test(s) 1..3 *** t6016-rev-list-graph-simplify-history.sh *** ok 10 - log --full-history E -- lost ok 11 - full history simplification without parent ok 12 - --full-diff is not affected by --parents # passed all 12 test(s) 1..12 *** t6017-rev-list-stdin.sh *** ok 10 - using reflog to find the fork point ok 13 - dodecapus ok 11 - merge-base --octopus --all for complex tree # passed all 11 test(s) 1..11 *** t6018-rev-list-glob.sh *** ok 14 - ancestors with the same commit time # passed all 14 test(s) 1..14 ok 1 - set up rev-list --graph test *** t6019-rev-list-ancestry-path.sh *** ok 2 - --graph --all ok 3 - --graph --simplify-by-decoration ok 4 - setup: get rid of decorations on B ok 5 - --graph --simplify-by-decoration prune branch B ok 6 - --graph --full-history -- bar.txt ok 7 - --graph --full-history --simplify-merges -- bar.txt ok 8 - --graph -- bar.txt ok 9 - --graph --sparse -- bar.txt ok 10 - --graph ^C4 ok 11 - --graph ^C3 ok 1 - setup ok 12 - --graph --boundary ^C3 ok 2 - rev-parse --glob=refs/heads/subspace/* # passed all 12 test(s) 1..12 ok 3 - rev-parse --glob=heads/subspace/* ok 4 - rev-parse --glob=refs/heads/subspace/ *** t6020-merge-df.sh *** ok 5 - rev-parse --glob=heads/subspace/ ok 6 - rev-parse --glob=heads/subspace not ok 7 - rev-parse accepts --glob as detached option # TODO known breakage not ok 8 - rev-parse is not confused by option-like glob # TODO known breakage ok 9 - rev-parse --branches=subspace/* ok 10 - rev-parse --branches=subspace/ ok 11 - rev-parse --branches=subspace ok 1 - prepare repository ok 1 - setup ok 12 - rev-parse --glob=heads/subspace/* --glob=heads/other/* ok 2 - Merge with d/f conflicts ok 13 - rev-parse --glob=heads/someref/* master ok 14 - rev-parse --glob=heads/* ok 2 - check rev-list master ok 15 - rev-parse --tags=foo ok 16 - rev-parse --remotes=foo ok 17 - rev-parse --exclude with --branches ok 3 - check log --stat master ok 18 - rev-parse --exclude with --all ok 19 - rev-parse accumulates multiple --exclude ok 4 - check rev-list side-1 ^side-4 ok 20 - rev-list --glob=refs/heads/subspace/* ok 3 - F/D conflict ok 21 - rev-list --glob refs/heads/subspace/* ok 5 - check log --stat side-1 ^side-4 ok 22 - rev-list not confused by option-like --glob arg ok 1 - setup ok 6 - check rev-list side-1 ^side-7 -- ok 23 - rev-list --glob=heads/subspace/* ok 24 - rev-list --glob=refs/heads/subspace/ ok 2 - rev-list D..M ok 4 - setup modify/delete + directory/file conflict ok 7 - check log --stat side-1 ^side-7 -- ok 25 - rev-list --glob=heads/subspace/ ok 3 - rev-list --ancestry-path D..M ok 26 - rev-list --glob=heads/subspace ok 4 - rev-list D..M -- M.t ok 8 - check rev-list side-1 ^side-7 -- file-1 ok 5 - rev-list --ancestry-path D..M -- M.t ok 27 - rev-list --branches=subspace/* ok 6 - rev-list F...I ok 5 - modify/delete + directory/file conflict ok 28 - rev-list --branches=subspace/ ok 9 - check log --stat side-1 ^side-7 -- file-1 ok 7 - rev-list --ancestry-path F...I ok 29 - rev-list --branches=subspace ok 8 - rev-list G..M -- G.t ok 10 - check rev-list side-1 ^side-7 -- file-2 ok 9 - rev-list --ancestry-path G..M -- G.t ok 30 - rev-list --branches ok 11 - check log --stat side-1 ^side-7 -- file-2 ok 10 - rev-list --ancestry-path --simplify-merges G^..M -- G.t ok 31 - rev-list --glob=heads/someref/* master ok 6 - modify/delete + directory/file conflict; other way # passed all 6 test(s) 1..6 ok 32 - rev-list --glob=heads/subspace/* --glob=heads/other/* ok 12 - check rev-list side-3 ^side-4 -- file-3 *** t6021-merge-criss-cross.sh *** ok 33 - rev-list --glob=heads/* ok 34 - rev-list --tags=foo ok 13 - check log --stat side-3 ^side-4 -- file-3 ok 35 - rev-list --tags ok 14 - check rev-list side-3 ^side-2 ok 36 - rev-list --remotes=foo ok 37 - rev-list --exclude with --branches ok 15 - check log --stat side-3 ^side-2 ok 38 - rev-list --exclude with --all ok 16 - check rev-list side-3 ^side-2 -- file-1 ok 11 - setup criss-cross ok 39 - rev-list accumulates multiple --exclude not ok 40 - rev-list may want to succeed with empty output on no input (1) # TODO known breakage not ok 41 - rev-list may want to succeed with empty output on no input (2) # TODO known breakage ok 12 - criss-cross: rev-list --ancestry-path cb..bc ok 17 - check log --stat side-3 ^side-2 -- file-1 not ok 42 - rev-list may want to succeed with empty output on no input (3) # TODO known breakage ok 13 - criss-cross: rev-list --ancestry-path --all ^cb # passed all 13 test(s) 1..13 ok 18 - not only --stdin # passed all 18 test(s) 1..18 *** t6022-merge-rename.sh *** *** t6023-merge-file.sh *** ok 1 - prepare repository ok 2 - Criss-cross merge ok 3 - Criss-cross merge result ok 1 - merge with no changes ok 2 - merge without conflict ok 43 - shortlog accepts --glob/--tags/--remotes not ok 44 - shortlog accepts --glob as detached option # TODO known breakage ok 3 - works in subdirectory not ok 45 - shortlog --glob is not confused by option-like argument # TODO known breakage ok 4 - merge without conflict (--quiet) # still have 7 known breakage(s) # passed all remaining 38 test(s) 1..45 ok 5 - merge without conflict (missing LF at EOF) ok 6 - merge result added missing LF ok 4 - Criss-cross merge fails (-s resolve) ok 7 - merge with conflicts *** t6024-recursive-merge.sh *** # passed all 4 test(s) 1..4 ok 8 - expected conflict markers ok 9 - merge with conflicts, using -L *** t6025-merge-symlinks.sh *** ok 10 - expected conflict markers, with -L ok 11 - conflict in removed tail ok 12 - expected conflict markers ok 13 - binary files cannot be merged ok 14 - MERGE_ZEALOUS simplifies non-conflicts ok 15 - ZEALOUS_ALNUM ok 16 - "diff3 -m" style output (1) ok 17 - "diff3 -m" style output (2) ok 18 - marker size # passed all 18 test(s) 1..18 ok 1 - setup *** t6026-merge-attr.sh *** ok 1 - setup ok 2 - merge master into b-symlink, which has a different symbolic link ok 3 - the merge result must be a file ok 4 - merge master into b-file, which has a file instead of a symbolic link ok 5 - the merge result must be a file ok 1 - setup tests ok 2 - combined merge conflicts ok 3 - result contains a conflict ok 6 - merge b-file, which has a file instead of a symbolic link, into master ok 7 - the merge result must be a file ok 4 - virtual trees were processed ok 2 - pull renaming branch into unrenaming one # passed all 7 test(s) 1..7 *** t6027-merge-binary.sh *** ok 1 - setup ok 2 - merge ok 3 - check merge result in index ok 4 - check merge result in working tree ok 5 - refuse to merge binary files ok 5 - retry the merge with longer context ok 3 - pull renaming branch into another renaming one ok 6 - mark rename/delete as unmerged ok 1 - setup # passed all 6 test(s) 1..6 ok 6 - custom merge backend *** t6028-merge-up-to-date.sh *** ok 7 - custom merge backend ok 2 - resolve ok 4 - pull unrenaming branch into renaming one ok 1 - setup ok 3 - recursive # passed all 3 test(s) 1..3 *** t6029-merge-subtree.sh *** ok 2 - merge -s recursive up-to-date ok 3 - merge -s recursive fast-forward ok 4 - merge -s ours up-to-date ok 1 - setup ok 8 - up-to-date merge without common ancestor # passed all 8 test(s) 1..8 ok 5 - merge -s ours fast-forward ok 5 - pull conflicting renames ok 2 - subtree available and works like recursive ok 6 - merge -s subtree up-to-date *** t6030-bisect-porcelain.sh *** ok 7 - merge fast-forward octopus # passed all 7 test(s) 1..7 *** t6031-merge-recursive.sh *** ok 3 - setup ok 1 - set up basic repo with 1 file (hello) and 4 commits ok 6 - interference with untracked working tree file ok 4 - initial merge ok 1 - mode change in one branch: keep changed version ok 2 - verify executable bit on file ok 7 - interference with untracked working tree file ok 2 - bisect starts with only one bad ok 5 - merge update ok 3 - mode change in both branches: expect conflict ok 4 - verify executable bit on file ok 6 - initial ambiguous subtree ok 8 - interference with untracked working tree file ok 5 - merging with triple rename across D/F conflict # passed all 5 test(s) 1..5 *** t6032-merge-large-rename.sh *** ok 3 - bisect does not start with only one good ok 7 - merge using explicit ok 1 - setup (initial) ok 9 - updated working tree file should prevent the merge ok 8 - merge2 using explicit # passed all 8 test(s) 1..8 *** t6033-merge-crlf.sh *** ok 10 - updated working tree file should prevent the merge ok 2 - rename (5, ok) ok 3 - set diff.renamelimit to 4 ok 4 - bisect start with one bad and good ok 1 - setup ok 11 - interference with untracked working tree file ok 2 - Check "ours" is CRLF ok 3 - Check that conflict file is CRLF ok 12 - merge of identical changes in a renamed file ok 4 - rename (4, ok) # passed all 3 test(s) 1..3 *** t6034-merge-rename-nocruft.sh *** ok 13 - setup for rename + d/f conflicts ok 5 - rename (5, fail) ok 6 - set merge.renamelimit to 5 ok 14 - Rename+D/F conflict; renamed file merges + dir not in way ok 1 - setup ok 2 - merge white into red (A->B,M->N) ok 15 - Rename+D/F conflict; renamed file merges but dir in way ok 3 - merge blue into white (A->B, mod A, A untracked) # passed all 3 test(s) 1..3 *** t6035-merge-dir-to-symlink.sh *** ok 7 - rename (5, ok) ok 16 - Same as previous, but merged other way ok 17 - Rename+D/F conflict; renamed file cannot merge, dir not in way ok 5 - bisect fails if given any junk instead of revs ok 1 - create a commit where dir a/b changed to symlink ok 2 - checkout does not clobber untracked symlink ok 18 - Rename+D/F conflict; renamed file cannot merge and dir in the way ok 8 - rename (6, fail) ok 3 - a/b-2/c/d is kept when clobbering symlink b ok 6 - bisect reset: back in the master branch ok 4 - checkout should not have deleted a/b-2/c/d ok 5 - setup for merge test ok 19 - Same as previous, but merged other way ok 6 - Handle D/F conflict, do not lose a/b-2/c/d in merge (resolve) ok 7 - a/b was resolved as symlink ok 20 - setup both rename source and destination involved in D/F conflict ok 8 - Handle D/F conflict, do not lose a/b-2/c/d in merge (recursive) ok 9 - a/b was resolved as symlink ok 21 - both rename source and destination involved in D/F conflict ok 7 - bisect reset: back in another branch ok 10 - Handle F/D conflict, do not lose a/b-2/c/d in merge (resolve) ok 11 - a/b was resolved as symlink ok 22 - setup pair rename to parent of other (D/F conflicts) ok 8 - bisect reset when not bisecting ok 12 - Handle F/D conflict, do not lose a/b-2/c/d in merge (recursive) ok 13 - a/b was resolved as symlink ok 23 - pair rename to parent of other (D/F conflicts) w/ untracked dir ok 24 - pair rename to parent of other (D/F conflicts) w/ clean start not ok 14 - do not lose untracked in merge (resolve) # TODO known breakage ok 15 - do not lose untracked in merge (recursive) ok 16 - do not lose modifications in merge (resolve) ok 25 - setup rename of one file to two, with directories in the way ok 17 - do not lose modifications in merge (recursive) ok 9 - setup large simple rename ok 18 - setup a merge where dir a/b-2 changed to symlink ok 26 - check handling of differently renamed file with D/F conflicts ok 10 - massive simple rename does not spam added files # passed all 10 test(s) 1..10 *** t6036-recursive-corner-cases.sh *** ok 19 - merge should not have D/F conflicts (resolve) ok 20 - a/b-2 was resolved as symlink ok 9 - bisect reset removes packed refs ok 21 - merge should not have D/F conflicts (recursive) ok 22 - a/b-2 was resolved as symlink ok 23 - merge should not have F/D conflicts (recursive) ok 24 - a/b-2 was resolved as symlink ok 27 - setup rename one file to two; directories moving out of the way # still have 1 known breakage(s) # passed all remaining 23 test(s) 1..24 *** t6037-merge-ours-theirs.sh *** ok 28 - check handling of differently renamed file with D/F conflicts ok 1 - setup basic criss-cross + rename with no modifications ok 29 - setup avoid unnecessary update, normal rename ok 2 - merge simple rename+criss-cross with no modifications ok 1 - setup ok 2 - plain recursive - should conflict ok 30 - avoid unnecessary update, normal rename ok 3 - recursive favouring theirs ok 10 - bisect reset removes bisect state after --no-checkout ok 4 - recursive favouring ours ok 31 - setup to test avoiding unnecessary update, with D/F conflict ok 3 - setup criss-cross + rename merges with basic modification ok 32 - avoid unnecessary update, with D/F conflict ok 5 - binary file with -Xours/-Xtheirs ok 33 - setup avoid unnecessary update, dir->(file,nothing) ok 4 - merge criss-cross + rename merges with basic modification ok 34 - avoid unnecessary update, dir->(file,nothing) ok 35 - setup avoid unnecessary update, modify/delete ok 36 - avoid unnecessary update, modify/delete ok 5 - setup differently handled merges of rename/add conflict ok 37 - setup avoid unnecessary update, rename/add-dest ok 38 - avoid unnecessary update, rename/add-dest ok 6 - git detects differently handled merges conflict ok 39 - setup merge of rename + small change ok 40 - merge rename + small change ok 11 - bisect start: back in good branch ok 7 - setup criss-cross + modify/delete resolved differently ok 8 - git detects conflict merging criss-cross+modify/delete ok 12 - bisect start: no ".git/BISECT_START" created if junk rev ok 41 - setup for use of extended merge markers ok 6 - pull passes -X to underlying merge # passed all 6 test(s) 1..6 ok 42 - merge master into rename has correct extended markers *** t6038-merge-text-auto.sh *** ok 9 - git detects conflict merging criss-cross+modify/delete, reverse direction ok 43 - merge rename into master has correct extended markers ok 44 - setup spurious "refusing to lose untracked" message ok 45 - no spurious "refusing to lose untracked" message ok 13 - bisect start: existing ".git/BISECT_START" not modified if junk rev ok 10 - setup differently handled merges of content conflict ok 1 - setup ok 2 - set up fuzz_conflict() helper not ok 11 - git detects conflict w/ criss-cross+contrived resolution # TODO known breakage ok 46 - do not follow renames for empty files # passed all 46 test(s) 1..46 ok 3 - Merge after setting text=auto *** t6040-tracking-info.sh *** ok 4 - Merge addition of text=auto ok 5 - Detect CRLF/LF conflict after setting text=auto ok 6 - Detect LF/CRLF conflict from addition of text=auto not ok 7 - checkout -m after setting text=auto # TODO known breakage not ok 8 - checkout -m addition of text=auto # TODO known breakage ok 12 - setup differently handled merges of directory/file conflict not ok 9 - cherry-pick patch from after text=auto was added # TODO known breakage ok 14 - bisect start: no ".git/BISECT_START" if mistaken rev ok 13 - merge of D & E1 fails but has appropriate contents ok 10 - Test delete/normalize conflict # still have 3 known breakage(s) # passed all remaining 7 test(s) 1..10 ok 1 - setup *** t6042-merge-rename-corner-cases.sh *** ok 2 - branch -v ok 3 - branch -vv ok 4 - checkout (diverged from upstream) ok 5 - checkout with local tracked branch ok 14 - merge of E1 & D fails but has appropriate contents ok 6 - checkout (upstream is gone) ok 7 - checkout (up-to-date with upstream) ok 8 - status (diverged from upstream) ok 1 - setup rename/delete + untracked file ok 9 - status (upstream is gone) ok 2 - Does git preserve Gollum's precious artifact? ok 15 - merge of D & E2 fails but has appropriate contents ok 15 - bisect start: no ".git/BISECT_START" if checkout error ok 10 - status (up-to-date with upstream) ok 11 - status -s -b (diverged from upstream) ok 12 - status -s -b (upstream is gone) ok 16 - merge of E2 & D fails but has appropriate contents ok 3 - setup rename/modify/add-source conflict ok 13 - status -s -b (up-to-date with upstream) not ok 4 - rename/modify/add-source conflict resolvable # TODO known breakage ok 14 - fail to track lightweight tags ok 15 - fail to track annotated tags ok 16 - setup tracking with branch --set-upstream on existing branch ok 5 - setup resolvable conflict missed if rename missed not ok 6 - conflict caused if rename not detected # TODO known breakage ok 17 - --set-upstream does not change branch ok 17 - setup rename/rename(1to2)/modify followed by what looks like rename/rename(2to1)/modify ok 18 - --set-upstream @{-1} # passed all 18 test(s) 1..18 ok 7 - setup conflict resolved wrong if rename missed *** t6050-replace.sh *** not ok 8 - missed conflict if rename not detected # TODO known breakage ok 18 - handle rename/rename(1to2)/modify followed by what looks like rename/rename(2to1)/modify ok 16 - bisect skip: successful result ok 9 - setup undetected rename/add-source causes data loss not ok 10 - detect rename/add-source and preserve all data # TODO known breakage ok 1 - set up buggy branch not ok 11 - detect rename/add-source and preserve all data, merge other way # TODO known breakage ok 2 - replace the author ok 19 - setup criss-cross + rename/rename/add + modify/modify not ok 20 - detect rename/rename/add-source for virtual merge-base # TODO known breakage ok 3 - test --no-replace-objects option ok 4 - test GIT_NO_REPLACE_OBJECTS env variable ok 5 - tag replaced commit ok 6 - "git fsck" works ok 12 - setup content merge + rename/directory conflict ok 21 - setup criss-cross+rename/rename/add-dest + simple modify ok 13 - rename/directory conflict + clean content merge ok 22 - virtual merge base handles rename/rename(1to2)/add-dest # still have 2 known breakage(s) # passed all remaining 20 test(s) 1..22 ok 17 - bisect skip: cannot tell between 3 commits *** t6060-merge-index.sh *** ok 7 - repack, clone and fetch work ok 14 - rename/directory conflict + content merge conflict ok 8 - "git replace" listing and deleting ok 9 - "git replace" replacing ok 1 - setup diverging branches ok 10 - "git replace" resolves sha1 ok 2 - read-tree does not resolve content merge ok 15 - setup content merge + rename/directory conflict w/ disappearing dir ok 3 - git merge-index git-merge-one-file resolves ok 4 - setup bare merge ok 16 - disappearing dir in rename/directory conflict handled ok 5 - merge-one-file fails without a work tree ok 11 - create parallel branch without the bug ok 6 - merge-one-file respects GIT_WORK_TREE ok 12 - push to cloned repo ok 17 - setup rename/rename (2to1) + modify/modify ok 18 - bisect skip: cannot tell between 2 commits ok 18 - handle rename/rename (2to1) conflict correctly ok 13 - push branch with replacement ok 7 - merge-one-file respects core.worktree # passed all 7 test(s) 1..7 *** t6101-rev-parse-parents.sh *** ok 19 - setup simple rename/rename (1to2) conflict ok 14 - fetch branch with replacement ok 20 - merge has correct working tree contents ok 21 - setup rename/rename(1to2)/add-source conflict not ok 22 - detect conflict with rename/rename(1to2)/add-source merge # TODO known breakage ok 23 - setup rename/rename(1to2)/add-source resolvable conflict not ok 24 - rename/rename/add-source still tracks new a file # TODO known breakage ok 19 - bisect skip: with commit both bad and skipped ok 25 - setup rename/rename(1to2)/add-dest conflict ok 26 - rename/rename/add-dest merge still knows about conflicting file versions # still have 7 known breakage(s) # passed all remaining 19 test(s) 1..26 *** t6110-rev-list-sparse.sh *** ok 15 - bisect and replacements ok 16 - index-pack and replacements ok 17 - not just commits ok 1 - setup ok 18 - replaced and replacement objects must be of the same type ok 2 - rev-list --first-parent --boundary # passed all 2 test(s) 1..2 ok 19 - -f option bypasses the type check ok 20 - git cat-file --batch works on replace objects ok 21 - test --format bogus *** t6111-rev-list-treesame.sh *** ok 22 - test --format short ok 20 - "git bisect run" simple case ok 23 - test --format medium ok 24 - test --format long ok 25 - replace ref cleanup # passed all 25 test(s) 1..25 *** t6120-describe.sh *** ok 1 - setup ok 2 - start is valid ok 3 - start^0 ok 4 - start^1 not valid ok 5 - second^1 = second^ ok 6 - final^1^1^1 ok 7 - final^1^1^1 = final^^^ ok 8 - final^1^2 ok 9 - final^1^2 != final^1^1 ok 10 - final^1^3 not valid ok 11 - --verify start2^1 ok 12 - --verify start2^0 ok 13 - final^1^@ = final^1^1 final^1^2 ok 14 - final^1^! = final^1 ^final^1^1 ^final^1^2 ok 15 - large graft octopus ok 21 - "git bisect run" with more complex "git bisect start" ok 16 - repack for next test ok 17 - short SHA-1 works # passed all 17 test(s) 1..17 ok 1 - setup *** t6130-pathspec-noglob.sh *** ok 1 - setup ok 2 - describe HEAD ok 3 - describe HEAD^ ok 2 - log ok 4 - describe HEAD^^ ok 3 - log ok 5 - describe HEAD^^2 ok 6 - describe HEAD^^2^ ok 7 - describe HEAD^^^ ok 4 - log --topo-order ok 8 - describe --tags HEAD ok 9 - describe --tags HEAD^ ok 10 - describe --tags HEAD^^ ok 11 - describe --tags HEAD^^2 ok 12 - describe --tags HEAD^^2^ ok 13 - describe --tags HEAD^^^ ok 14 - describe --all HEAD ok 15 - describe --all HEAD^ ok 5 - log -- file ok 16 - describe --all HEAD^^^ ok 17 - describe --long HEAD^^2^ ok 18 - describe --long HEAD^^2 ok 19 - describe --tags ok 20 - describe --first-parent --tags ok 21 - describe --all A^0 ok 6 - log --parents -- file ok 1 - create commits with glob characters ok 22 - no warning was displayed for A ok 2 - vanilla pathspec matches literally ok 23 - rename tag A to Q locally ok 7 - log --full-history -- file ok 3 - star pathspec globs ok 24 - describe HEAD ok 4 - star pathspec globs ok 25 - warning was displayed for Q ok 5 - bracket pathspec globs and matches literal brackets ok 8 - log --full-history --parents -- file ok 26 - rename tag Q back to A ok 6 - bracket pathspec globs and matches literal brackets ok 27 - pack tag refs ok 28 - describe HEAD ok 7 - no-glob option matches literally (vanilla) ok 8 - no-glob option matches literally (vanilla) ok 29 - describe --dirty ok 30 - set-up dirty work tree ok 9 - log --simplify-merges -- file ok 31 - describe --dirty ok 9 - no-glob option matches literally (star) ok 32 - describe --dirty=.mod ok 33 - describe --dirty HEAD ok 10 - log --first-parent ok 10 - no-glob option matches literally (star) ok 11 - log --first-parent -- file ok 11 - no-glob option matches literally (bracket) ok 12 - log F..M ok 12 - no-glob option matches literally (bracket) ok 34 - set-up matching pattern tests ok 35 - describe --match=test-* ok 13 - no-glob option disables :(literal) ok 13 - log F..M --topo-order ok 36 - describe --tags --match=test1-* ok 14 - no-glob environment variable works ok 14 - log F..M -- file ok 37 - describe --tags --match=test2-* ok 38 - describe --long --tags --match=test2-* HEAD^ ok 15 - blame takes global pathspec flags ok 15 - log --parents F..M -- file ok 16 - setup xxx/bar ok 39 - name-rev with exact tags ok 17 - **/ works with :(glob) ok 16 - log F..M --full-history -- file ok 18 - **/ does not work with --noglob-pathspecs ok 17 - log F..M --full-history --parents -- file ok 19 - **/ works with :(glob) and --noglob-pathspecs ok 18 - log F..M --simplify-merges -- file ok 20 - **/ works with --glob-pathspecs ok 40 - describe --contains with the exact tags ok 21 - **/ does not work with :(literal) and --glob-pathspecs # passed all 21 test(s) 1..21 ok 19 - log F..M --ancestry-path # passed all 40 test(s) 1..40 *** t6131-pathspec-icase.sh *** *** t6132-pathspec-exclude.sh *** ok 20 - log F..M --ancestry-path -- file ok 22 - bisect skip: add line and then a new test ok 21 - log F..M --ancestry-path --parents -- file ok 22 - log F..M --ancestry-path --simplify-merges -- file ok 23 - log F..M --first-parent ok 24 - log F..M --first-parent -- file ok 25 - log E..M --ancestry-path ok 26 - log E..M --ancestry-path -- file ok 27 - log E..M --ancestry-path --parents -- file ok 28 - log E..M --ancestry-path --simplify-merges -- file ok 29 - log G..M ok 1 - setup ok 2 - exclude only should error out ok 3 - t_e_i() exclude sub ok 30 - log G..M --topo-order ok 4 - t_e_i() exclude sub/sub/file ok 31 - log G..M -- file ok 5 - t_e_i() exclude sub using mnemonic ok 23 - bisect skip and bisect replay ok 6 - t_e_i() exclude :(icase)SUB ok 32 - log G..M --parents -- file ok 7 - t_e_i() exclude sub2 from sub ok 8 - t_e_i() exclude sub/*file ok 33 - log G..M --full-history -- file ok 9 - t_e_i() exclude :(glob)sub/*/file ok 34 - log G..M --full-history --parents -- file ok 10 - m_p_d() exclude sub ok 11 - m_p_d() exclude sub/sub/file ok 35 - log G..M --simplify-merges -- file ok 1 - create commits with glob characters ok 12 - m_p_d() exclude sub using mnemonic ok 36 - log G..M --ancestry-path ok 2 - tree_entry_interesting matches bar ok 13 - m_p_d() exclude :(icase)SUB ok 37 - log G..M --ancestry-path -- file ok 3 - tree_entry_interesting matches :(icase)bar ok 14 - m_p_d() exclude sub2 from sub ok 38 - log G..M --ancestry-path --parents -- file ok 4 - tree_entry_interesting matches :(icase)bar with prefix ok 15 - m_p_d() exclude sub/*file ok 5 - tree_entry_interesting matches :(icase)bar with empty prefix ok 39 - log G..M --ancestry-path --simplify-merges -- file ok 6 - match_pathspec matches :(icase)bar ok 16 - m_p_d() exclude :(glob)sub/*/file # passed all 16 test(s) 1..16 *** t6200-fmt-merge-msg.sh *** ok 7 - match_pathspec matches :(icase)bar with prefix ok 8 - match_pathspec matches :(icase)bar with empty prefix ok 9 - "git diff" can take magic :(icase) pathspec ok 40 - log B..F # passed all 9 test(s) 1..9 *** t6300-for-each-ref.sh *** ok 41 - log B..F -- file ok 42 - log B..F --parents -- file ok 43 - log B..F --full-history -- file ok 44 - log B..F --full-history --parents -- file ok 45 - log B..F --simplify-merges -- file ok 46 - log B..F --ancestry-path ok 1 - setup ok 2 - basic atom: head refname ok 47 - log B..F --ancestry-path -- file ok 3 - basic atom: head upstream ok 48 - log B..F --ancestry-path --parents -- file ok 4 - basic atom: head objecttype ok 49 - log B..F --ancestry-path --simplify-merges -- file ok 24 - bisect run & skip: cannot tell between 2 ok 50 - log B..F --first-parent ok 5 - basic atom: head objectsize ok 51 - log B..F --first-parent -- file ok 52 - log E F ^B -- file ok 6 - basic atom: head objectname ok 7 - basic atom: head tree ok 53 - log E...F -- file ok 8 - basic atom: head parent ok 54 - log C..F ok 9 - basic atom: head numparent ok 10 - basic atom: head object ok 55 - log C..F -- file ok 11 - basic atom: head type ok 56 - log C..F --parents -- file ok 12 - basic atom: head *objectname ok 57 - log C..F --full-history -- file ok 13 - basic atom: head *objecttype ok 58 - log C..F --full-history --parents -- file ok 14 - basic atom: head author ok 15 - basic atom: head authorname ok 16 - basic atom: head authoremail ok 59 - log C..F --simplify-merges -- file ok 17 - basic atom: head authordate ok 18 - basic atom: head committer ok 60 - log C..F --ancestry-path ok 61 - log C..F --ancestry-path -- file ok 19 - basic atom: head committername ok 62 - log C..F --ancestry-path --parents -- file ok 20 - basic atom: head committeremail ok 63 - log C..F --ancestry-path --simplify-merges -- file ok 21 - basic atom: head committerdate ok 64 - log C..F --first-parent ok 22 - basic atom: head tag ok 65 - log C..F --first-parent -- file # passed all 65 test(s) 1..65 ok 23 - basic atom: head tagger *** t6500-gc.sh *** ok 24 - basic atom: head taggername ok 25 - basic atom: head taggeremail ok 26 - basic atom: head taggerdate ok 27 - basic atom: head creator ok 28 - basic atom: head creatordate ok 1 - gc empty repository ok 29 - basic atom: head subject ok 30 - basic atom: head contents:subject ok 31 - basic atom: head body ok 32 - basic atom: head contents:body ok 2 - gc does not leave behind pid file ok 3 - gc --gobbledegook ok 33 - basic atom: head contents:signature ok 34 - basic atom: head contents ok 4 - gc -h with invalid configuration # passed all 4 test(s) 1..4 ok 35 - basic atom: head HEAD *** t7001-mv.sh *** ok 36 - basic atom: tag refname ok 37 - basic atom: tag upstream ok 38 - basic atom: tag objecttype ok 39 - basic atom: tag objectsize ok 1 - prepare reference tree ok 2 - moving the file out of subdirectory ok 40 - basic atom: tag objectname ok 3 - commiting the change ok 4 - checking the commit ok 41 - basic atom: tag tree ok 5 - moving the file back into subdirectory ok 25 - bisect run & skip: find first bad ok 42 - basic atom: tag parent ok 6 - commiting the change ok 7 - checking the commit ok 8 - checking -k on non-existing file ok 43 - basic atom: tag numparent ok 9 - checking -k on untracked file ok 10 - checking -k on multiple untracked files ok 11 - checking -f on untracked file with existing target ok 44 - basic atom: tag object ok 1 - setup ok 45 - basic atom: tag type ok 12 - moving to absent target with trailing slash ok 13 - clean up ok 14 - moving to existing untracked target with trailing slash ok 46 - basic atom: tag *objectname ok 47 - basic atom: tag *objecttype ok 15 - moving to existing tracked target with trailing slash ok 48 - basic atom: tag author ok 2 - message for merging local branch ok 16 - clean up ok 49 - basic atom: tag authorname ok 50 - basic atom: tag authoremail ok 17 - adding another file ok 51 - basic atom: tag authordate ok 18 - moving whole subdirectory ok 19 - commiting the change ok 52 - basic atom: tag committer ok 3 - message for merging external branch ok 20 - checking the commit ok 21 - succeed when source is a prefix of destination ok 53 - basic atom: tag committername ok 22 - moving whole subdirectory into subdirectory ok 54 - basic atom: tag committeremail ok 23 - commiting the change ok 55 - basic atom: tag committerdate ok 56 - basic atom: tag tag ok 24 - checking the commit ok 57 - basic atom: tag tagger ok 25 - do not move directory over existing directory ok 58 - basic atom: tag taggername ok 26 - move into "." ok 59 - basic atom: tag taggeremail ok 60 - basic atom: tag taggerdate ok 61 - basic atom: tag creator ok 4 - [merge] summary/log configuration ok 62 - basic atom: tag creatordate ok 63 - basic atom: tag subject ok 27 - Michael Cassar's test case ok 5 - setup FETCH_HEAD ok 64 - basic atom: tag contents:subject ok 6 - merge.log=3 limits shortlog length ok 65 - basic atom: tag body ok 7 - merge.log=5 shows all 5 commits ok 66 - basic atom: tag contents:body ok 28 - Sergey Vlasov's test case ok 8 - --log=5 with custom comment character ok 67 - basic atom: tag contents:signature ok 9 - merge.log=0 disables shortlog ok 68 - basic atom: tag contents ok 69 - basic atom: tag HEAD ok 70 - Check invalid atoms names are errors ok 10 - --log=3 limits shortlog length ok 29 - absolute pathname ok 11 - --log=5 shows all 5 commits ok 12 - --no-log disables shortlog ok 13 - --log=0 disables shortlog ok 30 - absolute pathname outside should fail ok 71 - Check format specifiers are ignored in naming date atoms ok 31 - git mv to move multiple sources into a directory ok 72 - Check valid format specifiers for date fields ok 73 - Check invalid format specifiers are errors ok 26 - bisect skip only one range ok 74 - Check unformatted date fields output ok 32 - git mv should not change sha1 of moved cache entry ok 75 - Check format "default" formatted date fields output ok 14 - fmt-merge-msg -m ok 15 - setup: expected shortlog for two branches ok 76 - Check format "relative" date fields output ok 77 - Check format "short" date fields output ok 78 - Check format "local" date fields output ok 79 - Check format "iso8601" date fields output ok 33 - git mv should overwrite symlink to a file ok 80 - Check format "rfc2822" date fields output ok 81 - Verify ascending sort ok 82 - Verify descending sort ok 83 - Quoting style: shell ok 84 - Quoting style: perl ok 85 - Quoting style: python ok 34 - git mv should overwrite file with a symlink ok 35 - check moved symlink ok 86 - Quoting style: tcl ok 87 - more than one quoting style: --perl --shell ok 88 - more than one quoting style: -s --python ok 89 - more than one quoting style: --python --tcl ok 90 - more than one quoting style: --tcl --perl ok 91 - Check short refname format ok 92 - Check short upstream format ok 93 - setup for upstream:track[short] ok 94 - Check upstream:track format ok 16 - shortlog for two branches ok 95 - Check upstream:trackshort format ok 96 - Check that :track[short] cannot be used with other atoms ok 97 - Check short objectname format ok 98 - Check for invalid refname format ok 36 - setup submodule ok 37 - git mv cannot move a submodule in a file ok 17 - merge-msg -F ok 99 - Check %(color:...) ok 18 - merge-msg -F in subdirectory ok 27 - bisect skip many ranges ok 38 - git mv moves a submodule with a .git directory and no .gitmodules ok 100 - Check ambiguous head and tag refs (strict) ok 101 - Check ambiguous head and tag refs (loose) ok 102 - Check ambiguous head and tag refs II (loose) ok 103 - an unusual tag with an incomplete line ok 104 - create tag with subject and body content ok 105 - basic atom: refs/tags/subject-body subject ok 106 - basic atom: refs/tags/subject-body body ok 107 - basic atom: refs/tags/subject-body contents ok 108 - create tag with multiline subject ok 109 - basic atom: refs/tags/multiline subject ok 19 - merge-msg with nothing to merge ok 110 - basic atom: refs/tags/multiline contents:subject ok 111 - basic atom: refs/tags/multiline body ok 112 - basic atom: refs/tags/multiline contents:body ok 113 - basic atom: refs/tags/multiline contents:signature ok 114 - basic atom: refs/tags/multiline contents ok 20 - merge-msg tag ok 115 - create signed tags ok 116 - basic atom: refs/tags/signed-empty subject ok 39 - git mv moves a submodule with a .git directory and .gitmodules ok 117 - basic atom: refs/tags/signed-empty contents:subject ok 21 - merge-msg two tags ok 28 - bisect starting with a detached HEAD ok 118 - basic atom: refs/tags/signed-empty body ok 119 - basic atom: refs/tags/signed-empty contents:body ok 120 - basic atom: refs/tags/signed-empty contents:signature ok 121 - basic atom: refs/tags/signed-empty contents ok 122 - basic atom: refs/tags/signed-short subject ok 22 - merge-msg tag and branch ok 123 - basic atom: refs/tags/signed-short contents:subject ok 124 - basic atom: refs/tags/signed-short body ok 125 - basic atom: refs/tags/signed-short contents:body ok 126 - basic atom: refs/tags/signed-short contents:signature ok 127 - basic atom: refs/tags/signed-short contents ok 23 - merge-msg lots of commits ok 128 - basic atom: refs/tags/signed-long subject ok 129 - basic atom: refs/tags/signed-long contents:subject ok 130 - basic atom: refs/tags/signed-long body ok 29 - bisect errors out if bad and good are mistaken ok 131 - basic atom: refs/tags/signed-long contents:body ok 132 - basic atom: refs/tags/signed-long contents:signature ok 133 - basic atom: refs/tags/signed-long contents ok 40 - git mv moves a submodule with gitfile ok 134 - Verify sort with multiple keys # passed all 134 test(s) 1..134 *** t7003-filter-branch.sh *** ok 24 - merge-msg with "merging" an annotated tag # passed all 24 test(s) 1..24 *** t7004-tag.sh *** ok 1 - listing all tags in an empty tree should succeed ok 2 - listing all tags in an empty tree should output nothing ok 3 - looking for a tag in an empty tree should fail ok 4 - creating a tag in an empty tree should fail ok 5 - creating a tag for HEAD in an empty tree should fail ok 6 - creating a tag for an unknown revision should fail ok 7 - creating a tag using default HEAD should succeed ok 8 - listing all tags if one exists should succeed ok 9 - listing all tags if one exists should output that tag ok 10 - listing a tag using a matching pattern should succeed ok 11 - listing a tag using a matching pattern should output that tag ok 12 - listing tags using a non-matching pattern should suceed ok 41 - mv does not complain when no .gitmodules file is found ok 13 - listing tags using a non-matching pattern should output nothing ok 14 - trying to create a tag with the name of one existing should fail ok 1 - setup ok 15 - trying to create a tag with a non-valid name should fail ok 16 - creating a tag using HEAD directly should succeed ok 17 - --force can create a tag with the name of one existing ok 18 - --force is moot with a non-existing tag name Deleted tag 'newtag' (was 86e17e4) Deleted tag 'forcetag' (was 86e17e4) ok 19 - trying to delete an unknown tag should fail ok 30 - bisect does not create a "bisect" branch ok 20 - trying to delete tags without params should succeed and do nothing ok 21 - deleting two existing tags in one command should succeed ok 31 - side branch creation ok 22 - creating a tag with the name of another deleted one should succeed ok 23 - trying to delete two tags, existing and not, should fail in the 2nd ok 24 - trying to delete an already deleted tag should fail ok 25 - listing all tags should print them ordered ok 42 - mv will error out on a modified .gitmodules file unless staged ok 26 - listing tags with substring as pattern must print those matching ok 27 - listing tags with a suffix as pattern must print those matching ok 28 - listing tags with a prefix as pattern must print those matching ok 29 - listing tags using a name as pattern must print that one matching ok 30 - listing tags using a name as pattern must print that one matching ok 31 - listing tags with ? in the pattern should print those matching ok 32 - listing tags using v.* should print nothing because none have v. ok 33 - listing tags using v* should print only those having v ok 34 - tag -l can accept multiple patterns ok 35 - listing tags in column ok 36 - listing tags in column with column.* ok 37 - listing tag with -n --column should fail ok 38 - listing tags -n in column with column.ui ignored ok 39 - a non-annotated tag created without parameters should point to HEAD ok 40 - trying to verify an unknown tag should fail ok 41 - trying to verify a non-annotated and non-signed tag should fail ok 42 - trying to verify many non-annotated or unknown tags, should fail ok 32 - good merge base when good and bad are siblings ok 2 - rewrite identically ok 3 - result is really identical ok 43 - creating an annotated tag with -m message should succeed ok 43 - mv issues a warning when section is not found in .gitmodules ok 44 - creating an annotated tag with -F messagefile should succeed ok 45 - creating an annotated tag with -F - should succeed ok 46 - trying to create a tag with a non-existing -F file should fail ok 47 - trying to create tags giving both -m or -F options should fail ok 48 - creating a tag with an empty -m message should succeed ok 49 - creating a tag with an empty -F messagefile should succeed ok 50 - extra blanks in the message for an annotated tag should be removed ok 51 - creating a tag with blank -m message with spaces should succeed ok 33 - skipped merge base when good and bad are siblings ok 52 - creating a tag with blank -F messagefile with spaces should succeed ok 53 - creating a tag with -F file of spaces and no newline should succeed ok 54 - creating a tag using a -F messagefile with #comments should succeed ok 55 - creating a tag with a #comment in the -m message should succeed ok 44 - mv --dry-run does not touch the submodule or .gitmodules ok 56 - creating a tag with #comments in the -F messagefile should succeed ok 57 - creating a tag with a file of #comment and no newline should succeed ok 58 - listing the one-line message of a non-signed tag should succeed ok 4 - rewrite bare repository identically ok 5 - result is really identical ok 59 - listing the zero-lines message of a non-signed tag should succeed ok 34 - bad merge base when good and bad are siblings ok 45 - checking out a commit before submodule moved needs manual updates # passed all 45 test(s) 1..45 *** t7005-editor.sh *** ok 1 - determine default editor ok 35 - many merge bases creation ok 2 - setup ok 3 - dumb should error out when falling back on vi ok 60 - listing many message lines of a non-signed tag should succeed ok 4 - dumb should prefer EDITOR to VISUAL ok 61 - annotations for blobs are empty ok 5 - Using editor ok 62 - trying to verify an annotated non-signed tag should fail ok 6 - correct GIT_DIR while using -d ok 63 - trying to verify a file-annotated non-signed tag should fail ok 64 - trying to verify two annotated non-signed tags should fail ok 6 - Using EDITOR ok 65 - creating a signed tag with -m message should succeed ok 7 - Using VISUAL ok 66 - sign with a given key id ok 67 - sign with an unknown id (1) ok 8 - Using core_editor ok 68 - sign with an unknown id (2) ok 9 - Using GIT_EDITOR ok 69 - -u implies signed tag ok 10 - Using editor (override) ok 70 - creating a signed tag with -F messagefile should succeed ok 11 - Using EDITOR (override) ok 12 - Using VISUAL (override) ok 71 - creating a signed tag with -F - should succeed ok 36 - good merge bases when good and bad are siblings ok 13 - Using core_editor (override) ok 14 - Using GIT_EDITOR (override) ok 7 - tree-filter works with -d ok 72 - -s implies annotated tag ok 15 - editor with a space ok 73 - trying to create a signed tag with non-existing -F file should fail ok 16 - core.editor with a space # passed all 16 test(s) 1..16 ok 74 - verifying a signed tag should succeed *** t7006-pager.sh *** ok 75 - verifying two signed tags in one command should succeed ok 1 - determine default pager ok 8 - Fail if commit filter fails ok 2 - set up terminal for tests ok 3 - setup ok 76 - verifying many signed and non-signed tags should fail ok 77 - verifying a forged tag should fail ok 4 - some commands use a pager ok 78 - creating a signed tag with an empty -m message should succeed ok 37 - optimized merge base checks not ok 5 - pager runs from subdir # TODO known breakage ok 79 - creating a signed tag with an empty -F messagefile should succeed ok 80 - extra blanks in the message for a signed tag should be removed ok 81 - creating a signed tag with a blank -m message should succeed ok 6 - LESS and LV envvars are set for pagination ok 82 - creating a signed tag with blank -F file with spaces should succeed ok 7 - some commands do not use a pager ok 8 - no pager when stdout is a pipe ok 9 - no pager when stdout is a regular file ok 83 - creating a signed tag with spaces and no newline should succeed ok 10 - git --paginate rev-list uses a pager ok 84 - creating a signed tag with a -F file with #comments should succeed ok 11 - no pager even with --paginate when stdout is a pipe ok 85 - creating a signed tag with #commented -m message should succeed ok 38 - "parallel" side branch creation ok 12 - no pager with --no-pager ok 86 - creating a signed tag with #commented -F messagefile should succeed ok 87 - creating a signed tag with a #comment and no newline should succeed ok 9 - rewrite, renaming a specific file ok 10 - test that the file was renamed ok 13 - configuration can disable pager ok 39 - restricting bisection on one dir ok 88 - listing the one-line message of a signed tag should succeed ok 14 - git config uses a pager if configured to ok 89 - listing the zero-lines message of a signed tag should succeed ok 15 - configuration can enable pager (from subdir) ok 16 - tests can detect color ok 17 - no color when stdout is a regular file ok 90 - listing many message lines of a signed tag should succeed ok 18 - color when writing to a pager ok 91 - creating a signed tag pointing to a tree should succeed ok 92 - creating a signed tag pointing to a blob should succeed ok 93 - creating a signed tag pointing to another tag should succeed ok 19 - colors are suppressed by color.pager ok 20 - color when writing to a file intended for a pager ok 94 - creating a signed tag with rfc1991 ok 95 - reediting a signed tag body omits signature ok 96 - verifying rfc1991 signature ok 40 - restricting bisection on one dir and a file ok 97 - list tag with rfc1991 signature ok 98 - verifying rfc1991 signature without --rfc1991 ok 21 - colors are sent to pager for external commands ok 22 - setup: some aliases ok 99 - list tag with rfc1991 signature without --rfc1991 ok 100 - reediting a signed tag body omits signature ok 101 - git tag -s fails if gpg is misconfigured ok 23 - git log - default pager is used by default ok 102 - verify signed tag fails when public key is not present ok 103 - git tag -a fails if tag annotation is empty ok 104 - message in editor has initial comment ok 105 - message in editor has initial comment: first line ok 106 - message in editor has initial comment: remainder ok 107 - overwriting an annoted tag should use its previous body ok 24 - git log - PAGER overrides default pager ok 11 - rewrite, renaming a specific directory ok 12 - test that the directory was renamed ok 108 - filename for the message is relative to cwd ok 109 - filename for the message is relative to cwd ok 110 - creating second commit and tag ok 111 - creating third commit without tag ok 25 - git log - repository-local core.pager setting overrides PAGER ok 112 - checking that first commit is in all tags (hash) ok 113 - checking that first commit is in all tags (tag) ok 114 - checking that first commit is in all tags (relative) ok 115 - checking that second commit only has one tag ok 116 - checking that third commit has no tags ok 41 - skipping away from skipped commit ok 117 - creating simple branch ok 118 - checking that branch head only has one tag ok 119 - merging original branch into this branch ok 26 - git log - core.pager overrides PAGER from subdirectory ok 120 - checking that original branch head has one tag now ok 121 - checking that initial commit is in all tags ok 122 - mixing incompatibles modes and options is forbidden ok 123 - --points-at cannot be used in non-list mode ok 27 - git log - GIT_PAGER overrides core.pager ok 124 - --points-at finds lightweight tags ok 42 - erroring out when using bad path parameters ok 13 - rewrite one branch, keeping a side branch ok 125 - --points-at finds annotated tags of commits ok 14 - common ancestor is still common (unchanged) ok 126 - --points-at finds annotated tags of tags ok 127 - multiple --points-at are OR-ed together ok 28 - git -p log - default pager is used by default # passed all 127 test(s) 1..127 *** t7007-show.sh *** ok 29 - git -p log - PAGER overrides default pager ok 1 - setup ok 2 - showing a tag that point at a missing object ok 30 - git -p log - repository-local core.pager setting overrides PAGER ok 3 - set up a bit of history ok 4 - showing two commits ok 31 - git -p log - core.pager overrides PAGER from subdirectory ok 5 - showing a range walks (linear) ok 6 - showing a range walks (Y shape, ^ first) ok 15 - filter subdirectory only ok 7 - showing a range walks (Y shape, ^ last) ok 16 - subdirectory filter result looks okay ok 32 - git -p log - GIT_PAGER overrides core.pager ok 8 - showing with -N walks ok 9 - showing annotated tag ok 10 - showing annotated tag plus commit ok 17 - more setup ok 33 - git aliasedlog - default pager is used by default ok 11 - showing range ok 12 - -s suppresses diff ok 13 - --quiet suppresses diff # passed all 13 test(s) 1..13 *** t7008-grep-binary.sh *** ok 34 - git aliasedlog - PAGER overrides default pager ok 43 - test bisection on bare repo - --no-checkout specified ok 35 - git aliasedlog - repository-local core.pager setting overrides PAGER ok 1 - setup ok 2 - git grep ina a ok 3 - git grep -ah ina a ok 4 - git grep -I ina a ok 5 - git grep -c ina a ok 6 - git grep -l ina a ok 7 - git grep -L bar a ok 36 - git aliasedlog - core.pager overrides PAGER from subdirectory ok 8 - git grep -q ina a ok 9 - git grep -F ile a ok 10 - git grep -Fi iLE a ok 11 - git grep ile a not ok 12 - git grep .fi a # TODO known breakage ok 13 - git grep -F yf a ok 14 - git grep -F yx a ok 15 - git grep -Fi Yf a ok 16 - git grep -Fi Yx a ok 17 - git grep yf a ok 37 - git aliasedlog - GIT_PAGER overrides core.pager ok 18 - git grep yx a ok 19 - grep respects binary diff attribute ok 20 - grep --cached respects binary diff attribute ok 21 - grep --cached respects binary diff attribute (2) ok 22 - grep revision respects binary diff attribute ok 38 - git -p aliasedlog - default pager is used by default ok 23 - grep respects not-binary diff attribute ok 24 - setup textconv filters ok 25 - grep does not honor textconv ok 26 - grep --textconv honors textconv ok 27 - grep --no-textconv does not honor textconv ok 28 - grep --textconv blob honors textconv # still have 1 known breakage(s) # passed all remaining 27 test(s) 1..28 *** t7009-filter-branch-null-sha1.sh *** ok 39 - git -p aliasedlog - PAGER overrides default pager ok 44 - test bisection on bare repo - --no-checkout defaulted ok 40 - git -p aliasedlog - repository-local core.pager setting overrides PAGER ok 1 - setup: base commits ok 2 - setup: a commit with a bogus null sha1 in the tree not ok 41 - git -p aliasedlog - core.pager overrides PAGER from subdirectory # TODO known breakage ok 3 - setup: bring HEAD and index in sync ok 45 - broken branch creation ok 42 - git -p aliasedlog - GIT_PAGER overrides core.pager ok 43 - git -p true - default pager is used by default ok 44 - git -p true - PAGER overrides default pager ok 46 - bisect fails if tree is broken on start commit ok 4 - filter commands are still checked ok 45 - git -p true - repository-local core.pager setting overrides PAGER ok 18 - use index-filter to move into a subdirectory not ok 46 - git -p true - core.pager overrides PAGER from subdirectory # TODO known breakage ok 47 - bisect fails if tree is broken on trial commit ok 47 - git -p true - GIT_PAGER overrides core.pager ok 19 - stops when msg filter fails ok 48 - git -p request-pull - default pager is used by default ok 5 - removing the broken entry works # passed all 5 test(s) 1..5 ok 48 - bisect: --no-checkout - start commit bad *** t7010-setup.sh *** ok 1 - setup ok 2 - git add (absolute) ok 49 - git -p request-pull - PAGER overrides default pager ok 3 - git add (funny relative) ok 4 - git rm (absolute) ok 5 - git rm (funny relative) ok 6 - git ls-files (absolute) ok 7 - git ls-files (relative #1) ok 50 - git -p request-pull - repository-local core.pager setting overrides PAGER ok 49 - bisect: --no-checkout - trial commit bad ok 8 - git ls-files (relative #2) ok 9 - git ls-files (relative #3) ok 10 - commit using absolute path names ok 11 - log using absolute path names ok 12 - blame using absolute path names not ok 51 - git -p request-pull - core.pager overrides PAGER from subdirectory # TODO known breakage ok 13 - setup deeper work tree ok 14 - add a directory outside the work tree ok 15 - add a file outside the work tree, nasty case 1 ok 16 - add a file outside the work tree, nasty case 2 # passed all 16 test(s) 1..16 *** t7011-skip-worktree-reading.sh *** ok 52 - git -p request-pull - GIT_PAGER overrides core.pager ok 1 - setup ok 50 - bisect: --no-checkout - target before breakage ok 53 - git -p - default pager is used by default ok 2 - update-index ok 54 - git -p - PAGER overrides default pager ok 3 - update-index ok 4 - update-index --remove not ok 55 - git -p - repository-local core.pager setting is not used # TODO known breakage ok 5 - update-index --remove ok 20 - author information is preserved ok 6 - ls-files --deleted ok 7 - ls-files --deleted ok 8 - ls-files --modified ok 56 - git -p - core.pager is not used from subdirectory ok 9 - ls-files --modified ok 10 - grep with skip-worktree file ok 11 - diff-index does not examine skip-worktree absent entries ok 57 - git -p - GIT_PAGER overrides core.pager ok 12 - diff-index does not examine skip-worktree dirty entries ok 13 - diff-files does not examine skip-worktree absent entries ok 14 - diff-files does not examine skip-worktree dirty entries ok 15 - git-rm succeeds on skip-worktree absent entries not ok 58 - no pager for 'git -p nonsense' # TODO known breakage ok 16 - commit on skip-worktree absent entries ok 51 - bisect: --no-checkout - target in breakage ok 59 - git shortlog - default pager is used by default ok 17 - commit on skip-worktree dirty entries # passed all 17 test(s) 1..17 *** t7012-skip-worktree-writing.sh *** ok 60 - git shortlog - PAGER overrides default pager ok 61 - git shortlog - repository-local core.pager setting overrides PAGER ok 1 - setup ok 2 - read-tree updates worktree, absent case ok 62 - git shortlog - core.pager overrides PAGER from subdirectory ok 3 - read-tree updates worktree, dirty case ok 4 - read-tree removes worktree, absent case ok 63 - git shortlog - GIT_PAGER overrides core.pager ok 64 - setup: configure shortlog not to paginate ok 5 - read-tree removes worktree, dirty case ok 65 - no pager for 'git shortlog' ok 6 - index setup ok 7 - git-add ignores worktree content ok 8 - git-add ignores worktree content ok 66 - git shortlog - core.pager is not used from subdirectory ok 9 - git-rm fails if worktree is dirty ok 10 - git-clean, absent case ok 67 - git -p shortlog - default pager is used by default ok 52 - bisect: --no-checkout - target after breakage ok 11 - git-clean, dirty case # passed all 11 test(s) 1..11 *** t7060-wtstatus.sh *** ok 21 - remove a certain author's commits ok 68 - git -p shortlog - core.pager overrides PAGER from subdirectory ok 1 - setup ok 2 - A/A conflict ok 3 - Report path with conflict ok 69 - git -p apply ok 7 - check: A B C C --soft A B C ok 20 - test resetting the index at give paths ok 21 - resetting an unmodified path is a no-op ok 22 - --mixed refreshes the index ok 8 - check: A B C C --mixed A C C ok 23 - resetting specific path that is unmerged ok 1 - setup ok 9 - check: A B C C --hard C C C ok 24 - disambiguation (1) ok 10 - check: A B C C --merge XXXXX ok 25 - disambiguation (2) ok 2 - checkout from non-existing branch ok 3 - checkout with dirty tree without -m ok 26 - disambiguation (3) ok 27 - disambiguation (4) ok 30 - --remap-to-ancestor with filename filters ok 28 - reset with paths accepts tree ok 11 - check: A B C C --keep A C C ok 4 - checkout with unrelated dirty tree without -m ok 12 - check: B B C D --soft B B D ok 5 - checkout -m with dirty tree ok 29 - reset --mixed sets up work tree # passed all 29 test(s) 1..29 ok 13 - check: B B C D --mixed B D D *** t7300-clean.sh *** ok 6 - checkout -m with dirty tree, renamed ok 14 - check: B B C D --hard D D D ok 7 - checkout -m with merge conflict ok 15 - check: B B C D --merge D D D ok 8 - format of merge conflict from checkout -m ok 1 - setup ok 16 - check: B B C D --keep XXXXX ok 2 - git clean with skip-worktree .gitignore ok 9 - checkout --merge --conflict=diff3 ok 17 - check: B B C C --soft B B C ok 3 - git clean ok 4 - git clean src/ ok 5 - git clean src/ src/ ok 6 - git clean with prefix ok 10 - checkout to detach HEAD (with advice declined) ok 7 - git clean with relative prefix ok 18 - check: B B C C --mixed B C C ok 19 - check: B B C C --hard C C C ok 8 - git clean with absolute path ok 9 - git clean with out of work tree relative path ok 20 - check: B B C C --merge C C C ok 11 - checkout to detach HEAD ok 10 - git clean with out of work tree absolute path ok 11 - git clean -d with prefix and path ok 12 - git clean symbolic link ok 13 - git clean with wildcard ok 14 - git clean -n ok 12 - checkout to detach HEAD with branchname^ ok 21 - check: B B C C --keep B C C ok 15 - git clean -d ok 16 - git clean -d src/ examples/ ok 22 - check: B C C D --soft B C D ok 17 - git clean -x ok 31 - automatic remapping to ancestor with filename filters ok 13 - checkout to detach HEAD with :/message ok 18 - git clean -d -x ok 19 - git clean -d -x with ignored tracked directory ok 20 - git clean -X ok 23 - check: B C C D --mixed B D D ok 21 - git clean -d -X ok 14 - checkout to detach HEAD with HEAD^0 ok 22 - git clean -d -X with ignored tracked directory ok 23 - clean.requireForce defaults to true ok 24 - check: B C C D --hard D D D ok 24 - clean.requireForce ok 25 - check: B C C D --merge XXXXX ok 25 - clean.requireForce and -n ok 26 - check: B C C D --keep XXXXX ok 26 - clean.requireForce and -f ok 15 - checkout with ambiguous tag/branch names ok 27 - core.excludesfile ok 27 - check: B C C C --soft B C C ok 16 - checkout with ambiguous tag/branch names ok 28 - removal failure ok 28 - check: B C C C --mixed B C C ok 17 - switch branches while in subdirectory ok 29 - check: B C C C --hard C C C ok 29 - nested git work tree ok 18 - checkout specific path while in subdirectory ok 30 - check: B C C C --merge B C C ok 19 - checkout w/--track sets up tracking ok 31 - check: B C C C --keep B C C ok 32 - setup submodule ok 30 - force removal of nested git work tree ok 20 - checkout w/autosetupmerge=always sets up tracking ok 31 - git clean -e ok 32 - git clean -d with an unreadable empty directory ok 21 - checkout w/--track from non-branch HEAD fails ok 32 - setting up branches to test with unmerged entries ok 33 - git clean -d respects pathspecs (dir is prefix of pathspec) ok 34 - git clean -d respects pathspecs (pathspec is prefix of dir) # passed all 34 test(s) 1..34 ok 33 - check: X U B C --soft XXXXX *** t7301-clean-interactive.sh *** ok 22 - checkout w/--track from tag fails ok 34 - check: X U B C --mixed X C C ok 23 - detach a symbolic link HEAD ok 35 - check: X U B C --hard C C C ok 1 - setup ok 2 - git clean -i (c: clean hotkey) ok 3 - git clean -i (cl: clean prefix) ok 36 - check: X U B C --merge C C C ok 4 - git clean -i (quit) ok 5 - git clean -i (Ctrl+D) ok 6 - git clean -id (filter all) ok 37 - check: X U B C --keep XXXXX ok 7 - git clean -id (filter patterns) ok 24 - checkout with --track fakes a sensible -b ok 8 - git clean -id (filter patterns 2) ok 38 - check: X U B B --soft XXXXX ok 25 - checkout with --track, but without -b, fails with too short tracked name ok 9 - git clean -id (select - all) ok 10 - git clean -id (select - none) ok 11 - git clean -id (select - number) ok 39 - check: X U B B --mixed X B B ok 26 - checkout an unmerged path should fail ok 12 - git clean -id (select - number 2) ok 13 - git clean -id (select - number 3) ok 40 - check: X U B B --hard B B B ok 14 - git clean -id (select - filenames) ok 15 - git clean -id (select - range) ok 27 - checkout with an unmerged path can be ignored ok 16 - git clean -id (select - range 2) ok 17 - git clean -id (inverse select) ok 33 - rewrite submodule with another content ok 41 - check: X U B B --merge B B B ok 18 - git clean -id (ask) ok 19 - git clean -id (ask - Ctrl+D) ok 42 - check: X U B B --keep XXXXX ok 20 - git clean -id with prefix and path (filter) # passed all 42 test(s) 1..42 ok 21 - git clean -id with prefix and path (select by name) *** t7400-submodule-basic.sh *** ok 28 - checkout unmerged stage ok 22 - git clean -id with prefix and path (ask) # passed all 22 test(s) 1..22 *** t7401-submodule-summary.sh *** ok 29 - checkout with --merge ok 1 - setup - initial commit ok 2 - configuration parsing ok 30 - checkout with --merge, in diff3 -m style ok 3 - setup - repository in init subdirectory ok 4 - setup - commit with gitlink ok 5 - setup - hide init subdirectory ok 6 - setup - repository to add submodules to ok 31 - checkout --conflict=merge, overriding config ok 32 - checkout --conflict=diff3 ok 33 - failing checkout -b should not break working tree ok 34 - switch out of non-branch ok 1 - added submodule ok 34 - replace submodule revision # passed all 34 test(s) 1..34 *** t7402-submodule-rebase.sh *** ok 2 - added submodule (subdirectory) ok 35 - custom merge driver with checkout -m # passed all 35 test(s) 1..35 ok 7 - submodule add *** t7403-submodule-sync.sh *** ok 3 - added submodule (subdirectory only) ok 8 - submodule add to .gitignored path fails ok 1 - setup ok 4 - added submodule (subdirectory with explicit path) ok 9 - submodule add to .gitignored path with --force ok 5 - modified submodule(forward) ok 6 - modified submodule(forward), --files ok 2 - rebase with a dirty submodule ok 7 - no ignore=all setting has any effect ok 10 - submodule add --branch ok 8 - modified submodule(backward) ok 3 - interactive rebase with a dirty submodule ok 4 - rebase with dirty file and submodule fails ok 9 - modified submodule(backward and forward) ok 11 - submodule add with ./ in path ok 10 - --summary-limit ok 5 - stash with a dirty submodule ok 11 - typechanged submodule(submodule->blob), --cached ok 12 - typechanged submodule(submodule->blob), --files ok 12 - submodule add with // in path ok 13 - typechanged submodule(submodule->blob) ok 6 - rebasing submodule that should conflict # passed all 6 test(s) 1..6 *** t7405-submodule-merge.sh *** ok 14 - nonexistent commit ok 13 - submodule add with /.. in path ok 15 - typechanged submodule(blob->submodule) ok 1 - setup ok 16 - deleted submodule ok 17 - multiple submodules ok 2 - setup for merge search ok 3 - merge with one side as a fast-forward of the other ok 18 - path filter ok 4 - merging should conflict for non fast-forward ok 14 - submodule add with ./, /.. and // in path ok 5 - merging should fail for ambiguous common parent ok 19 - given commit ok 6 - merging should fail for changes that are backwards ok 20 - --for-status ok 1 - setup ok 7 - git submodule status should display the merge conflict properly with merge base ok 2 - change submodule ok 21 - fail when using --files together with --cached ok 22 - should not fail in an empty repo # passed all 22 test(s) 1..22 ok 8 - git submodule status should display the merge conflict properly without merge-base *** t7406-submodule-update.sh *** ok 9 - merging with a modify/modify conflict between merge bases ok 15 - submodule add in subdirectory ok 3 - change submodule url ok 16 - submodule add in subdirectory with relative path should fail ok 17 - setup - add an example entry to .gitmodules ok 18 - status should fail for unmapped paths ok 19 - setup - map path in .gitmodules ok 20 - status should only print one line ok 21 - setup - fetch commit name from submodule ok 22 - status should initially be "missing" ok 10 - setup for recursive merge with submodule ok 11 - recursive merge with submodule # passed all 11 test(s) 1..11 *** t7407-submodule-foreach.sh *** ok 23 - init should register submodule url in .git/config ok 24 - init should fail with unknown submodule ok 4 - "git submodule sync" should update submodule URLs ok 25 - update should fail with unknown submodule ok 26 - status should fail with unknown submodule ok 27 - sync should fail with unknown submodule ok 28 - update should fail when path is used by a file ok 29 - update should fail when path is used by a nonempty directory ok 30 - update should work when path is an empty dir ok 5 - "git submodule sync --recursive" should update all submodule URLs ok 6 - reset submodule URLs ok 31 - status should be "up-to-date" after update ok 32 - status "up-to-date" from subdirectory ok 1 - setup a submodule tree ok 33 - status "up-to-date" from subdirectory with path ok 2 - submodule update detaching the HEAD ok 34 - status should be "modified" after submodule commit ok 7 - "git submodule sync" should update submodule URLs - subdirectory ok 1 - setup a submodule tree ok 35 - the --cached sha1 should be rev1 ok 36 - git diff should report the SHA1 of the new submodule commit ok 3 - submodule update from subdirectory ok 37 - update should checkout rev1 ok 38 - status should be "up-to-date" after update ok 39 - checkout superproject with subproject already present ok 4 - submodule update does not fetch already present commits ok 40 - apply submodule diff ok 8 - "git submodule sync --recursive" should update all submodule URLs - subdirectory ok 5 - submodule update should fail due to local changes ok 2 - test basic "submodule foreach" usage ok 6 - submodule update should throw away changes with --force ok 9 - "git submodule sync" should update known submodule URLs ok 41 - update --init ok 3 - test "submodule foreach" from subdirectory ok 7 - submodule update --force forcibly checks out submodules ok 8 - submodule update --remote should fetch upstream changes ok 10 - "git submodule sync" should not vivify uninteresting submodule ok 42 - update --init from subdirectory ok 43 - do not add files from a submodule ok 44 - gracefully add/reset submodule with a trailing slash ok 45 - ls-files gracefully handles trailing slash ok 46 - moving to a commit without submodule does not leave empty dir ok 47 - submodule fails ok 11 - "git submodule sync" handles origin URL of the form foo ok 9 - local config should override .gitmodules branch ok 12 - "git submodule sync" handles origin URL of the form foo/bar ok 10 - submodule update --rebase staying on master ok 48 - add submodules without specifying an explicit path ok 13 - "git submodule sync --recursive" propagates changes in origin ok 11 - submodule update --merge staying on master ok 49 - add should fail when path is used by a file ok 50 - add should fail when path is used by an existing directory ok 14 - "git submodule sync" handles origin URL of the form ./foo ok 4 - setup nested submodules ok 12 - submodule update - rebase in .git/config ok 15 - "git submodule sync" handles origin URL of the form ./foo/bar ok 51 - use superproject as upstream when path is relative and no url is set there ok 52 - set up for relative path tests ok 16 - "git submodule sync" handles origin URL of the form ../foo ok 53 - ../subrepo works with URL - ssh://hostname/repo ok 13 - submodule update - checkout in .git/config but --rebase given ok 17 - "git submodule sync" handles origin URL of the form ../foo/bar ok 54 - ../subrepo works with port-qualified URL - ssh://hostname:22/repo ok 14 - submodule update - merge in .git/config ok 55 - ../subrepo path works with local path - //somewhere else/repo ok 15 - submodule update - checkout in .git/config but --merge given ok 56 - ../subrepo works with file URL - file:///tmp/repo ok 18 - "git submodule sync" handles origin URL of the form ../foo/bar with deeply nested submodule # passed all 18 test(s) 1..18 ok 57 - ../subrepo works with helper URL- helper:://hostname/repo ok 16 - submodule update - checkout in .git/config *** t7408-submodule-reference.sh *** ok 1 - preparing first repository ok 58 - ../subrepo works with scp-style URL - user@host:repo ok 17 - submodule update - command in .git/config ok 2 - preparing second repository ok 3 - preparing superproject ok 59 - ../subrepo works with scp-style URL - user@host:path/to/repo ok 18 - submodule update - command in .git/config catches failure ok 4 - submodule add --reference ok 5 - after add: existence of info/alternates ok 60 - ../subrepo works with relative local path - foo ok 6 - that reference gets used with add ok 7 - cloning superproject ok 61 - ../subrepo works with relative local path - foo/bar ok 19 - submodule init does not copy command into .git/config ok 20 - submodule init picks up rebase ok 5 - use "submodule foreach" to checkout 2nd level submodule ok 62 - ../subrepo works with relative local path - ./foo ok 8 - update with reference ok 9 - after update: existence of info/alternates ok 10 - that reference gets used with update # passed all 10 test(s) 1..10 ok 21 - submodule init picks up merge *** t7409-submodule-detached-worktree.sh *** ok 63 - ../subrepo works with relative local path - ./foo/bar ok 64 - ../subrepo works with relative local path - ../foo ok 65 - ../subrepo works with relative local path - ../foo/bar ok 22 - submodule update --merge - ignores --merge for new submodules ok 66 - ../bar/a/b/c works with relative local path - ../foo/bar.git ok 1 - submodule on detached working tree ok 23 - submodule update --rebase - ignores --rebase for new submodules ok 6 - use "foreach --recursive" to checkout all submodules ok 24 - submodule update ignores update=merge config for new submodules ok 2 - submodule on detached working pointed by core.worktree # passed all 2 test(s) 1..2 *** t7500-commit.sh *** ok 1 - a basic commit in an empty tree should succeed ok 2 - nonexistent template file should return error ok 7 - test messages from "foreach --recursive" ok 25 - submodule update ignores update=rebase config for new submodules ok 3 - nonexistent template file in config should return error ok 4 - unedited template should not commit ok 5 - unedited template with comments should not commit ok 6 - a Signed-off-by line by itself should not commit ok 7 - adding comments to a template should not commit ok 67 - moving the superproject does not break submodules ok 8 - adding real content to a template should commit ok 9 - -t option should be short for --template ok 26 - submodule init picks up update=none ok 10 - config-specified template should commit ok 11 - explicit commit message should override template ok 12 - commit message from file should override template ok 13 - commit message from template with whitespace issue ok 14 - using alternate GIT_INDEX_FILE (1) ok 15 - using alternate GIT_INDEX_FILE (2) ok 16 - --signoff ok 17 - commit message from file (1) ok 18 - commit message from file (2) ok 68 - submodule add --name allows to replace a submodule with another at the same path ok 8 - test "foreach --quiet --recursive" ok 19 - commit message from stdin ok 20 - commit -F overrides -t ok 21 - Commit without message is allowed with --allow-empty-message ok 22 - Commit without message is no-no without --allow-empty-message ok 23 - Commit a message with --allow-empty-message ok 24 - commit --fixup provides correct one-line commit message ok 25 - commit --squash works with -F ok 27 - submodule update - update=none in .git/config ok 26 - commit --squash works with -m ok 69 - submodule add with an existing name fails unless forced ok 27 - commit --squash works with -C ok 28 - commit --squash works with -c ok 29 - commit --squash works with -C for same commit ok 70 - set up a second submodule ok 30 - commit --squash works with -c for same commit ok 71 - submodule deinit should remove the whole submodule section from .git/config ok 31 - commit --squash works with editor ok 32 - invalid message options when using --fixup # passed all 32 test(s) 1..32 ok 28 - submodule update - update=none in .git/config but --checkout given *** t7501-commit.sh *** ok 1 - initial status ok 2 - fail initial amend ok 3 - setup: initial commit ok 4 - -m and -F do not mix ok 5 - -m and -C do not mix ok 6 - paths and -a do not mix ok 7 - can use paths with --interactive ok 8 - using invalid commit with -C ok 9 - nothing to commit ok 10 - setup: non-initial commit ok 11 - commit message from non-existing file ok 72 - submodule deinit from subdirectory ok 12 - empty commit message ok 13 - template "emptyness" check does not kick in with -F ok 14 - template "emptyness" check ok 15 - setup: commit message from file ok 16 - amend commit ok 17 - amend --only ignores staged contents ok 18 - set up editor ok 19 - amend without launching editor ok 20 - --amend --edit ok 21 - --amend --edit of empty message ok 22 - -m --edit ok 23 - -m and -F do not mix ok 24 - using message from other commit ok 25 - editing message from other commit ok 26 - message from stdin ok 27 - overriding author from command line ok 28 - interactive add ok 29 - submodule update --init skips submodule with update=none ok 9 - use "update --recursive" to checkout all submodules ok 73 - submodule deinit . deinits all initialized submodules ok 29 - commit --interactive doesn't change index if editor aborts ok 30 - editor not invoked if -F is given ok 31 - partial commit that involves removal (1) ok 32 - partial commit that involves removal (2) ok 33 - partial commit that involves removal (3) ok 34 - amend commit to fix author ok 35 - amend commit to fix date ok 36 - commit complains about bogus date ok 37 - sign off (1) ok 38 - sign off (2) ok 39 - signoff gap ok 40 - signoff gap 2 ok 41 - multiple -m ok 42 - amend commit to fix author ok 43 - git commit with dirty index ok 44 - same tree (single parent) ok 45 - same tree (single parent) --allow-empty ok 46 - same tree (merge and amend merge) ok 10 - test "status --recursive" ok 74 - submodule deinit deinits a submodule when its work tree is missing or empty ok 47 - amend using the message from another commit ok 48 - amend using the message from a commit named with tag ok 49 - amend can copy notes ok 30 - submodule update continues after checkout error ok 50 - commit a file whose name is a dash ok 51 - --only works on to-be-born branch # passed all 51 test(s) 1..51 *** t7502-commit.sh *** ok 11 - ensure "status --cached --recursive" preserves the --cached flag ok 1 - output summary format ok 2 - output summary format: root-commit ok 3 - output summary format for commit with an empty diff ok 4 - output summary format for merges ok 5 - the basics ok 6 - partial ok 7 - partial modification in a subdirectory ok 75 - submodule deinit fails when the submodule contains modifications unless forced ok 8 - partial removal ok 9 - sign off ok 10 - multiple -m ok 11 - verbose ok 12 - verbose respects diff config ok 13 - prepare file with comment line and trailing newlines ok 14 - cleanup commit messages (verbatim option,-t) ok 15 - cleanup commit messages (verbatim option,-F) ok 16 - cleanup commit messages (verbatim option,-m) ok 17 - cleanup commit messages (whitespace option,-F) ok 18 - cleanup commit messages (strip option,-F) ok 19 - cleanup commit messages (strip option,-F,-e) ok 20 - cleanup commit messages (strip option,-F,-e): output ok 21 - cleanup commit message (fail on invalid cleanup mode option) ok 22 - cleanup commit message (fail on invalid cleanup mode configuration) ok 23 - cleanup commit message (no config and no option uses default) ok 24 - cleanup commit message (option overrides default) ok 25 - cleanup commit message (config overrides default) ok 26 - cleanup commit message (option overrides config) ok 27 - cleanup commit message (default, -m) ok 28 - cleanup commit message (whitespace option, -m) ok 29 - cleanup commit message (whitespace config, -m) ok 30 - message shows author when it is not equal to committer ok 31 - message shows committer when it is automatic ok 32 # skip do not fire editor when committer is bogus (missing !AUTOIDENT) ok 33 - do not fire editor if -m was given ok 76 - submodule deinit fails when the submodule contains untracked files unless forced ok 34 - do not fire editor if -m "" was given ok 35 - do not fire editor in the presence of conflicts ok 36 - a SIGTERM should break locks ok 31 - submodule update continues after recursive checkout error ok 37 - Hand committing of a redundant merge removes dups ok 38 - A single-liner subject with a token plus colon is not a footer ok 39 - commit -s places sob on third line after two empty lines ok 40 - commit ok 41 - commit ok 42 - commit --status ok 43 - commit --no-status ok 44 - commit with commit.status = yes ok 45 - commit with commit.status = no ok 46 - commit --status with commit.status = yes ok 47 - commit --no-status with commit.status = yes ok 77 - submodule deinit fails when the submodule HEAD does not match unless forced ok 48 - commit --status with commit.status = no ok 49 - commit --no-status with commit.status = no ok 50 - commit ok 51 - commit ok 12 - use "git clone --recursive" to checkout all submodules ok 52 - commit --status ok 53 - commit --no-status ok 54 - commit with commit.status = yes ok 55 - commit with commit.status = no ok 56 - commit --status with commit.status = yes ok 57 - commit --no-status with commit.status = yes ok 58 - commit --status with commit.status = no ok 59 - commit --no-status with commit.status = no ok 32 - submodule update exit immediately in case of merge conflict ok 60 - commit --status with custom comment character # passed all 60 test(s) 1..60 *** t7503-pre-commit-hook.sh *** ok 1 - with no hook ok 2 - --no-verify with no hook ok 3 - with succeeding hook ok 4 - --no-verify with succeeding hook ok 5 - with failing hook ok 6 - --no-verify with failing hook ok 7 - with non-executable hook ok 8 - --no-verify with non-executable hook ok 9 - with hook requiring GIT_PREFIX ok 10 - with failing hook requiring GIT_PREFIX ok 78 - submodule deinit is silent when used on an uninitialized submodule ok 11 - check the author in hook # passed all 11 test(s) 1..11 *** t7504-commit-msg-hook.sh *** ok 1 - with no hook ok 33 - submodule update exit immediately after recursive rebase error ok 2 - with no hook (editor) ok 3 - --no-verify with no hook ok 4 - --no-verify with no hook (editor) ok 5 - with succeeding hook ok 6 - with succeeding hook (editor) ok 7 - --no-verify with succeeding hook ok 8 - --no-verify with succeeding hook (editor) ok 9 - with failing hook ok 10 - with failing hook (editor) ok 11 - --no-verify with failing hook ok 12 - --no-verify with failing hook (editor) ok 34 - add different submodules to the same path ok 13 - with non-executable hook ok 14 - with non-executable hook (editor) ok 15 - --no-verify with non-executable hook ok 16 - --no-verify with non-executable hook (editor) ok 79 - submodule deinit fails when submodule has a .git directory even when forced ok 17 - hook edits commit message ok 18 - hook edits commit message (editor) ok 19 - hook doesn't edit commit message ok 20 - hook doesn't edit commit message (editor) ok 35 - submodule add places git-dir in superprojects git-dir # passed all 20 test(s) 1..20 *** t7505-prepare-commit-msg-hook.sh *** ok 1 - with no hook ok 2 - with hook (-m) ok 3 - with hook (-m editor) ok 4 - with hook (-t) ok 5 - with hook (-F) ok 6 - with hook (-F editor) ok 13 - test "update --recursive" with a flag with spaces ok 7 - with hook (-C) ok 8 - with hook (editor) ok 9 - with hook (--amend) ok 80 - submodule with UTF-8 name ok 10 - with hook (-c) ok 11 - with hook (merge) ok 12 - with failing hook ok 13 - with failing hook (--no-verify) ok 36 - submodule update places git-dir in superprojects git-dir ok 81 - submodule add clone shallow submodule # passed all 81 test(s) 1..81 ok 14 - with failing hook (merge) # passed all 14 test(s) 1..14 *** t7506-status-submodule.sh *** *** t7507-commit-verbose.sh *** ok 1 - setup ok 2 - status clean ok 3 - commit --dry-run -a clean ok 1 - setup ok 4 - status with modified file in submodule ok 2 - initial commit shows verbose diff ok 5 - status with modified file in submodule (porcelain) ok 3 - second commit ok 37 - submodule add places git-dir in superprojects git-dir recursive ok 6 - status with added file in submodule ok 4 - verbose diff is stripped out ok 7 - status with added file in submodule (porcelain) ok 5 - verbose diff is stripped out (mnemonicprefix) ok 8 - status with untracked file in submodule ok 6 - diff in message is retained without -v ok 9 - status -uno with untracked file in submodule ok 7 - diff in message is retained with -v ok 10 - status with untracked file in submodule (porcelain) ok 11 - status with added and untracked file in submodule ok 12 - status with added and untracked file in submodule (porcelain) ok 13 - status with modified file in modified submodule ok 14 - status with modified file in modified submodule (porcelain) ok 15 - status with added file in modified submodule ok 16 - status with added file in modified submodule (porcelain) ok 8 - submodule log is stripped out too with -v ok 17 - status with untracked file in modified submodule ok 9 - verbose diff is stripped out with set core.commentChar # passed all 9 test(s) 1..9 ok 18 - status with untracked file in modified submodule (porcelain) *** t7508-status.sh *** ok 19 - status with added and untracked file in modified submodule ok 20 - status with added and untracked file in modified submodule (porcelain) ok 21 - setup .git file for sub ok 1 - status -h in broken repository ok 14 - use "update --recursive nested1" to checkout all submodules rooted in nested1 ok 22 - status with added file in modified submodule with .git file ok 2 - commit -h in broken repository ok 23 - rm submodule contents ok 24 - status clean (empty submodule dir) ok 25 - status -a clean (empty submodule dir) ok 3 - setup ok 4 - status (1) ok 5 - status --column ok 6 - status --column status.displayCommentPrefix=false ok 7 - status with status.displayCommentPrefix=true ok 8 - status with status.displayCommentPrefix=false ok 9 - setup fake editor ok 10 - commit ignores status.displayCommentPrefix=false in COMMIT_EDITMSG ok 11 - status (advice.statusHints false) ok 12 - status -s ok 13 - status with gitignore ok 14 - status with gitignore (nothing untracked) ok 15 - status -s -b ok 16 - status -s -z -b ok 17 - setup dir3 ok 18 - status -uno ok 15 - command passed to foreach retains notion of stdin ok 19 - status (status.showUntrackedFiles no) ok 20 - status -uno (advice.statusHints false) ok 21 - status -s -uno ok 22 - status -s (status.showUntrackedFiles no) ok 23 - status -unormal ok 24 - status (status.showUntrackedFiles normal) ok 25 - status -s -unormal ok 26 - status -s (status.showUntrackedFiles normal) ok 27 - status -uall ok 28 - status (status.showUntrackedFiles all) ok 29 - teardown dir3 ok 30 - status -s -uall ok 31 - status -s (status.showUntrackedFiles all) ok 32 - status with relative paths ok 33 - status -s with relative paths ok 34 - status --porcelain ignores relative paths setting ok 35 - setup unique colors ok 26 - status with merge conflict in .gitmodules ok 36 - status with color.ui ok 37 - status with color.status ok 27 - diff with merge conflict in .gitmodules ok 28 - diff --submodule with merge conflict in .gitmodules # passed all 28 test(s) 1..28 ok 38 - status -s with color.ui *** t7509-commit.sh *** ok 39 - status -s with color.status ok 40 - status -s -b with color.status ok 41 - status --porcelain ignores color.ui ok 38 - submodule update places git-dir in superprojects git-dir recursive ok 42 - status --porcelain ignores color.status ok 1 - -C option copies authorship and message ok 43 - status --porcelain respects -b ok 2 - -C option copies only the message with --reset-author ok 44 - status without relative paths ok 3 - -c option copies authorship and message ok 45 - status -s without relative paths ok 46 - dry-run of partial commit excluding new file in index ok 4 - -c option copies only the message with --reset-author ok 47 - status refreshes the index ok 48 - setup status submodule summary ok 5 - --amend option copies authorship ok 49 - status submodule summary is disabled by default ok 39 - submodule add properly re-creates deeper level submodules ok 50 - status --untracked-files=all does not show submodule ok 51 - status -s submodule summary is disabled by default ok 52 - status -s --untracked-files=all does not show submodule ok 6 - --amend option with empty author ok 16 - command passed to foreach --recursive retains notion of stdin ok 7 - --amend option with missing author ok 8 - --reset-author makes the commit ours even with --amend option ok 9 - --reset-author and --author are mutually exclusive ok 10 - --reset-author should be rejected without -c/-C/--amend ok 53 - status submodule summary ok 11 - commit respects CHERRY_PICK_HEAD and MERGE_MSG ok 12 - --reset-author with CHERRY_PICK_HEAD # passed all 12 test(s) 1..12 *** t7510-signed-commit.sh *** ok 17 - multi-argument command passed to foreach is not shell-evaluated twice # passed all 17 test(s) 1..17 ok 54 - status submodule summary with status.displayCommentPrefix=false *** t7511-status-index.sh *** ok 1 - create signed commits ok 1 - status, filename length 1 ok 2 - status, filename length 2 ok 3 - status, filename length 3 ok 40 - submodule update properly revives a moved submodule ok 4 - status, filename length 4 ok 5 - status, filename length 5 ok 6 - status, filename length 6 ok 55 - commit with submodule summary ignores status.displayCommentPrefix ok 2 - show signatures ok 7 - status, filename length 7 ok 56 - status -s submodule summary ok 8 - status, filename length 8 ok 3 - detect fudged signature ok 9 - status, filename length 9 ok 10 - status, filename length 10 ok 11 - status, filename length 11 ok 4 - detect fudged signature with NUL ok 12 - status, filename length 12 ok 13 - status, filename length 13 ok 5 - amending already signed commit ok 14 - status, filename length 14 # passed all 5 test(s) 1..5 ok 15 - status, filename length 15 *** t7512-status-help.sh *** ok 16 - status, filename length 16 ok 17 - status, filename length 17 ok 18 - status, filename length 18 ok 19 - status, filename length 19 ok 20 - status, filename length 20 ok 21 - status, filename length 21 ok 22 - status, filename length 22 ok 23 - status, filename length 23 ok 24 - status, filename length 24 ok 57 - status submodule summary (clean submodule): commit # passed all 24 test(s) 1..24 ok 58 - status -s submodule summary (clean submodule) ok 1 - prepare for conflicts *** t7600-merge.sh *** ok 2 - status when conflicts unresolved ok 59 - status -z implies porcelain ok 3 - status when conflicts resolved before commit ok 4 - prepare for rebase conflicts ok 41 - submodule update can handle symbolic links in pwd ok 1 - setup ok 60 - commit --dry-run submodule summary (--amend) ok 2 - test option parsing ok 61 - status succeeds in a read-only repository ok 3 - merge -h with invalid index ok 4 - reject non-strategy with a git-merge-foo name ok 5 - merge c0 with c1 ok 6 - merge c0 with c1 with --ff-only ok 7 - merge from unborn branch ok 62 - --ignore-submodules=untracked suppresses submodules with untracked content ok 8 - merge c1 with c2 ok 5 - status when rebase in progress before resolving conflicts ok 9 - merge c1 with c2 and c3 ok 10 - merges with --ff-only ok 63 - .gitmodules ignore=untracked suppresses submodules with untracked content ok 42 - submodule update clone shallow submodule ok 11 - merges with merge.ff=only ok 6 - status when rebase in progress before rebase --continue ok 12 - merge c0 with c1 (no-commit) ok 13 - merge c1 with c2 (no-commit) ok 64 - .git/config ignore=untracked suppresses submodules with untracked content ok 7 - prepare for rebase_i_conflicts ok 43 - submodule update --recursive drops module name before recursing # passed all 43 test(s) 1..43 ok 14 - merge c1 with c2 and c3 (no-commit) ok 15 - merge c0 with c1 (squash) *** t7601-merge-pull-config.sh *** ok 16 - merge c0 with c1 (squash, ff-only) ok 65 - --ignore-submodules=dirty suppresses submodules with untracked content ok 17 - merge c1 with c2 (squash) ok 18 - unsuccessful merge of c1 with c2 (squash, ff-only) ok 1 - setup ok 2 - merge c1 with c2 ok 3 - merge c1 with c2 (ours in pull.twohead) ok 4 - merge c1 with c2 and c3 (recursive in pull.octopus) ok 8 - status during rebase -i when conflicts unresolved ok 19 - merge c1 with c2 and c3 (squash) ok 20 - merge c1 with c2 (no-commit in config) ok 5 - merge c1 with c2 and c3 (recursive and octopus in pull.octopus) ok 21 - merge c1 with c2 (log in config) ok 66 - .gitmodules ignore=dirty suppresses submodules with untracked content ok 6 - setup conflicted merge ok 22 - merge c1 with c2 (log in config gets overridden) ok 23 - merge c1 with c2 (squash in config) ok 9 - status during rebase -i after resolving conflicts ok 24 - override config option -n with --summary ok 67 - .git/config ignore=dirty suppresses submodules with untracked content ok 25 - override config option -n with --stat ok 7 - merge picks up the best result ok 26 - override config option --stat ok 27 - merge c1 with c2 (override --no-commit) ok 68 - --ignore-submodules=dirty suppresses submodules with modified content ok 8 - merge picks up the best result (from config) ok 28 - merge c1 with c2 (override --squash) ok 9 - merge errors out on invalid strategy ok 10 - merge errors out on invalid strategy # passed all 10 test(s) 1..10 *** t7602-merge-octopus-many.sh *** ok 29 - merge c0 with c1 (no-ff) ok 69 - .gitmodules ignore=dirty suppresses submodules with modified content ok 30 - merge c0 with c1 (merge.ff=false) ok 10 - status when rebasing -i in edit mode ok 31 - combine branch.master.mergeoptions with merge.ff ok 32 - tolerate unknown values for merge.ff ok 33 - combining --squash and --no-ff is refused ok 34 - option --ff-only overwrites --no-ff ok 35 - option --no-ff overrides merge.ff=only config ok 36 - merge c0 with c1 (ff overrides no-ff) ok 70 - .git/config ignore=dirty suppresses submodules with modified content ok 37 - merge log message ok 38 - merge c1 with c0, c2, c0, and c1 ok 71 - --ignore-submodules=untracked doesn't suppress submodules with modified content ok 39 - merge c1 with c0, c2, c0, and c1 ok 40 - merge c1 with c1 and c2 ok 41 - merge fast-forward in a dirty tree ok 11 - status when splitting a commit ok 42 - in-index merge ok 72 - .gitmodules ignore=untracked doesn't suppress submodules with modified content ok 43 - refresh the index before merging ok 44 - merge early part of c2 ok 45 - merge --no-ff --no-commit && commit ok 73 - .git/config ignore=untracked doesn't suppress submodules with modified content ok 46 - amending no-ff merge commit ok 1 - setup ok 47 - merge --no-ff --edit ok 48 - merge --ff-only tag ok 49 - merge --no-edit tag should skip editor # passed all 49 test(s) 1..49 *** t7603-merge-reduce-heads.sh *** ok 12 - status after editing the last commit with --amend during a rebase -i ok 74 - --ignore-submodules=untracked doesn't suppress submodule summary ok 13 - prepare for several edits ok 1 - setup ok 2 - merge c1 with c2, c3, c4, c5 ok 75 - .gitmodules ignore=untracked doesn't suppress submodule summary ok 3 - pull c2, c3, c4, c5 into c1 ok 76 - .git/config ignore=untracked doesn't suppress submodule summary ok 14 - status: (continue first edit) second edit ok 4 - setup ok 2 - merge c1 with c2, c3, c4, ... c29 ok 5 - merge E and I ok 6 - verify merge result ok 77 - --ignore-submodules=dirty doesn't suppress submodule summary ok 7 - add conflicts ok 3 - merge output uses pretty names ok 4 - merge reduces irrelevant remote heads ok 5 - merge fast-forward output uses pretty names # passed all 5 test(s) 1..5 ok 8 - merge E2 and I2, causing a conflict and resolve it ok 9 - verify merge result *** t7604-merge-custom-message.sh *** ok 10 - fast-forward to redundant refs ok 11 - verify merge result ok 12 - merge up-to-date redundant refs ok 13 - verify merge result # passed all 13 test(s) 1..13 *** t7605-merge-resolve.sh *** ok 78 - .gitmodules ignore=dirty doesn't suppress submodule summary ok 1 - setup ok 2 - merge c2 with a custom message ok 1 - setup ok 15 - status: (continue first edit) second edit and split ok 3 - merge --log appends to custom message # passed all 3 test(s) 1..3 *** t7606-merge-custom.sh *** ok 1 - set up custom strategy ok 2 - merge c1 to c2 ok 79 - .git/config ignore=dirty doesn't suppress submodule summary ok 3 - merge c2 to c3 (fails) # passed all 3 test(s) 1..3 ok 2 - setup *** t7607-merge-overwrite.sh *** ok 3 - merge c2 with a custom strategy ok 4 - trivial merge with custom strategy ok 1 - setup # passed all 4 test(s) 1..4 *** t7608-merge-messages.sh *** ok 80 - status (core.commentchar with submodule summary) ok 2 - will not overwrite untracked file ok 3 - will overwrite tracked file ok 4 - will not overwrite new file ok 5 - will not overwrite staged changes ok 1 - merge local branch ok 6 - will not overwrite removed file ok 7 - will not overwrite re-added file ok 8 - will not overwrite removed file with staged changes ok 16 - status: (continue first edit) second edit and amend ok 2 - merge octopus branches not ok 9 - will not overwrite unstaged changes in renamed file # TODO known breakage ok 81 - status (core.commentchar with two chars with submodule summary) ok 82 - --ignore-submodules=all suppresses submodule summary ok 10 - will not overwrite untracked subtree ok 11 - will not overwrite untracked file in leading path ok 3 - merge tag ok 12 - will not overwrite untracked symlink in leading path ok 13 - will not be confused by symlink in leading path ok 14 - will not overwrite untracked file on unborn branch ok 15 - will not overwrite untracked file on unborn branch .git/MERGE_HEAD sanity etc. ok 16 - failed merge leaves unborn branch in the womb ok 4 - ambiguous tag ok 17 - set up unborn branch and content ok 18 - will not clobber WT/index when merging into unborn # still have 1 known breakage(s) # passed all remaining 17 test(s) 1..18 ok 83 - .gitmodules ignore=all suppresses submodule summary *** t7609-merge-co-error-msgs.sh *** ok 5 - remote-tracking branch # passed all 5 test(s) 1..5 *** t7610-mergetool.sh *** ok 1 - setup ok 2 - untracked files overwritten by merge (fast and non-fast forward) ok 3 - untracked files or local changes ovewritten by merge ok 84 - .git/config ignore=all suppresses submodule summary ok 4 - cannot switch branches because of local changes ok 5 - not uptodate file porcelain checkout error ok 6 - not_uptodate_dir porcelain checkout error # passed all 6 test(s) 1..6 ok 17 - status: (amend first edit) second edit *** t7611-merge-abort.sh *** ok 85 - setup of test environment ok 86 - "status.short=true" same as "-s" ok 1 - setup ok 2 - fails without MERGE_HEAD (unstarted merge) ok 3 - fails without MERGE_HEAD (unstarted merge): .git/MERGE_HEAD sanity ok 4 - fails without MERGE_HEAD (completed merge) ok 5 - fails without MERGE_HEAD (completed merge): .git/MERGE_HEAD sanity ok 6 - Forget previous merge ok 7 - Abort after --no-commit ok 1 - setup ok 8 - Abort after conflicts ok 9 - Clean merge with dirty index fails ok 10 - Conflicting merge with dirty index fails ok 11 - Reset index (but preserve worktree changes) ok 87 - "status.short=true" weaker than "--no-short" ok 12 - Abort clean merge with non-conflicting dirty worktree ok 13 - Abort conflicting merge with non-conflicting dirty worktree ok 14 - Reset worktree changes ok 15 - Fail clean merge with conflicting dirty worktree ok 16 - Fail conflicting merge with conflicting dirty worktree ok 17 - Reset worktree changes ok 18 - Fail clean merge with matching dirty worktree ok 19 - Abort clean merge with matching dirty index ok 20 - Reset worktree changes ok 88 - "status.short=false" same as "--no-short" ok 21 - Fail conflicting merge with matching dirty worktree ok 89 - "status.short=false" weaker than "-s" ok 18 - status: (amend first edit) second edit and split ok 90 - "status.branch=true" same as "-b" ok 22 - Abort conflicting merge with matching dirty index ok 23 - Reset worktree changes ok 91 - "status.branch=true" different from "--no-branch" ok 92 - "status.branch=true" weaker than "--no-branch" ok 93 - "status.branch=true" weaker than "--porcelain" ok 24 - Abort merge with pre- and post-merge worktree changes ok 25 - Reset worktree changes ok 94 - "status.branch=false" same as "--no-branch" ok 95 - "status.branch=false" weaker than "-b" ok 96 - Restore default test environment # passed all 96 test(s) 1..96 *** t7612-merge-verify-signatures.sh *** ok 26 - Abort merge with pre- and post-merge index changes # passed all 26 test(s) 1..26 *** t7700-repack.sh *** ok 1 - objects in packs marked .keep are not repacked ok 1 - create signed commits ok 2 - merge unsigned commit with verification ok 2 - loose objects in alternate ODB are not repacked ok 3 - merge commit with bad signature with verification ok 4 - merge commit with untrusted signature with verification ok 5 - merge signed commit with verification ok 6 - merge commit with bad signature without verification # passed all 6 test(s) 1..6 *** t7701-repack-unpack-unreachable.sh *** ok 3 - packed obs in alt ODB are repacked even when local repo is packless ok 19 - status: (amend first edit) second edit and amend ok 4 - packed obs in alt ODB are repacked when local repo has packs ok 1 - -A with -d option leaves unreachable objects unpacked ok 5 - packed obs in alternate ODB kept pack are repacked ok 2 - -A without -d option leaves unreachable objects packed ok 6 - packed unreachable obs in alternate ODB are not loosened ok 3 - unpacked objects receive timestamp of pack file ok 7 - local packed unreachable obs that exist in alternate ODB are not loosened ok 2 - custom mergetool ok 4 - do not bother loosening old objects # passed all 4 test(s) 1..4 *** t7800-difftool.sh *** ok 8 - objects made unreachable by grafts only are kept # passed all 8 test(s) 1..8 *** t7810-grep.sh *** ok 1 - setup ok 1 - setup ok 2 - grep should not segfault with a bad input ok 3 - grep -w HEAD ok 4 - grep -w HEAD ok 5 - grep -w HEAD ok 6 - grep -w HEAD (w) ok 7 - grep -w HEAD (x) ok 8 - grep -w HEAD (y-1) ok 9 - grep -w HEAD (y-2) ok 10 - grep -w HEAD (z) ok 11 - grep HEAD (t-1) ok 12 - grep HEAD (t-2) ok 20 - status: (split first edit) second edit ok 13 - grep HEAD (t-3) ok 14 - grep -c HEAD (no /dev/null) ok 15 - grep --max-depth -1 HEAD ok 16 - grep --max-depth 0 HEAD ok 17 - grep --max-depth 0 -- '*' HEAD ok 18 - grep --max-depth 1 HEAD ok 19 - grep --max-depth 0 -- t HEAD ok 20 - grep --max-depth 0 -- . t HEAD ok 21 - grep --max-depth 0 -- t . HEAD ok 22 - grep HEAD with grep.extendedRegexp=false ok 23 - grep HEAD with grep.extendedRegexp=true ok 24 - grep HEAD with grep.patterntype=basic ok 25 - grep HEAD with grep.patterntype=extended ok 2 - custom commands ok 26 - grep HEAD with grep.patterntype=fixed ok 27 - grep HEAD with grep.patterntype=perl ok 28 - grep HEAD with grep.patternType=default and grep.extendedRegexp=true ok 29 - grep HEAD with grep.extendedRegexp=true and grep.patternType=default ok 30 - grep $L with grep.patternType=extended and grep.extendedRegexp=false ok 31 - grep $L with grep.patternType=basic and grep.extendedRegexp=true ok 32 - grep $L with grep.extendedRegexp=false and grep.patternType=extended ok 33 - grep $L with grep.extendedRegexp=true and grep.patternType=basic ok 34 - grep -w in working tree ok 35 - grep -w in working tree ok 36 - grep -w in working tree ok 37 - grep -w in working tree (w) ok 3 - custom tool commands override built-ins ok 38 - grep -w in working tree (x) ok 39 - grep -w in working tree (y-1) ok 40 - grep -w in working tree (y-2) ok 41 - grep -w in working tree (z) ok 42 - grep in working tree (t-1) ok 43 - grep in working tree (t-2) ok 4 - difftool ignores bad --tool values ok 44 - grep in working tree (t-3) ok 45 - grep -c in working tree (no /dev/null) ok 46 - grep --max-depth -1 in working tree ok 47 - grep --max-depth 0 in working tree ok 48 - grep --max-depth 0 -- '*' in working tree ok 49 - grep --max-depth 1 in working tree ok 50 - grep --max-depth 0 -- t in working tree ok 51 - grep --max-depth 0 -- . t in working tree ok 52 - grep --max-depth 0 -- t . in working tree ok 53 - grep in working tree with grep.extendedRegexp=false ok 54 - grep in working tree with grep.extendedRegexp=true ok 55 - grep in working tree with grep.patterntype=basic ok 56 - grep in working tree with grep.patterntype=extended ok 57 - grep in working tree with grep.patterntype=fixed ok 58 - grep in working tree with grep.patterntype=perl ok 59 - grep in working tree with grep.patternType=default and grep.extendedRegexp=true ok 60 - grep in working tree with grep.extendedRegexp=true and grep.patternType=default ok 5 - difftool forwards arguments to diff ok 61 - grep $L with grep.patternType=extended and grep.extendedRegexp=false ok 62 - grep $L with grep.patternType=basic and grep.extendedRegexp=true ok 63 - grep $L with grep.extendedRegexp=false and grep.patternType=extended ok 64 - grep $L with grep.extendedRegexp=true and grep.patternType=basic ok 65 - grep -l -C ok 66 - grep -l -C ok 67 - grep -L -C ok 68 - grep -e A --and -e B ok 21 - status: (split first edit) second edit and split ok 69 - grep ( -e A --or -e B ) --and -e B ok 70 - grep -e A --and --not -e B ok 71 - grep should ignore GREP_OPTIONS ok 72 - grep -f, non-existent file ok 73 - grep -f, one pattern ok 74 - grep -f, multiple patterns ok 75 - grep, multiple patterns ok 6 - difftool honors --gui ok 76 - grep -f, ignore empty lines ok 77 - grep -f, ignore empty lines, read patterns from stdin ok 78 - grep -q, silently report matches ok 79 - grep -C1 hunk mark between files ok 80 - log grep setup ok 81 - log grep (1) ok 82 - log grep (2) ok 83 - log grep (3) ok 84 - log grep (4) ok 85 - log grep (5) ok 86 - log grep (6) ok 87 - log grep (7) ok 88 - log grep (8) ok 89 - log grep (9) ok 90 - log grep (9) ok 91 - log --grep-reflog can only be used under -g ok 92 - log with multiple --grep uses union ok 93 - log --all-match with multiple --grep uses intersection ok 94 - log with multiple --author uses union ok 95 - log --all-match with multiple --author still uses union ok 96 - log --grep --author uses intersection ok 97 - log --grep --grep --author takes union of greps and intersects with author ok 98 - log ---all-match -grep --author --author still takes union of authors and intersects with grep ok 99 - log --grep --author --author takes union of authors and intersects with grep ok 100 - log --all-match --grep --grep --author takes intersection ok 101 - log --author does not search in timestamp ok 7 - difftool --gui last setting wins ok 102 - log --committer does not search in timestamp ok 103 - grep with CE_VALID file ok 104 - grep -p with userdiff ok 105 - grep -p ok 106 - grep -p -B5 ok 107 - grep -W ok 108 - grep -W with userdiff ok 109 - grep from a subdirectory to search wider area (1) ok 110 - grep from a subdirectory to search wider area (2) ok 3 - mergetool crlf ok 111 - grep -Fi ok 8 - difftool --gui works without configured diff.guitool ok 22 - status: (split first edit) second edit and amend ok 112 - outside of git repository ok 23 - prepare am_session ok 113 - inside git repository but with --no-index ok 114 - setup double-dash tests ok 115 - grep -- pattern ok 116 - grep -- pattern -- pathspec ok 117 - grep -e pattern -- path ok 118 - grep -e -- -- path ok 119 - grep --perl-regexp pattern ok 120 - grep -P pattern ok 121 - grep pattern with grep.extendedRegexp=true ok 122 - grep -P pattern with grep.extendedRegexp=true ok 9 - GIT_DIFF_TOOL variable ok 123 - grep -P -v pattern ok 124 - grep -P -i pattern ok 125 - grep -P -w pattern ok 126 - grep -G invalidpattern properly dies ok 127 - grep invalidpattern properly dies with grep.patternType=basic ok 128 - grep -E invalidpattern properly dies ok 129 - grep invalidpattern properly dies with grep.patternType=extended ok 130 - grep -P invalidpattern properly dies ok 131 - grep invalidpattern properly dies with grep.patternType=perl ok 132 - grep -G -E -F pattern ok 133 - grep pattern with grep.patternType=basic, =extended, =fixed ok 134 - grep -E -F -G pattern ok 135 - grep pattern with grep.patternType=extended, =fixed, =basic ok 4 - mergetool in subdir ok 136 - grep -F -G -E pattern ok 137 - grep pattern with grep.patternType=fixed, =basic, =extended ok 138 - grep -G -F -P -E pattern ok 139 - grep pattern with grep.patternType=fixed, =basic, =perl, =extended ok 140 - grep -G -F -E -P pattern ok 141 - grep pattern with grep.patternType=fixed, =basic, =extended, =perl ok 142 - grep -P pattern with grep.patternType=fixed ok 143 - grep -F pattern with grep.patternType=basic ok 144 - grep -G pattern with grep.patternType=fixed ok 145 - grep -E pattern with grep.patternType=fixed ok 24 - status in an am session: file already exists ok 10 - GIT_DIFF_TOOL overrides ok 146 - grep --color, separator ok 147 - grep --break ok 148 - grep --break with context ok 149 - grep --heading ok 25 - status in an am session: file does not exist ok 150 - mimic ack-grep --group ok 151 - grep -E "^ " ok 152 - grep -P "^ " # passed all 152 test(s) 1..152 ok 11 - GIT_DIFFTOOL_NO_PROMPT variable *** t7811-grep-open.sh *** ok 1 - determine default pager ok 2 - setup ok 3 - git grep -O ok 26 - status in an am session: empty patch ok 4 - git grep -O --cached ok 5 - git grep -O --no-index ok 12 - GIT_DIFFTOOL_PROMPT variable ok 6 - setup: fake "less" ok 7 - git grep -O jumps to line in less ok 8 - modified file ok 9 - copes with color settings ok 13 - difftool.prompt config variable is false ok 10 - run from subdir # passed all 10 test(s) 1..10 *** t8001-annotate.sh *** ok 1 - setup A lines ok 2 - blame 1 author ok 3 - setup B lines ok 4 - blame 2 authors ok 5 - setup B1 lines (branch1) ok 6 - blame 2 authors + 1 branch1 author ok 7 - setup B2 lines (branch2) ok 8 - blame 2 authors + 1 branch2 author ok 9 - merge branch1 & branch2 ok 10 - blame 2 authors + 2 merged-in authors ok 11 - blame ancestor ok 27 - status when bisecting ok 5 - mergetool on file in parent dir ok 12 - blame great-ancestor ok 13 - setup evil merge ok 14 - difftool merge.prompt = false ok 14 - blame evil merge ok 15 - difftool.prompt can overridden with -y ok 16 - difftool.prompt can overridden with --prompt ok 28 - status when rebase conflicts with statushints disabled ok 6 - mergetool skips autoresolved ok 29 - prepare for cherry-pick conflicts ok 15 - blame huge graft ok 30 - status when cherry-picking before resolving conflicts ok 16 - setup incomplete line ok 17 - blame incomplete line ok 18 - setup edits ok 31 - status when cherry-picking after resolving conflicts ok 19 - blame edits ok 17 - difftool last flag wins ok 20 - setup obfuscated email ok 21 - blame obfuscated email ok 22 - blame -L 1 (all) ok 23 - blame -L , (all) ok 32 - status showing detached at and from a tag ok 24 - blame -L X (X to end) ok 25 - blame -L X, (X to end) ok 26 - blame -L ,Y (up to Y) ok 27 - blame -L X,X ok 28 - blame -L X,Y ok 29 - blame -L Y,X (undocumented) ok 30 - blame -L -X ok 31 - blame -L 0 ok 32 - blame -L ,0 ok 33 - blame -L ,+0 ok 34 - blame -L X,+0 ok 33 - status while reverting commit (conflicts) ok 35 - blame -L X,+1 ok 34 - status while reverting commit (conflicts resolved) ok 36 - blame -L X,+N ok 37 - blame -L ,-0 ok 38 - blame -L X,-0 ok 39 - blame -L X,-1 ok 35 - status after reverting commit # passed all 35 test(s) 1..35 ok 40 - blame -L X,-N *** t8002-blame.sh *** ok 41 - blame -L /RE/ (RE to end) ok 1 - setup A lines ok 42 - blame -L /RE/,/RE2/ ok 2 - blame 1 author ok 3 - setup B lines ok 43 - blame -L X,/RE/ ok 4 - blame 2 authors ok 44 - blame -L /RE/,Y ok 5 - setup B1 lines (branch1) ok 45 - blame -L /RE/,+N ok 6 - blame 2 authors + 1 branch1 author ok 18 - difftool + mergetool config variables ok 46 - blame -L /RE/,-N ok 47 - blame -L X (X == nlines) ok 7 - setup B2 lines (branch2) ok 48 - blame -L X (X == nlines + 1) ok 49 - blame -L X (X > nlines) ok 8 - blame 2 authors + 1 branch2 author ok 9 - merge branch1 & branch2 ok 50 - blame -L ,Y (Y == nlines) ok 51 - blame -L ,Y (Y == nlines + 1) ok 52 - blame -L ,Y (Y > nlines) ok 10 - blame 2 authors + 2 merged-in authors ok 53 - blame -L multiple (disjoint) ok 11 - blame ancestor ok 54 - blame -L multiple (disjoint: unordered) ok 12 - blame great-ancestor ok 55 - blame -L multiple (adjacent) ok 56 - blame -L multiple (adjacent: unordered) ok 13 - setup evil merge ok 57 - blame -L multiple (overlapping) ok 14 - blame evil merge ok 19 - difftool..path ok 58 - blame -L multiple (overlapping: unordered) ok 59 - blame -L multiple (superset/subset) ok 60 - blame -L multiple (superset/subset: unordered) ok 61 - blame -L /RE/ (relative) ok 62 - blame -L /RE/ (relative: no preceding range) ok 63 - blame -L /RE/ (relative: adjacent) ok 64 - blame -L /RE/ (relative: not found) ok 65 - blame -L /RE/ (relative: end-of-file) ok 66 - blame -L ^/RE/ (absolute) ok 67 - blame -L ^/RE/ (absolute: no preceding range) ok 68 - blame -L ^/RE/ (absolute: not found) ok 69 - blame -L ^/RE/ (absolute: end-of-file) ok 20 - difftool --extcmd=cat ok 70 - setup -L :regex ok 71 - blame -L :literal ok 72 - blame -L :regex ok 73 - blame -L :nomatch ok 74 - blame -L :RE (relative) ok 75 - blame -L :RE (relative: no preceding range) ok 76 - blame -L :RE (relative: not found) ok 77 - blame -L :RE (relative: end-of-file) ok 78 - blame -L ^:RE (absolute) ok 21 - difftool --extcmd cat ok 79 - blame -L ^:RE (absolute: no preceding range) ok 80 - blame -L ^:RE (absolute: not found) ok 81 - blame -L ^:RE (absolute: end-of-file) ok 82 - setup incremental ok 83 - blame empty ok 84 - blame -L 0 empty ok 85 - blame -L 1 empty ok 7 - mergetool merges all from subdir ok 86 - blame -L 2 empty ok 87 - blame half ok 88 - blame -L 0 half ok 22 - difftool -x cat ok 89 - blame -L 1 half ok 90 - blame -L 2 half ok 91 - blame -L 3 half ok 92 - blame full ok 93 - blame -L 0 full ok 94 - blame -L 1 full ok 95 - blame -L 2 full ok 96 - blame -L 3 full ok 97 - blame -L ok 23 - difftool --extcmd echo arg1 ok 98 - blame -L X,+ ok 99 - blame -L X,- ok 100 - blame -L X (non-numeric X) ok 101 - blame -L X,Y (non-numeric Y) ok 102 - blame -L X,+N (non-numeric N) ok 103 - blame -L X,-N (non-numeric N) ok 104 - blame -L ,^/RE/ ok 105 - annotate old revision # passed all 105 test(s) 1..105 ok 24 - difftool --extcmd cat arg1 *** t8003-blame-corner-cases.sh *** ok 25 - difftool --extcmd cat arg2 ok 1 - setup ok 2 - straight copy without -C ok 26 - setup with 2 files different ok 3 - straight move without -C ok 4 - straight copy with -C ok 5 - straight move with -C ok 6 - straight copy with -C -C ok 15 - blame huge graft ok 7 - straight move with -C -C ok 8 - append without -C ok 16 - setup incomplete line ok 9 - append with -C ok 17 - blame incomplete line ok 10 - append with -C -C ok 11 - append with -C -C -C ok 12 - blame wholesale copy ok 18 - setup edits ok 13 - blame wholesale copy and more ok 19 - blame edits ok 20 - setup obfuscated email ok 21 - blame obfuscated email ok 14 - blame path that used to be a directory ok 22 - blame -L 1 (all) ok 23 - blame -L , (all) ok 15 - blame to a commit with no author name ok 16 - blame -L with invalid start ok 27 - say no to the first file ok 24 - blame -L X (X to end) ok 17 - blame -L with invalid end ok 25 - blame -L X, (X to end) ok 18 - blame parses part of -L ok 26 - blame -L ,Y (up to Y) ok 19 - indent of line numbers, nine lines ok 27 - blame -L X,X ok 20 - indent of line numbers, ten lines # passed all 20 test(s) 1..20 ok 28 - blame -L X,Y *** t8004-blame-with-conflicts.sh *** ok 29 - blame -L Y,X (undocumented) ok 30 - blame -L -X ok 31 - blame -L 0 ok 32 - blame -L ,0 ok 33 - blame -L ,+0 ok 34 - blame -L X,+0 ok 35 - blame -L X,+1 ok 36 - blame -L X,+N ok 37 - blame -L ,-0 ok 38 - blame -L X,-0 ok 39 - blame -L X,-1 ok 40 - blame -L X,-N ok 28 - say no to the second file ok 41 - blame -L /RE/ (RE to end) ok 42 - blame -L /RE/,/RE2/ ok 43 - blame -L X,/RE/ ok 44 - blame -L /RE/,Y ok 45 - blame -L /RE/,+N ok 46 - blame -L /RE/,-N ok 47 - blame -L X (X == nlines) ok 48 - blame -L X (X == nlines + 1) ok 49 - blame -L X (X > nlines) ok 1 - setup first case ok 50 - blame -L ,Y (Y == nlines) ok 2 - blame runs on unconflicted file while other file has conflicts ok 51 - blame -L ,Y (Y == nlines + 1) ok 3 - blame does not crash with conflicted file in stages 1,3 # passed all 3 test(s) 1..3 ok 52 - blame -L ,Y (Y > nlines) *** t8005-blame-i18n.sh *** ok 53 - blame -L multiple (disjoint) ok 54 - blame -L multiple (disjoint: unordered) ok 55 - blame -L multiple (adjacent) ok 56 - blame -L multiple (adjacent: unordered) ok 57 - blame -L multiple (overlapping) ok 58 - blame -L multiple (overlapping: unordered) ok 59 - blame -L multiple (superset/subset) ok 60 - blame -L multiple (superset/subset: unordered) ok 1 - setup the repository ok 61 - blame -L /RE/ (relative) ok 2 - blame respects i18n.commitencoding ok 62 - blame -L /RE/ (relative: no preceding range) ok 63 - blame -L /RE/ (relative: adjacent) ok 3 - blame respects i18n.logoutputencoding ok 64 - blame -L /RE/ (relative: not found) ok 4 - blame respects --encoding=UTF-8 ok 65 - blame -L /RE/ (relative: end-of-file) ok 5 - blame respects --encoding=none ok 66 - blame -L ^/RE/ (absolute) # passed all 5 test(s) 1..5 ok 67 - blame -L ^/RE/ (absolute: no preceding range) *** t8006-blame-textconv.sh *** ok 68 - blame -L ^/RE/ (absolute: not found) ok 69 - blame -L ^/RE/ (absolute: end-of-file) ok 8 - mergetool skips resolved paths when rerere is active ok 70 - setup -L :regex ok 1 - setup ok 71 - blame -L :literal ok 72 - blame -L :regex ok 73 - blame -L :nomatch ok 74 - blame -L :RE (relative) ok 2 - no filter specified ok 75 - blame -L :RE (relative: no preceding range) ok 76 - blame -L :RE (relative: not found) ok 3 - setup textconv filters ok 77 - blame -L :RE (relative: end-of-file) ok 4 - blame with --no-textconv ok 78 - blame -L ^:RE (absolute) ok 79 - blame -L ^:RE (absolute: no preceding range) ok 80 - blame -L ^:RE (absolute: not found) ok 81 - blame -L ^:RE (absolute: end-of-file) ok 5 - basic blame on last commit ok 29 - difftool --tool-help ok 82 - setup incremental ok 6 - blame --textconv going through revisions ok 83 - blame empty ok 84 - blame -L 0 empty ok 85 - blame -L 1 empty ok 30 - setup change in subdirectory ok 86 - blame -L 2 empty ok 87 - blame half ok 88 - blame -L 0 half ok 7 - blame --textconv with local changes ok 89 - blame -L 1 half ok 90 - blame -L 2 half ok 8 - setup +cachetextconv ok 91 - blame -L 3 half ok 92 - blame full ok 93 - blame -L 0 full ok 94 - blame -L 1 full ok 95 - blame -L 2 full ok 96 - blame -L 3 full ok 97 - blame -L ok 98 - blame -L X,+ ok 99 - blame -L X,- ok 100 - blame -L X (non-numeric X) ok 101 - blame -L X,Y (non-numeric Y) ok 102 - blame -L X,+N (non-numeric N) ok 103 - blame -L X,-N (non-numeric N) ok 104 - blame -L ,^/RE/ ok 105 - blame --show-email # passed all 105 test(s) 1..105 *** t8007-cat-file-textconv.sh *** ok 9 - blame --textconv works with textconvcache ok 10 - setup -cachetextconv ok 11 - make a new commit ok 31 - difftool -d --no-symlinks ok 12 - blame from previous revision ok 1 - setup ok 13 - blame with --no-textconv (on symlink) ok 2 - no filter specified ok 14 - blame --textconv (on symlink) ok 3 - setup textconv filters ok 15 - make another new commit ok 4 - cat-file without --textconv ok 5 - cat-file without --textconv on previous commit ok 6 - cat-file --textconv on last commit ok 32 - difftool -d --symlinks ok 7 - cat-file --textconv on previous commit ok 8 - cat-file without --textconv (symlink) ok 16 - blame on last commit (-C -C, symlink) ok 9 - cat-file --textconv on index (symlink) # passed all 16 test(s) 1..16 ok 10 - cat-file --textconv on HEAD (symlink) *** t8008-blame-formats.sh *** # passed all 10 test(s) 1..10 *** t9001-send-email.sh *** ok 9 - conflicted stash sets up rerere ok 1 - setup ok 2 - normal blame output ok 1 - prepare reference tree ok 3 - blame --porcelain output ok 2 - Setup helper tool ok 4 - blame --line-porcelain output ok 3 - Extract patches # passed all 4 test(s) 1..4 *** t9002-column.sh *** ok 1 - setup ok 2 - never ok 3 - always ok 33 - difftool --dir-diff --no-symlinks ok 4 - 80 columns ok 5 - COLUMNS = 1 ok 6 - width = 1 ok 7 - 20 columns ok 8 - 20 columns, nodense ok 9 - 20 columns, dense ok 10 - 20 columns, padding 2 ok 11 - 20 columns, indented ok 12 - 20 columns, row first ok 13 - 20 columns, row first, nodense ok 14 - 20 columns, row first, dense # passed all 14 test(s) 1..14 *** t9010-svn-fe.sh *** ok 34 - difftool --dir-diff --symlinks ok 10 - mergetool takes partial path ok 4 - No confirm with --suppress-cc ok 1 - empty dump ok 2 - v4 dumps not supported not ok 3 - empty revision # TODO known breakage ok 4 - empty properties ok 35 - difftool --dir-diff ignores --prompt --no-symlinks ok 5 - author name and commit message ok 5 - No confirm with --confirm=never ok 6 - unsupported properties are ignored ok 36 - difftool --dir-diff ignores --prompt --symlinks not ok 7 - timestamp and empty file # TODO known breakage ok 8 - directory with files ok 37 - difftool --dir-diff from subdirectory --no-symlinks ok 9 - branch name with backslash ok 10 - node without action ok 6 - No confirm with sendemail.confirm=never ok 38 - difftool --dir-diff from subdirectory --symlinks ok 11 - action: add node without text not ok 12 - change file mode but keep old content # TODO known breakage ok 13 - NUL in property value ok 39 - difftool --dir-diff when worktree file is missing --no-symlinks ok 7 - Send patches ok 8 - setup expect ok 9 - Verify commandline ok 14 - NUL in log message, file content, and property name ok 40 - difftool --dir-diff when worktree file is missing --symlinks ok 15 - change file mode and reiterate content ok 16 - deltas supported ok 41 - difftool --dir-diff --symlink without unstaged changes ok 10 - Send patches with --envelope-sender ok 11 - setup expect ok 12 - Verify commandline ok 17 - property deltas supported ok 18 - properties on / ok 19 - deltas for typechange ok 42 - difftool --dir-diff syncs worktree with unstaged change --no-symlinks ok 20 - deltas need not consume the whole preimage ok 13 - Send patches with --envelope-sender=auto ok 14 - setup expect ok 15 - Verify commandline ok 16 - setup expect ok 21 - no hang for delta trying to read past end of preimage ok 43 - difftool --dir-diff syncs worktree with unstaged change --symlinks ok 44 - difftool --dir-diff syncs worktree without unstaged change --no-symlinks ok 17 - self name is suppressed ok 22 - set up svn repo ok 45 - difftool --dir-diff syncs worktree without unstaged change --symlinks ok 23 - t9135/svn.dump # still have 3 known breakage(s) # passed all remaining 20 test(s) 1..23 *** t9011-svn-da.sh *** ok 1 - reject empty delta ok 46 - difftool --no-symlinks does not overwrite working tree file ok 2 - delta can empty file ok 3 - reject svndiff2 ok 18 - self name with dot is suppressed ok 4 - one-window empty delta ok 5 - reject incomplete window header ok 6 - reject declared delta longer than actual delta ok 7 - two-window empty delta ok 8 - noisy zeroes ok 9 - reject variable-length int in magic ok 10 - reject truncated integer ok 11 - nonempty (but unused) preimage view ok 12 - preimage view: right endpoint cannot backtrack ok 13 - preimage view: left endpoint can advance ok 14 - preimage view: offsets compared by value ok 47 - difftool --no-symlinks detects conflict ok 15 - preimage view: reject truncated preimage ok 16 - forbid unconsumed inline data ok 17 - reject truncated inline data ok 18 - reject truncated inline data (after instruction section) ok 19 - copyfrom_data ok 20 - multiple copyfrom_data ok 21 - incomplete multiple insn ok 22 - catch attempt to copy missing data ok 23 - copyfrom target to repeat data ok 24 - copyfrom target out of order ok 19 - non-ascii self name is suppressed ok 25 - catch copyfrom future ok 26 - copy to sustain ok 27 - catch copy that overflows ok 28 - copyfrom source ok 29 - copy backwards ok 30 - offsets are relative to window ok 31 - example from notes/svndiff # passed all 31 test(s) 1..31 *** t9020-remote-svn.sh *** 1..0 # SKIP skipping remote-svn tests, python not available *** t9100-git-svn-basic.sh *** ok 48 - difftool properly honors gitlink and core.worktree # passed all 48 test(s) 1..48 *** t9101-git-svn-props.sh *** define NO_SVN_TESTS to skip git svn tests ok 20 - sanitized self name is suppressed ok 1 - checkout working copy from svn ok 21 - Show all headers ok 2 - setup some commits to svn ok 1 - initialize git svn ok 22 - Prompting works ok 3 - initialize git svn ok 23 - implicit ident is allowed ok 24 # skip broken implicit ident aborts send-email (missing !AUTOIDENT of PERL,!AUTOIDENT) ok 2 - import an SVN revision into git ok 25 - tocmd works ok 3 - checkout from svn ok 26 - cccmd works ok 27 - reject long lines ok 28 - no patch was sent ok 4 - fetch revisions from svn ok 29 - Author From: in message body ok 4 - try a deep --rmdir with a commit ok 11 - deleted vs modified submodule ok 30 - Author From: not in message body ok 31 - allow long lines with --no-validate ok 5 - test svn:keywords ignoring ok 6 - raw $Id$ found in kw.c ok 5 - detect node change from file to directory #1 ok 7 - propset CR on crlf files ok 32 - Invalid In-Reply-To ok 33 - Valid In-Reply-To when prompting ok 6 - detect node change from directory to file #1 ok 34 - In-Reply-To without --chain-reply-to ok 8 - fetch and pull latest from svn and checkout a new wc ok 9 - Comparing crlf ok 10 - Comparing ne_crlf ok 11 - Comparing lf ok 12 - Comparing ne_lf ok 13 - Comparing cr ok 14 - Comparing ne_cr ok 15 - Comparing empty_cr ok 16 - Comparing empty_lf ok 17 - Comparing empty ok 18 - Comparing empty_crlf ok 35 - In-Reply-To with --chain-reply-to ok 19 - Set CRLF on cr files ok 36 - setup fake editor ok 7 - detect node change from file to directory #2 ok 37 - --compose works ok 38 - first message is compose text ok 39 - second message is patch ok 40 - setup expect ok 41 - sendemail.cc set ok 42 - setup expect ok 43 - sendemail.cc unset ok 44 - setup expect ok 20 - fetch and pull latest from svn ok 21 - CRLF + $Id$ ok 22 - CRLF + $Id$ (no newline) ok 8 - detect node change from directory to file #2 ok 45 - sendemail.cccmd ok 46 - setup expect ok 47 - --suppress-cc=all ok 48 - setup expect ok 23 - test show-ignore ok 49 - --suppress-cc=body ok 50 - setup expect ok 9 - remove executable bit from a file ok 51 - --suppress-cc=body --suppress-cc=cccmd ok 52 - setup expect ok 53 - --suppress-cc=sob ok 54 - setup expect ok 55 - --suppress-cc=bodycc ok 56 - setup expect ok 10 - add executable bit back file ok 24 - test create-ignore ok 57 - --suppress-cc=cc ok 58 - --confirm=always ok 12 - file vs modified submodule ok 59 - --confirm=auto ok 11 - executable file becomes a symlink to file ok 60 - --confirm=cc ok 61 - --confirm=compose ok 62 - confirm by default (due to cc) ok 13 - submodule in subdirectory ok 63 - confirm by default (due to --compose) ok 12 - new symlink is added to a file that was also just made executable ok 64 - confirm detects EOF (inform assumes y) ok 65 - confirm detects EOF (auto causes failure) ok 25 - test propget ok 66 - confirm does not loop forever ok 13 - modify a symlink to become a file ok 67 - utf8 Cc is rfc2047 encoded ok 14 - directory vs modified submodule ok 68 - --compose adds MIME for utf8 body ok 15 - file with no base ok 26 - test proplist # passed all 26 test(s) 1..26 *** t9102-git-svn-deep-rmdir.sh *** ok 16 - custom commands override built-ins # passed all 16 test(s) 1..16 *** t9103-git-svn-tracked-directory-removed.sh *** ok 14 - commit with UTF-8 message: locale: C.UTF-8 ok 69 - --compose respects user mime type ok 1 - initialize repo ok 1 - make history for tracking ok 70 - --compose adds MIME for utf8 subject ok 71 - utf8 author is correctly passed on ok 72 - utf8 sender is not duplicated ok 2 - mirror via git svn ok 2 - clone repo with git ok 73 - sendemail.composeencoding works ok 74 - --compose-encoding works ok 75 - --compose-encoding overrides sendemail.composeencoding ok 3 - Try a commit on rmdir ok 15 - test fetch functionality (svn => git) with alternate GIT_SVN_ID # passed all 3 test(s) 1..3 ok 16 - check imported tree checksums expected tree checksums *** t9104-git-svn-follow-parent.sh *** ok 76 - --compose-encoding adds correct MIME for subject ok 17 - exit if remote refs are ambigious ok 3 - make sure r2 still has old file # passed all 3 test(s) 1..3 *** t9105-git-svn-commit-diff.sh *** ok 77 - detects ambiguous reference/file conflict ok 1 - initialize repo ok 1 - initialize repo ok 18 - exit if init-ing a would clobber a URL ok 78 - feed two files ok 79 - in-reply-to but no threading ok 19 - init allows us to connect to another directory in the same repo ok 2 - test the commit-diff command ok 80 - no in-reply-to and no threading ok 81 - threading but no chain-reply-to ok 82 - sendemail.to works ok 2 - init and fetch a moved directory ok 83 - --no-to overrides sendemail.to ok 84 - sendemail.cc works ok 3 - commit-diff to a sub-directory (with git svn config) # passed all 3 test(s) 1..3 *** t9106-git-svn-commit-diff-clobber.sh *** ok 85 - --no-cc overrides sendemail.cc ok 20 - dcommit $rev does not clobber current branch ok 1 - initialize repo ok 2 - commit change from svn side ok 86 - sendemail.bcc works ok 3 - init and fetch from one svn-remote ok 87 - --no-bcc overrides sendemail.bcc ok 3 - commit conflicting change from git ok 88 - patches To headers are used by default ok 4 - commit complementing change from git ok 89 - patches To headers are appended to ok 90 - To headers from files reset each patch ok 91 - setup expect ok 92 - setup expect ok 93 - ASCII subject is not RFC2047 quoted ok 94 - setup expect ok 4 - follow deleted parent ok 95 - asks about and fixes 8bit encodings ok 96 - sendemail.8bitEncoding works ok 97 - --8bit-encoding overrides sendemail.8bitEncoding ok 98 - setup expect ok 99 - setup expect ok 100 - --8bit-encoding also treats subject ok 101 - refusing to send cover letter template ok 5 - dcommit fails to commit because of conflict ok 102 - --force sends cover letter template anyway ok 5 - follow larger parent ok 21 - able to dcommit to a subdirectory ok 103 - sendemail.aliasfiletype=mailrc ok 104 - sendemail.aliasfile=~/.mailrc # passed all 104 test(s) 1..104 *** t9107-git-svn-migrate.sh *** ok 22 - dcommit should not fail with a touched file ok 6 - dcommit does the svn equivalent of an index merge ok 7 - commit another change from svn side ok 23 - rebase should not fail with a touched file ok 6 - follow higher-level parent ok 1 - setup old-looking metadata ok 2 - git-svn-HEAD is a real HEAD ok 3 - initialize old-style (v0) git svn layout ok 24 - able to set-tree to a subdirectory ok 4 - initialize a multi-repository repo ok 8 - multiple dcommit from git svn will not clobber svn ok 9 - check that rebase really failed ok 7 - follow deleted directory ok 10 - resolve, continue the rebase and dcommit # passed all 10 test(s) 1..10 *** t9108-git-svn-glob.sh *** ok 5 - multi-fetch works on partial urls + paths ok 25 - git-svn works in a bare repository ok 6 - migrate --minimize on old inited layout ok 8 - follow-parent avoids deleting relevant info ok 1 - test refspec globbing ok 7 - .rev_db auto-converted to .rev_map.UUID # passed all 7 test(s) 1..7 *** t9109-git-svn-multi-glob.sh *** ok 9 - track initial change if it was only made to parent ok 26 - git-svn works in in a repository with a gitdir: link # passed all 26 test(s) 1..26 *** t9110-git-svn-use-svm-props.sh *** ok 2 - test left-hand-side only globbing ok 3 - test disallow multi-globs # passed all 3 test(s) 1..3 *** t9111-git-svn-use-svnsync-props.sh *** ok 1 - test refspec globbing ok 2 - test left-hand-side only globbing ok 1 - load svm repo ok 2 - verify metadata for /bar ok 3 - verify metadata for /dir/a/b/c/d/e ok 4 - verify metadata for /dir ok 5 - find commit based on SVN revision number ok 1 - load svnsync repo ok 2 - verify metadata for /bar ok 3 - verify metadata for /dir/a/b/c/d/e ok 4 - verify metadata for /dir # passed all 4 test(s) 1..4 *** t9112-git-svn-md5less-file.sh *** ok 1 - load svn dumpfile ok 6 - empty rebase # passed all 6 test(s) 1..6 *** t9113-git-svn-dcommit-new-file.sh *** 1..0 # SKIP skipping svnserve test. (set $SVNSERVE_PORT to enable) *** t9114-git-svn-dcommit-merge.sh *** ok 2 - initialize git svn ok 1 - setup svn repository ok 3 - fetch revisions from svn # passed all 3 test(s) 1..3 *** t9115-git-svn-dcommit-funky-renames.sh *** ok 1 - load repository with strange names ok 2 - setup git mirror and merge ok 3 - verify pre-merge ancestry ok 3 - test another branch ok 4 - test disallow multiple globs # passed all 4 test(s) 1..4 ok 2 - init and fetch repository *** t9116-git-svn-log.sh *** ok 4 - git svn dcommit merges ok 5 - verify post-merge ancestry ok 6 - verify merge commit message # passed all 6 test(s) 1..6 *** t9117-git-svn-init-clone.sh *** ok 10 - follow-parent is atomic ok 3 - create file in existing ugly and empty dir ok 1 - setup svnrepo ok 4 - rename ugly file ok 2 - basic clone ok 3 - clone to target directory ok 11 - track multi-parent paths ok 12 - multi-fetch continues to work ok 4 - clone with --stdlayout ok 5 - rename pretty file ok 5 - clone to target directory with --stdlayout ok 6 - rename pretty file into ugly one ok 6 - init without -s/-T/-b/-t does not warn ok 7 - add a file with plus signs ok 7 - clone without -s/-T/-b/-t does not warn ok 1 - setup repository and import ok 8 - init with -s/-T/-b/-t without --prefix warns ok 9 - clone with -s/-T/-b/-t without --prefix warns ok 2 - run log ok 8 - clone the repository to test rebase ok 3 - run log against a from trunk ok 10 - init with -s/-T/-b/-t and --prefix does not warn ok 4 - test ascending revision range ok 9 - make a commit to test rebase ok 5 - test ascending revision range with --show-commit ok 11 - clone with -s/-T/-b/-t and --prefix does not warn # passed all 11 test(s) 1..11 *** t9118-git-svn-funky-branch-names.sh *** ok 10 - git svn rebase works inside a fresh-cloned repository # passed all 10 test(s) 1..10 *** t9119-git-svn-info.sh *** ok 1 - setup svnrepo 1..0 # SKIP skipping svn-info test (SVN version: 1.8.8 not supported) *** t9120-git-svn-clone-with-percent-escapes.sh *** ok 13 - multi-fetch works off a 'clean' repository # passed all 13 test(s) 1..13 *** t9121-git-svn-fetch-renamed-dir.sh *** ok 1 - setup svnrepo ok 1 - load repository with renamed directory ok 6 - test ascending revision range with --show-commit (sha1) ok 7 - test descending revision range ok 8 - test ascending revision range with unreachable revision ok 2 - test clone with percent escapes ok 3 - svn checkout with percent escapes ok 4 - svn checkout with space ok 2 - init and fetch repository # passed all 2 test(s) 1..2 *** t9122-git-svn-author.sh *** ok 9 - test descending revision range with unreachable revision ok 1 - setup svn repository ok 10 - test ascending revision range with unreachable upper boundary revision and 1 commit ok 5 - test clone trunk with percent escapes and minimize-url ok 11 - test descending revision range with unreachable upper boundary revision and 1 commit ok 6 - test clone trunk with percent escapes ok 12 - test ascending revision range with unreachable lower boundary revision and 1 commit ok 2 - test clone with funky branch names ok 13 - test descending revision range with unreachable lower boundary revision and 1 commit ok 14 - test ascending revision range with unreachable boundary revisions and no commits ok 3 - test dcommit to funky branch ok 15 - test descending revision range with unreachable boundary revisions and no commits ok 7 - test clone --stdlayout with percent escapes ok 16 - test ascending revision range with unreachable boundary revisions and 1 commit ok 4 - test dcommit to scary branch ok 17 - test descending revision range with unreachable boundary revisions and 1 commit # passed all 17 test(s) 1..17 *** t9123-git-svn-rebuild-with-rewriteroot.sh *** ok 2 - interact with it via git svn # passed all 2 test(s) 1..2 *** t9124-git-svn-dcommit-auto-props.sh *** ok 5 - test dcommit to trailing_dotlock branch # passed all 5 test(s) 1..5 *** t9125-git-svn-multi-glob-branch-names.sh *** ok 8 - test clone -s with unescaped space # passed all 8 test(s) 1..8 *** t9126-git-svn-follow-deleted-readded-directory.sh *** ok 1 - setup svnrepo 1..0 # SKIP skipping svnserve test. (set $SVNSERVE_PORT to enable) *** t9127-git-svn-partial-rebuild.sh *** ok 1 - init, fetch and checkout repository ok 2 - remove rev_map ok 1 - initialize git svn ok 2 - enable auto-props config ok 3 - rebuild rev_map ok 1 - initialize svnrepo # passed all 3 test(s) 1..3 *** t9128-git-svn-cmd-branch.sh *** ok 1 - initialize svnrepo ok 2 - test clone with multi-glob in branch names ok 3 - add files matching auto-props ok 4 - disable auto-props config ok 2 - import an early SVN revision into git ok 3 - test dcommit to multi-globbed branch # passed all 3 test(s) 1..3 *** t9129-git-svn-i18n-commitencoding.sh *** ok 2 - import into git ok 5 - add files matching disabled auto-props ok 6 - check resulting svn repository ok 1 - ISO8859-1 setup ok 7 - check renamed file # passed all 7 test(s) 1..7 *** t9130-git-svn-authors-file.sh *** ok 3 - make full git mirror of SVN ok 1 - setup svnrepo ok 2 - eucJP setup ok 4 - fetch from git mirror and partial-rebuild # passed all 4 test(s) 1..4 *** t9131-git-svn-empty-symlink.sh *** ok 1 - load svn dumpfile ok 2 - start import with incomplete authors file ok 3 - imported 2 revisions successfully ok 3 - ISO-2022-JP setup ok 4 - ISO8859-1 commit on git side ok 5 - eucJP commit on git side ok 6 - ISO-2022-JP commit on git side ok 2 - clone using git svn ok 3 - enable broken symlink workaround ok 4 - "bar" is an empty file ok 4 - continues to import once authors have been added ok 7 - ISO8859-1 dcommit to svn ok 5 - get "bar" => symlink fix from svn ok 6 - "bar" becomes a symlink ok 5 - authors-file against globs ok 8 - eucJP dcommit to svn ok 7 - clone using git svn ok 8 - disable broken symlink workaround ok 9 - "bar" is an empty file ok 6 - fetch fails on ee ok 7 - failure happened without negative side effects ok 9 - ISO-2022-JP dcommit to svn ok 10 - get "bar" => symlink fix from svn ok 11 - "bar" does not become a symlink ok 10 - ISO-8859-1 should match UTF-8 in svn ok 11 - eucJP should match UTF-8 in svn ok 8 - fetch continues after authors-file is fixed ok 12 - ISO-2022-JP should match UTF-8 in svn # passed all 12 test(s) 1..12 *** t9132-git-svn-broken-symlink.sh *** ok 12 - clone using git svn ok 13 - "bar" is an empty file ok 1 - load svn dumpfile ok 14 - get "bar" => symlink fix from svn ok 15 - "bar" does not become a symlink # passed all 15 test(s) 1..15 *** t9133-git-svn-nested-git-repo.sh *** ok 2 - clone using git svn ok 3 - "bar" is a symlink that points to "asdf" ok 3 - git svn branch tests ok 9 - fresh clone with svn.authors-file in config # passed all 9 test(s) 1..9 *** t9134-git-svn-ignore-paths.sh *** ok 1 - setup repo with a git repo inside it ok 1 - setup test repository ok 4 - get "bar" => symlink fix from svn ok 5 - "bar" remains a proper symlink # passed all 5 test(s) 1..5 *** t9135-git-svn-moved-branch-empty-file.sh *** ok 1 - load svn dumpfile ok 2 - clone an SVN repo containing a git repo ok 3 - SVN-side change outside of .git ok 2 - clone an SVN repository with ignored www directory ok 4 - update git svn-cloned repo ok 5 - SVN-side change inside of .git ok 3 - init+fetch an SVN repository with ignored www directory ok 4 - verify ignore-paths config saved by clone ok 5 - SVN-side change outside of www ok 6 - update git svn-cloned repo ok 7 - SVN-side change in and out of .git ok 2 - clone using git svn ok 3 - test that b1 exists and is empty # passed all 3 test(s) 1..3 *** t9136-git-svn-recreated-branch-empty-file.sh *** ok 6 - update git svn-cloned repo (config ignore) ok 1 - load svn dumpfile ok 8 - update git svn-cloned repo again # passed all 8 test(s) 1..8 *** t9137-git-svn-dcommit-clobber-series.sh *** ok 7 - update git svn-cloned repo (option ignore) ok 8 - SVN-side change inside of ignored www ok 4 - branch uses correct svn-remote # passed all 4 test(s) 1..4 *** t9138-git-svn-authors-prog.sh *** ok 1 - initialize repo ok 1 - setup svnrepo ok 2 - (supposedly) non-conflicting change from SVN ok 9 - update git svn-cloned repo (config ignore) ok 3 - some unrelated changes to git ok 2 - clone using git svn # passed all 2 test(s) 1..2 *** t9139-git-svn-non-utf8-commitencoding.sh *** ok 10 - update git svn-cloned repo (option ignore) ok 11 - SVN-side change in and out of ignored www ok 2 - import authors with prog and file ok 3 - imported 6 revisions successfully ok 4 - authors-prog ran correctly ok 5 - authors-file overrode authors-prog ok 1 - ISO8859-1 setup ok 12 - update git svn-cloned repo again (config ignore) ok 6 - authors-prog handled special characters in username # passed all 6 test(s) 1..6 *** t9140-git-svn-reset.sh *** ok 4 - change file but in unrelated area ok 2 - eucJP setup ok 3 - ISO8859-1 commit on git side ok 4 - eucJP commit on git side ok 1 - setup test repository ok 5 - attempt to dcommit with a dirty index # passed all 5 test(s) 1..5 *** t9141-git-svn-multiple-branches.sh *** ok 13 - update git svn-cloned repo again (option ignore) # passed all 13 test(s) 1..13 *** t9142-git-svn-shallow-clone.sh *** ok 5 - ISO8859-1 dcommit to svn ok 1 - setup test repository ok 6 - eucJP dcommit to svn # passed all 6 test(s) 1..6 *** t9143-git-svn-gc.sh *** ok 2 - clone SVN repository with hidden directory ok 3 - modify hidden file in SVN repo ok 2 - clone trunk with "-r HEAD" # passed all 2 test(s) 1..2 *** t9144-git-svn-old-rev_map.sh *** ok 1 - setup directories and test repo ok 2 - checkout working copy from svn ok 3 - set some properties to create an unhandled.log file ok 1 - setup svnrepo ok 4 - Setup repo ok 4 - fetch fails on modified hidden file ok 1 - setup test repository with old layout ok 5 - reset unwinds back to r1 ok 5 - Fetch repo ok 6 - make backup copy of unhandled.log ok 7 - create leftover index ok 8 - git svn gc runs ok 9 - git svn index removed ok 10 - git svn gc produces a valid gzip file ok 11 - git svn gc does not change unhandled.log files # passed all 11 test(s) 1..11 *** t9145-git-svn-master-branch.sh *** ok 1 - setup test repository ok 2 - old layout continues to work # passed all 2 test(s) 1..2 *** t9146-git-svn-empty-dirs.sh *** ok 6 - refetch succeeds not ignoring any files # passed all 6 test(s) 1..6 *** t9147-git-svn-include-paths.sh *** ok 2 - git svn clone --stdlayout sets up trunk as master # passed all 2 test(s) 1..2 *** t9150-svk-mergetickets.sh *** ok 1 - setup test repository ok 1 - initialize repo ok 2 - clone an SVN repository with filter to include qqq directory ok 2 - clone ok 3 - empty directories exist ok 3 - init+fetch an SVN repository with included qqq directory ok 4 - verify include-paths config saved by clone ok 5 - SVN-side change outside of www ok 1 - load svk depot ok 2 - svk merges were represented coming in # passed all 2 test(s) 1..2 *** t9151-svn-mergeinfo.sh *** ok 2 - clone multiple branch and tag paths ok 6 - update git svn-cloned repo (config include) ok 4 - option automkdirs set to false ok 5 - more emptiness ok 3 - Multiple branch or tag paths require -d ok 7 - update git svn-cloned repo (option include) ok 6 - git svn rebase creates empty directory ok 8 - SVN-side change inside of ignored www ok 7 - git svn mkdirs recreates empty directories ok 9 - update git svn-cloned repo (config include) ok 8 - git svn mkdirs -r works ok 9 - initialize trunk ok 10 - update git svn-cloned repo (option include) ok 11 - SVN-side change in and out of included qqq ok 12 - update git svn-cloned repo again (config include) ok 10 - clone trunk ok 11 - empty directories in trunk exist ok 12 - remove a top-level directory from svn ok 13 - update git svn-cloned repo again (option include) # passed all 13 test(s) 1..13 *** t9152-svn-empty-dirs-after-gc.sh *** ok 4 - create new branches and tags # passed all 4 test(s) 1..4 ok 1 - initialize repo *** t9153-git-svn-rewrite-uuid.sh *** ok 13 - removed top-level directory does not exist ok 2 - clone ok 1 - load svn repo ok 2 - verify uuid # passed all 2 test(s) 1..2 *** t9154-git-svn-fancy-glob.sh *** ok 3 - git svn gc runs ok 14 - git svn gc-ed files work # passed all 14 test(s) 1..14 *** t9155-git-svn-fetch-deleted-tag.sh *** ok 4 - git svn mkdirs recreates empty directories after git svn gc # passed all 4 test(s) 1..4 *** t9156-git-svn-fetch-deleted-tag-2.sh *** ok 1 - setup svn repo ok 1 - setup svn repo ok 1 - load svn repo ok 2 - add red branch ok 3 - add gre branch ok 4 - add green branch ok 2 - fetch deleted tags from same revision with no checksum error ok 2 - fetch deleted tags from same revision with checksum error # passed all 2 test(s) 1..2 # passed all 2 test(s) 1..2 *** t9157-git-svn-fetch-merge.sh *** *** t9158-git-svn-mergeinfo.sh *** define NO_SVN_TESTS to skip git svn tests ok 1 - initialize source svn repo ok 5 - add all branches # passed all 5 test(s) 1..5 *** t9159-git-svn-no-parent-mergeinfo.sh *** ok 1 - initialize source svn repo ok 1 - load svn dump ok 2 - all svn merges became git merge commits ok 2 - clone svn repo ok 3 - cherry picks did not become git merge commits ok 4 - svn non-merge merge commits did not become git merge commits ok 5 - commit made to merged branch is reachable from the merge ok 6 - merging two branches in one commit is detected correctly not ok 7 - everything got merged in the end # TODO known breakage # still have 1 known breakage(s) # passed all remaining 6 test(s) 1..7 *** t9160-git-svn-preserve-empty-dirs.sh *** define NO_SVN_TESTS to skip git svn tests ok 1 - initialize source svn repo containing empty dirs ok 3 - change svn:mergeinfo ok 4 - verify svn:mergeinfo ok 5 - change svn:mergeinfo multiline ok 6 - verify svn:mergeinfo multiline # passed all 6 test(s) 1..6 *** t9161-git-svn-mergeinfo-push.sh *** ok 2 - clone svn repo ok 3 - verify merge commit # passed all 3 test(s) 1..3 *** t9162-git-svn-dcommit-interactive.sh *** ok 1 - test handling of root commits in merge ranges # passed all 1 test(s) 1..1 *** t9163-git-svn-reset-clears-caches.sh *** ok 2 - clone svn repo with --preserve-empty-dirs ok 3 - directory empty from inception ok 4 - directory empty from subsequent svn commit ok 5 - add entry to previously empty directory ok 6 - remove non-last entry from directory ok 1 - initialize source svn repo ok 1 - initialize repo ok 2 - fetch to merge-base (a) ok 7 - clone svn repo with --placeholder-file specified ok 8 - placeholder namespace conflict with file ok 9 - placeholder namespace conflict with directory ok 2 - answers: y [\n] yes ok 10 - second set of svn commits and rebase ok 11 - flag persistence during subsqeuent rebase ok 12 - placeholder list persistence during subsqeuent rebase # passed all 12 test(s) 1..12 *** t9164-git-svn-dcommit-concurrent.sh *** ok 1 - load svn dump ok 3 - answers: yes yes no ok 1 - setup svn repository ok 2 - check if post-commit hook creates a concurrent commit ok 3 - rebase looses SVN merge (m) ok 3 - check if pre-commit hook fails ok 4 - answers: yes quit ok 2 - propagate merge information ok 3 - check svn:mergeinfo ok 4 - reset and fetch gets the SVN merge (m) correctly # passed all 4 test(s) 1..4 *** t9165-git-svn-fetch-merge-branch-of-branch.sh *** ok 5 - answers: all # passed all 5 test(s) 1..5 *** t9166-git-svn-fetch-merge-branch-of-branch2.sh *** ok 4 - merge another branch ok 5 - check primary parent mergeinfo respected ok 4 - dcommit error handling ok 1 - initialize source svn repo ok 1 - initialize source svn repo ok 6 - merge existing merge ok 7 - check both parents' mergeinfo respected ok 8 - make further commits to branch ok 2 - clone svn repo ok 3 - verify merge commit # passed all 3 test(s) 1..3 *** t9167-git-svn-cmd-branch-subproject.sh *** ok 1 - initialize svnrepo ok 2 - clone svn repo ok 3 - verify merge commit # passed all 3 test(s) 1..3 *** t9200-git-cvsexportcommit.sh *** ok 5 - dcommit concurrent change in non-changed file ok 9 - second forward merge ok 10 - check new mergeinfo added ok 1 - New file ok 2 - import into git ok 2 - Remove two files, add two and update two ok 3 - Fail to change binary more than one generation old ok 11 - reintegration merge ok 12 - check reintegration mergeinfo ok 4 - Remove only binary files ok 5 - Remove only a text file ok 13 - dcommit a merge at the top of a stack ok 6 - New file with spaces in file name # passed all 13 test(s) 1..13 *** t9300-fast-import.sh *** ok 1 - empty stream succeeds ok 2 - A: create pack from stdin ok 3 - A: verify pack ok 4 - A: verify commit ok 5 - A: verify tree ok 6 - A: verify file2 ok 7 - A: verify file3 ok 8 - A: verify file4 ok 9 - A: verify tag/series-A ok 10 - A: verify tag/series-A-blob ok 11 - A: verify marks output ok 12 - A: verify marks import ok 13 - A: tag blob by sha1 ok 14 - A: verify marks import does not crash ok 15 - A: verify pack ok 16 - A: verify diff ok 17 - A: export marks with large values ok 18 - B: fail on invalid blob sha1 ok 19 - B: fail on invalid branch name ".badbranchname" ok 7 - Update file with spaces in file name ok 20 - B: fail on invalid branch name "bad[branch]name" ok 21 - B: accept branch name "TEMP_TAG" ok 22 - B: accept empty committer ok 23 - B: accept and fixup committer with no name ok 24 - B: fail on invalid committer (1) ok 25 - B: fail on invalid committer (2) ok 26 - B: fail on invalid committer (3) ok 27 - B: fail on invalid committer (4) ok 28 - B: fail on invalid committer (5) ok 29 - C: incremental import create pack from stdin ok 30 - C: verify pack ok 31 - C: validate reuse existing blob ok 32 - C: verify commit ok 33 - C: validate rename result ok 34 - D: inline data in commit ok 35 - D: verify pack ok 36 - D: validate new files added ok 37 - D: verify file5 ok 38 - D: verify file6 ok 39 - E: rfc2822 date, --date-format=raw ok 40 - E: rfc2822 date, --date-format=rfc2822 ok 41 - E: verify pack ok 42 - E: verify commit ok 43 - F: non-fast-forward update skips ok 8 - File with non-ascii file name ok 44 - F: verify pack ok 45 - F: verify other commit ok 6 - dcommit concurrent non-conflicting change ok 46 - G: non-fast-forward update forced ok 47 - G: verify pack ok 48 - G: branch changed, but logged ok 9 - Mismatching patch should fail ok 49 - H: deletall, add 1 ok 50 - H: verify pack ok 51 - H: validate old files removed, new files added ok 52 - H: verify file ok 53 - I: export-pack-edges ok 54 - I: verify edge list ok 55 - J: reset existing branch creates empty commit ok 56 - J: branch has 1 commit, empty tree ok 57 - J: tag must fail on empty branch ok 58 - K: reinit branch with from ok 59 - K: verify K^1 = branch^1 ok 60 - L: verify internal tree sorting ok 61 - L: nested tree copy does not corrupt deltas ok 62 - M: rename file in same subdirectory ok 63 - M: rename file to new subdirectory ok 10 - Retain execute bit ok 64 - M: rename subdirectory to new subdirectory ok 65 - M: rename root to subdirectory ok 66 - N: copy file in same subdirectory ok 67 - N: copy then modify subdirectory ok 68 - N: copy dirty subdirectory ok 69 - N: copy directory by id ok 70 - N: read and copy directory ok 71 - N: empty directory reads as missing ok 72 - N: copy root directory by tree hash ok 73 - N: copy root by path ok 74 - N: delete directory by copying ok 11 - -w option should work with relative GIT_DIR ok 75 - N: modify copied tree ok 76 - N: reject foo/ syntax ok 77 - N: reject foo/ syntax in copy source ok 78 - N: reject foo/ syntax in rename source ok 79 - N: reject foo/ syntax in ls argument ok 80 - N: copy to root by id and modify ok 81 - N: extract subtree ok 82 - N: modify subtree, extract it, and modify again ok 83 - O: comments are all skipped ok 84 - O: blank lines not necessary after data commands ok 85 - O: repack before next test ok 86 - O: blank lines not necessary after other commands ok 87 - O: progress outputs as requested by input ok 88 - P: superproject & submodule mix ok 89 - P: verbatim SHA gitlinks ok 90 - P: fail on inline gitlink ok 91 - P: fail on blob mark in gitlink ok 92 - Q: commit notes ok 93 - Q: verify pack ok 94 - Q: verify first commit ok 95 - Q: verify second commit ok 96 - Q: verify third commit ok 97 - Q: verify first notes commit ok 98 - Q: verify first notes tree ok 99 - Q: verify first note for first commit ok 100 - Q: verify first note for second commit ok 101 - Q: verify first note for third commit ok 102 - Q: verify second notes commit ok 103 - Q: verify second notes tree ok 104 - Q: verify second note for first commit ok 105 - Q: verify first note for second commit ok 106 - Q: verify first note for third commit ok 107 - Q: verify third notes commit ok 108 - Q: verify third notes tree ok 109 - Q: verify third note for first commit ok 110 - Q: verify fourth notes commit ok 12 - check files before directories ok 111 - Q: verify fourth notes tree ok 112 - Q: verify second note for second commit ok 113 - Q: deny note on empty branch ok 114 - R: abort on unsupported feature ok 115 - R: supported feature is accepted ok 116 - R: abort on receiving feature after data command ok 117 - R: only one import-marks feature allowed per stream ok 118 - R: export-marks feature results in a marks file being created ok 119 - R: export-marks options can be overridden by commandline options ok 120 - R: catch typo in marks file name ok 121 - R: import and output marks can be the same file ok 122 - R: --import-marks=foo --output-marks=foo to create foo fails ok 123 - R: --import-marks-if-exists ok 124 - R: feature import-marks-if-exists ok 125 - R: import to output marks works without any content ok 126 - R: import marks prefers commandline marks file over the stream ok 127 - R: multiple --import-marks= should be honoured ok 128 - R: feature relative-marks should be honoured ok 129 - R: feature no-relative-marks should be honoured ok 130 - R: feature ls supported ok 131 - R: feature cat-blob supported ok 132 - R: cat-blob-fd must be a nonnegative integer ok 133 - R: print old blob ok 134 - R: in-stream cat-blob-fd not respected ok 135 - R: print new blob ok 136 - R: print new blob by sha1 ok 137 - setup: big file ok 138 - R: print two blobs to stdout ok 139 - R: copy using cat-file ok 140 - R: print blob mid-commit ok 3 - git svn branch tests # passed all 3 test(s) 1..3 ok 141 - R: print staged blob within commit ok 142 - R: quiet option results in no stats being output *** t9301-fast-import-notes.sh *** ok 13 - re-commit a removed filename which remains in CVS attic ok 143 - R: feature done means terminating "done" is mandatory ok 144 - R: terminating "done" with trailing gibberish is ok ok 1 - set up master branch ok 145 - R: terminating "done" within commit ok 146 - R: die on unknown option ok 147 - R: unknown commandline options are rejected ok 2 - add notes with simple M command ok 148 - R: die on invalid option argument ok 3 - add notes with simple N command ok 149 - R: ignore non-git options ok 4 - update existing notes with N command ok 5 - add concatentation notes with M command ok 6 - verify that deleteall also removes notes ok 7 - verify that later N commands override earlier M commands ok 14 - commit a file with leading spaces in the name ok 150 - R: blob bigger than threshold ok 151 - R: verify created pack ok 152 - R: verify written objects ok 153 - R: blob appears only once ok 154 - S: initialize for S tests ok 155 - S: filemodify with garbage after mark must fail ok 156 - S: filemodify with garbage after inline must fail ok 157 - S: filemodify with garbage after sha1 must fail ok 158 - S: notemodify with garabge after mark dataref must fail ok 159 - S: notemodify with garbage after inline dataref must fail ok 160 - S: notemodify with garbage after sha1 dataref must fail ok 161 - S: notemodify with garbarge after mark commit-ish must fail ok 7 - dcommit --no-rebase concurrent non-conflicting change ok 162 - S: from with garbage after mark must fail ok 163 - S: merge with garbage after mark must fail ok 164 - S: tag with garbage after mark must fail ok 165 - S: cat-blob with garbage after mark must fail ok 166 - S: ls with garbage after mark must fail ok 167 - S: ls with garbage after sha1 must fail ok 168 - T: ls root tree # passed all 168 test(s) 1..168 *** t9350-fast-export.sh *** ok 15 - use the same checkout for Git and CVS # passed all 15 test(s) 1..15 ok 1 - setup *** t9400-git-cvsserver-server.sh *** ok 2 - fast-export | fast-import ok 3 - fast-export master~2..master ok 4 - iso-8859-1 ok 5 - import/export-marks ok 6 - set up faked signed tag ok 7 - signed-tags=abort ok 8 - signed-tags=verbatim ok 9 - signed-tags=strip ok 10 - signed-tags=warn-strip ok 1 - setup ok 11 - setup submodule ok 2 - basic checkout ok 3 - pserver authentication ok 12 - submodule fast-export | fast-import ok 4 - pserver authentication failure (non-anonymous user) ok 5 - pserver authentication success (non-anonymous user with password) ok 13 - setup copies ok 6 - pserver authentication (login) ok 14 - fast-export -C -C | fast-import ok 15 - fast-export | fast-import when master is tagged ok 7 - pserver authentication failure (login/non-anonymous user) ok 16 - cope with tagger-less tags ok 17 - setup for limiting exports by PATH ok 18 - dropping tag of filtered out object ok 8 - req_Root failure (relative pathname) ok 19 - rewriting tag of filtered out object not ok 20 - no exact-ref revisions included # TODO known breakage ok 21 - path limiting with import-marks does not lose unmodified files ok 22 - full-tree re-shows unmodified files ok 9 - req_Root failure (conflicting roots) ok 23 - set-up a few more tags for tag export tests ok 24 - tree_tag ok 25 - tree_tag-obj ok 26 - tag-obj_tag ok 27 - tag-obj_tag-obj ok 10 - req_Root (strict paths) ok 11 - req_Root failure (strict-paths) ok 28 - directory becomes symlink ok 29 - fast-export quotes pathnames ok 12 - req_Root (w/o strict-paths) ok 30 - test bidirectionality ok 31 - avoid uninteresting refs ok 13 - req_Root failure (w/o strict-paths) ok 32 - refs are updated even if no commits need to be exported # still have 1 known breakage(s) # passed all remaining 31 test(s) 1..32 *** t9401-git-cvsserver-crlf.sh *** ok 14 - req_Root (base-path) ok 15 - req_Root failure (base-path) ok 1 - setup ok 16 - req_Root (export-all) ok 17 - req_Root failure (export-all w/o whitelist) ok 8 - add lots of commits and notes ok 18 - req_Root (everything together) ok 19 - gitcvs.enabled = false ok 9 - verify that lots of notes trigger a fanout scheme ok 20 - gitcvs.ext.enabled = true ok 2 - cvs co (default crlf) ok 10 - verify that non-notes are untouched by a fanout change ok 11 - change a few existing notes ok 21 - gitcvs.ext.enabled = false ok 3 - cvs co (allbinary) ok 12 - verify that changing notes respect existing fanout ok 22 - gitcvs.dbname ok 23 - gitcvs.ext.dbname ok 4 - cvs co (use attributes/allbinary) ok 8 - dcommit fails on concurrent conflicting change # passed all 8 test(s) 1..8 *** t9402-git-cvsserver-refs.sh *** ok 24 - cvs update (create new file) ok 5 - cvs co (use attributes) ok 1 - setup v1, b1 ok 25 - cvs update (update existing file) ok 13 - remove lots of notes ok 14 - verify that removing notes trigger fanout consolidation ok 15 - verify that non-notes are untouched by a fanout change not ok 26 - cvs update w/o -d doesn't create subdir (TODO) # TODO known breakage ok 2 - cvs co v1 ok 6 - adding files ok 16 - add notes to 16 commits in each of 10 refs # passed all 16 test(s) 1..16 *** t9500-gitweb-standalone-no-errors.sh *** ok 27 - cvs update (subdirectories) ok 3 - cvs co b1 ok 1 - no commits: projects_list (implicit) ok 7 - updating ok 2 - no commits: projects_index ok 28 - cvs update (delete file) ok 3 - no commits: .git summary (implicit) ok 4 - no commits: .git commit (implicit HEAD) ok 4 - cvs co b1 [cvswork3] ok 5 - no commits: .git commitdiff (implicit HEAD) ok 29 - cvs update (re-add deleted file) ok 6 - no commits: .git tree (implicit HEAD) ok 8 - cvs co (use attributes/guess) ok 9 - setup multi-line files ok 7 - no commits: .git heads ok 8 - no commits: .git tags ok 9 - Make initial commit ok 10 - projects_list (implicit) ok 11 - projects_index ok 5 - edit cvswork3 and save diff ok 10 - cvs co (guess) ok 6 - setup v1.2 on b1 ok 30 - cvs update (merge) ok 12 - .git summary (implicit) ok 13 - .git commit (implicit HEAD) ok 14 - .git commitdiff (implicit HEAD, root commit) ok 31 - cvs update (conflict merge) ok 15 - .git commitdiff_plain (implicit HEAD, root commit) ok 7 - cvs -f up (on b1 adir) ok 16 - .git commit (HEAD) ok 11 - cvs co another copy (guess) ok 17 - .git tree (implicit HEAD) ok 32 - cvs update (-C) ok 8 - cvs up (on b1 /) ok 18 - .git blob (file) ok 19 - .git blob_plain (file) ok 20 - .git commit (non-existent) ok 9 - cvs up (on b1 /) (again; check CVS/Tag files) ok 21 - .git commitdiff (non-existent) ok 22 - .git commitdiff (non-existent vs HEAD) ok 33 - cvs update (merge no-op) ok 23 - .git tree (0000000000000000000000000000000000000000) ok 24 - .git tag (0000000000000000000000000000000000000000) ok 10 - cvs up -r v1 ok 25 - .git blob (non-existent) ok 26 - .git blob_plain (non-existent) ok 11 - cvs up ok 27 - commitdiff(0): root ok 28 - commitdiff(0): file added ok 12 - cvs up (again; check CVS/Tag files) ok 13 - setup simple b2 ok 12 - cvs status - sticky options ok 29 - commitdiff(0): mode change ok 34 - cvs update (-p) ok 13 - add text (guess) ok 35 - cvs update (module list supports packed refs) ok 30 - commitdiff(0): file renamed ok 14 - add bin (guess) ok 14 - cvs co b2 [into cvswork2] ok 31 - commitdiff(0): file to symlink ok 32 - commitdiff(0): file deleted ok 33 - commitdiff(0): file copied / new file ok 36 - cvs status ok 15 - root dir edit [cvswork2] ok 15 - remove files (guess) ok 34 - commitdiff(0): mode change and modified ok 37 - cvs status (nonrecursive) ok 38 - cvs status (no subdirs in header) ok 35 - commitdiff(0): renamed and modified ok 39 - cvs co -c (shows module database) ok 36 - commitdiff(0): renamed, mode change and modified ok 40 - cvs log ok 37 - setup typechange commits ok 38 - commitdiff(2): file renamed from foo to foo/baz ok 16 - cvs ci (guess) ok 41 - cvs annotate # still have 1 known breakage(s) # passed all remaining 40 test(s) 1..41 *** t9501-gitweb-standalone-http-status.sh *** ok 39 - commitdiff(2): file renamed from foo/baz to foo ok 16 - root dir rm file [cvswork2] ok 17 - update subdir of other copy (guess) ok 1 - setup ok 40 - commitdiff(2): directory becomes file ok 41 - commitdiff(2): file becomes directory ok 42 - commitdiff(2): file becomes symlink ok 2 - snapshots: tgz only default format enabled ok 43 - commitdiff(2): symlink becomes file ok 18 - update/merge full other copy (guess) # passed all 18 test(s) 1..18 *** t9502-gitweb-standalone-parse-output.sh *** ok 44 - commitdiff(2): symlink becomes directory ok 1 - setup ok 45 - commitdiff(2): directory becomes symlink ok 46 - setup incomplete lines ok 2 - snapshot: full sha1 ok 47 - commitdiff(1): addition of incomplete line ok 3 - snapshot: shortened sha1 ok 48 - commitdiff(1): incomplete line as context line ok 3 - snapshots: all enabled in default, use default disabled value ok 49 - commitdiff(1): change incomplete line ok 4 - snapshot: almost full sha1 ok 4 - snapshots: zip explicitly disabled ok 5 - snapshot: HEAD ok 50 - commitdiff(1): removal of incomplete line ok 51 - Create a merge ok 5 - snapshots: tgz explicitly enabled ok 6 - snapshot: short branch name (master) ok 52 - commit(0): merge commit ok 6 - snapshots: good tree-ish id ok 7 - snapshot: short tag name (first) ok 7 - snapshots: bad tree-ish id ok 53 - commitdiff(0): merge commit ok 54 - Prepare large commit ok 8 - snapshot: full branch name (refs/heads/master) ok 8 - snapshots: bad tree-ish id (tagged object) ok 9 - snapshot: full tag name (refs/tags/first) ok 55 - commit(1): large commit ok 9 - snapshots: good object id ok 10 - snapshot: hierarchical branch name (xx/test) ok 10 - snapshots: bad object id ok 11 - forks: setup ok 56 - commitdiff(1): large commit ok 11 - modification: feed last-modified ok 12 - forks: not skipped unless "forks" feature enabled ok 57 - side-by-side: addition of incomplete line ok 12 - modification: feed if-modified-since (modified) ok 13 - forks: forks skipped if "forks" feature enabled ok 58 - side-by-side: incomplete line as context line ok 13 - modification: feed if-modified-since (unmodified) ok 17 - subdir edit/add/rm files [cvswork2] ok 59 - side-by-side: changed incomplete line ok 14 - forks: "forks" action for forked repository ok 14 - modification: snapshot last-modified ok 18 - validate result of edits [cvswork2] ok 15 - forks: can access forked repository ok 60 - side-by-side: removal of incomplete line ok 19 - validate basic diffs saved during above cvswork2 edits ok 20 - validate v1.2 diff saved during last cvswork2 edit ok 15 - modification: snapshot if-modified-since (modified) ok 16 - forks: project_index lists all projects (incl. forks) ok 21 - validate v1.2 v1 diff saved during last cvswork2 edit ok 61 - side-by-side: merge commit ok 16 - modification: snapshot if-modified-since (unmodified) ok 17 - xss checks # passed all 17 test(s) 1..17 *** t9600-cvsimport.sh *** ok 1 - setup cvsroot environment ok 2 - setup cvsroot ok 22 - cvs up [cvswork2] ok 62 - tags: list of different types of tags ok 17 - modification: tree snapshot ok 63 - tag: Tag to commit object ok 18 - load checking: load too high (default action) ok 3 - setup a cvs module ok 64 - tag: on lightweight tag (invalid) ok 19 - invalid arguments: invalid regexp (in project search) # passed all 19 test(s) 1..19 *** t9601-cvsimport-vendor-branch.sh *** ok 65 - logs: log (implicit HEAD) ok 4 - import a trivial module ok 5 - pack refs ok 6 - initial import has correct .git/cvs-revisions ok 23 - cvs up -r b2 [back to cvswork] ok 66 - logs: shortlog (implicit HEAD) ok 7 - update cvs module ok 67 - logs: history (implicit HEAD, file) ok 68 - logs: history (implicit HEAD, non-existent file) ok 8 - update git module ok 9 - update has correct .git/cvs-revisions ok 1 - import a module with a vendor branch ok 10 - update cvs module ok 69 - logs: history (implicit HEAD, deleted file) ok 2 - check HEAD out of cvs repository ok 3 - check master out of git repository ok 4 - check a file that was imported once not ok 5 - check a file that was imported twice # TODO known breakage ok 6 - check a file that was imported then modified on HEAD ok 7 - check a file that was imported, modified, then imported again ok 8 - check a file that was added to HEAD then imported ok 9 - a vendor branch whose tag has been removed ok 11 - cvsimport.module config works # still have 1 known breakage(s) # passed all remaining 8 test(s) 1..9 ok 70 - path_info: project ok 12 - second update has correct .git/cvs-revisions *** t9602-cvsimport-branches-tags.sh *** ok 24 - cvs up -r b1 ok 71 - path_info: project/branch ok 72 - path_info: project/branch:file ok 73 - path_info: project/branch:dir/ ok 74 - path_info: project/branch (non-existent) ok 13 - import from a CVS working tree ok 14 - no .git/cvs-revisions created by default ok 25 - cvs up -A ok 15 - test entire HEAD # passed all 15 test(s) 1..15 *** t9603-cvsimport-patchsets.sh *** ok 75 - path_info: project/branch:filename (non-existent branch) ok 26 - cvs up (check CVS/Tag files) ok 76 - path_info: project/branch:file (non-existent) ok 77 - path_info: project/branch:dir/ (non-existent) ok 78 - path_info: project/branch:/file ok 79 - path_info: project/:/file (implicit HEAD) ok 1 - import module ok 80 - path_info: project/:/ (implicit HEAD, top tree) not ok 1 - import with criss cross times on revisions # TODO known breakage ok 27 - cvs up -r heads/b1 # still have 1 known breakage(s) 1..1 *** t9604-cvsimport-timestamps.sh *** ok 81 - feeds: OPML ok 2 - test branch master ok 3 - test branch vendorbranch not ok 4 - test branch B_FROM_INITIALS # TODO known breakage ok 82 - feed: RSS not ok 5 - test branch B_FROM_INITIALS_BUT_ONE # TODO known breakage ok 28 - cvs up -r heads_-s-b2 (cvsserver escape mechanism) ok 83 - feed: Atom not ok 6 - test branch B_MIXED # TODO known breakage ok 84 - encode(commit): utf8 ok 7 - test branch B_SPLIT ok 85 - encode(commit): iso-8859-1 not ok 8 - test tag vendortag # TODO known breakage ok 29 - cvs up -r $(git rev-parse v1) ok 86 - encode(log): utf-8 and iso-8859-1 ok 1 - check timestamps are UTC (TZ=CST6CDT) ok 9 - test tag T_ALL_INITIAL_FILES ok 30 - cvs diff -r v1 -u not ok 10 - test tag T_ALL_INITIAL_FILES_BUT_ONE # TODO known breakage ok 87 - opt: log --no-merges not ok 11 - test tag T_MIXED # TODO known breakage # still have 6 known breakage(s) # passed all remaining 5 test(s) 1..11 *** t9700-perl-git.sh *** ok 88 - opt: atom --no-merges ok 31 - cvs diff -N -r v2 -u ok 1 - set up test repository # run 1: Perl API (perl /<>/t/t9700/test.pl) ok 89 - opt: "file" history --no-merges 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 90 - opt: log --no-such-option (invalid option) 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 1..44 # test_external test Perl API was ok # test_external_without_stderr test no stderr: Perl API was ok *** t9800-git-p4-basic.sh *** ok 91 - opt: tree --no-merges (invalid option for action) 1..0 # SKIP skipping git p4 tests; python not available *** t9801-git-p4-branch.sh *** 1..0 # SKIP skipping git p4 tests; python not available *** t9802-git-p4-filetype.sh *** 1..0 # SKIP skipping git p4 tests; python not available *** t9803-git-p4-shell-metachars.sh *** 1..0 # SKIP skipping git p4 tests; python not available *** t9804-git-p4-label.sh *** 1..0 # SKIP skipping git p4 tests; python not available *** t9805-git-p4-skip-submit-edit.sh *** ok 2 - check timestamps with author-specific timezones # passed all 2 test(s) 1..2 1..0 # SKIP skipping git p4 tests; python not available ok 32 - cvs diff -N -r v2 -r v1.2 *** t9806-git-p4-options.sh *** ok 92 - URL: no project URLs, no base URL *** t9807-git-p4-submit.sh *** 1..0 # SKIP skipping git p4 tests; python not available *** t9808-git-p4-chdir.sh *** 1..0 # SKIP skipping git p4 tests; python not available *** t9809-git-p4-client-view.sh *** ok 33 - apply early [cvswork3] diff to b3 1..0 # SKIP skipping git p4 tests; python not available *** t9810-git-p4-rcs.sh *** 1..0 # SKIP skipping git p4 tests; python not available *** t9811-git-p4-label-import.sh *** 1..0 # SKIP skipping git p4 tests; python not available *** t9812-git-p4-wildcards.sh *** 1..0 # SKIP skipping git p4 tests; python not available *** t9813-git-p4-preserve-users.sh *** 1..0 # SKIP skipping git p4 tests; python not available 1..0 # SKIP skipping git p4 tests; python not available *** t9814-git-p4-rename.sh *** *** t9815-git-p4-submit-fail.sh *** 1..0 # SKIP skipping git p4 tests; python not available *** t9816-git-p4-locked.sh *** ok 93 - URL: project URLs via gitweb.url 1..0 # SKIP skipping git p4 tests; python not available 1..0 # SKIP skipping git p4 tests; python not available *** t9901-git-web--browse.sh *** *** t9902-completion.sh *** ok 1 - URL with an ampersand in it ok 2 - URL with a semi-colon in it ok 1 - setup for __gitdir tests ok 2 - __gitdir - from command line (through $__git_dir) ok 3 - __gitdir - repo as argument ok 4 - __gitdir - remote as argument ok 5 - __gitdir - .git directory in cwd ok 34 - check [cvswork3] diff ok 6 - __gitdir - .git directory in parent ok 3 - URL with a hash in it ok 7 - __gitdir - cwd is a .git directory ok 8 - __gitdir - parent is a .git directory ok 9 - __gitdir - $GIT_DIR set while .git directory in cwd ok 4 - browser paths are properly quoted ok 10 - __gitdir - $GIT_DIR set while .git directory in parent ok 11 - __gitdir - non-existing $GIT_DIR ok 94 - URL: project URLs via cloneurl file ok 12 - __gitdir - gitfile in cwd ok 13 - __gitdir - gitfile in parent ok 5 - browser command allows arbitrary shell code # passed all 5 test(s) 1..5 ok 35 - merge early [cvswork3] b3 with b1 ok 14 - __gitdir - resulting path avoids symlinks ok 15 - __gitdir - not a git repository *** t9903-bash-prompt.sh *** ok 16 - __gitcomp - trailing space - options ok 17 - __gitcomp - trailing space - config keys ok 18 - __gitcomp - option parameter ok 19 - __gitcomp - prefix ok 20 - __gitcomp - suffix ok 21 - __gitcomp - doesnt fail because of invalid variable name ok 22 - __gitcomp_nl - trailing space ok 23 - __gitcomp_nl - prefix ok 24 - __gitcomp_nl - suffix ok 95 - config override: projects list (implicit) ok 25 - __gitcomp_nl - no suffix ok 26 - __gitcomp_nl - doesnt fail because of invalid variable name ok 27 - basic ok 28 - double dash "git" itself ok 29 - double dash "git checkout" ok 1 - setup for prompt tests ok 2 - prompt - branch name ok 30 - general options ok 96 - config override: tree view, features not overridden in repo config ok 3 - prompt - branch name - symlink symref ok 4 - prompt - unborn branch ok 5 - prompt - with newline in path ok 6 - prompt - detached head ok 31 - general options plus command ok 7 - prompt - describe detached head - contains ok 97 - config override: tree view, features disabled in repo config ok 32 - git --help completion ok 33 - setup for ref completion ok 8 - prompt - describe detached head - branch ok 34 - checkout completes ref names ok 35 - show completes all refs ok 9 - prompt - describe detached head - describe ok 36 - : completes paths ok 37 - complete tree filename with spaces ok 10 - prompt - describe detached head - default ok 11 - prompt - inside .git directory ok 12 - prompt - deep inside .git directory ok 38 - complete tree filename with metacharacters ok 13 - prompt - inside bare repository ok 39 - send-email ok 98 - config override: tree view, features enabled in repo config (1) ok 99 - config override: tree view, features enabled in repo config (2) ok 100 - search: preparation ok 101 - search: commit author ok 14 - prompt - interactive rebase ok 102 - search: commit message ok 40 - complete files ok 36 - cvs up dirty [cvswork3] not ok 41 - complete with tilde expansion # TODO known breakage # still have 1 known breakage(s) # passed all remaining 40 test(s) 1..41 ok 103 - search: grep ok 15 - prompt - rebase merge ok 104 - search: pickaxe ok 105 - search: projects ok 16 - prompt - rebase ok 37 - cvs commit [cvswork3] # passed all 37 test(s) 1..37 ok 17 - prompt - merge ok 18 - prompt - cherry-pick ok 106 - README.html with non-ASCII characters (utf-8) Skipping syntax highlighting tests: 'highlight' not found ok 107 # skip syntax highlighting (no highlight, unknown syntax) (missing HIGHLIGHT) ok 108 # skip syntax highlighting (highlighted, shell script) (missing HIGHLIGHT) ok 109 - forks: prepare ok 19 - prompt - bisect ok 20 - prompt - dirty status indicator - clean ok 21 - prompt - dirty status indicator - dirty worktree ok 22 - prompt - dirty status indicator - dirty index ok 110 - forks: projects list ok 23 - prompt - dirty status indicator - dirty index and worktree ok 24 - prompt - dirty status indicator - before root commit ok 25 - prompt - dirty status indicator - shell variable unset with config disabled ok 26 - prompt - dirty status indicator - shell variable unset with config enabled ok 27 - prompt - dirty status indicator - shell variable set with config disabled ok 111 - forks: forks action ok 28 - prompt - dirty status indicator - shell variable set with config enabled ok 29 - prompt - dirty status indicator - not shown inside .git directory ok 30 - prompt - stash status indicator - no stash ok 112 - ctags: tag cloud in projects list ok 31 - prompt - stash status indicator - stash ok 113 - ctags: search projects by existing tag ok 32 - prompt - stash status indicator - not shown inside .git directory ok 33 - prompt - untracked files status indicator - no untracked files ok 34 - prompt - untracked files status indicator - untracked files ok 35 - prompt - untracked files status indicator - shell variable unset with config disabled ok 36 - prompt - untracked files status indicator - shell variable unset with config enabled ok 37 - prompt - untracked files status indicator - shell variable set with config disabled ok 38 - prompt - untracked files status indicator - shell variable set with config enabled ok 39 - prompt - untracked files status indicator - not shown inside .git directory ok 40 - prompt - format string starting with dash ok 41 - prompt - pc mode ok 114 - ctags: search projects by non existent tag ok 42 - prompt - bash color pc mode - branch name ok 43 - prompt - bash color pc mode - detached head ok 44 - prompt - bash color pc mode - dirty status indicator - dirty worktree ok 45 - prompt - bash color pc mode - dirty status indicator - dirty index ok 46 - prompt - bash color pc mode - dirty status indicator - dirty index and worktree ok 47 - prompt - bash color pc mode - dirty status indicator - before root commit ok 48 - prompt - bash color pc mode - inside .git directory ok 115 - ctags: malformed tag weights ok 116 - categories: projects list, only default category ok 49 - prompt - bash color pc mode - stash status indicator ok 50 - prompt - bash color pc mode - untracked files status indicator ok 51 - prompt - zsh color pc mode # passed all 51 test(s) 1..51 ok 117 - unborn HEAD: "summary" page (with "heads" subview) # passed all 117 test(s) 1..117 /usr/bin/make aggregate-results make[4]: Entering directory `/<>/t' for f in 'test-results'/t*-*.counts; do \ echo "$f"; \ done | '/bin/sh' ./aggregate-results.sh fixed 0 success 11591 failed 0 broken 101 total 11757 make[4]: Leaving directory `/<>/t' /usr/bin/make clean make[4]: Entering directory `/<>/t' rm -f -r 'trash directory'.* 'test-results' rm -f -r valgrind/bin rm -f .prove make[4]: Leaving directory `/<>/t' make[3]: Leaving directory `/<>/t' make[2]: Leaving directory `/<>/t' make[1]: Leaving directory `/<>' test -z 'test' || \ DESTDIR='/<>/debian/git' /usr/bin/make -C contrib/subtree test 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 NO_PYTHON=1 USE_SRV_RR=1 USE_LIBPCRE=1 THREADED_DELTA_SEARCH=1 NO_CROSS_DIRECTORY_HARDLINKS=1 NO_INSTALL_HARDLINKS=1 DEFAULT_PAGER=pager DEFAULT_EDITOR=editor CC='gcc' CFLAGS='-Wall -g -O2 -fstack-protector --param=ssp-buffer-size=4 -Wformat -Werror=format-security -D_FORTIFY_SOURCE=2' LDFLAGS='-Wl,-Bsymbolic-functions -Wl,-z,relro' || \ GIT_TEST_OPTS=--verbose DESTDIR='/<>/debian/git' /usr/bin/make -C contrib/subtree test 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 NO_PYTHON=1 USE_SRV_RR=1 USE_LIBPCRE=1 THREADED_DELTA_SEARCH=1 NO_CROSS_DIRECTORY_HARDLINKS=1 NO_INSTALL_HARDLINKS=1 DEFAULT_PAGER=pager DEFAULT_EDITOR=editor CC='gcc' CFLAGS='-Wall -g -O2 -fstack-protector --param=ssp-buffer-size=4 -Wformat -Werror=format-security -D_FORTIFY_SOURCE=2' LDFLAGS='-Wl,-Bsymbolic-functions -Wl,-z,relro' make[1]: Entering directory `/<>/contrib/subtree' /usr/bin/make -C t/ test make[2]: Entering directory `/<>/contrib/subtree/t' rm -f -r test-results /usr/bin/make aggregate-results-and-cleanup make[3]: Entering directory `/<>/contrib/subtree/t' *** t7900-subtree.sh *** ok 1 - init subproj ok 2 - add sub1 ok 3 - add sub2 ok 4 - add sub3 ok 5 - add main4 ok 6 - fetch subproj history ok 7 - no subtree exists in main tree ok 8 - no pull from non-existant subtree ok 9 - check if --message works for add ok 10 - check if --message works as -m and --prefix as -P ok 11 - check if --message works with squash too ok 12 - add subproj to mainline ok 13 - merge fetched subproj ok 14 - add main-sub5 ok 15 - add main6 ok 16 - add main-sub7 ok 17 - fetch new subproj history ok 18 - check if --message works for merge ok 19 - check if --message for merge works with squash too ok 20 - merge new subproj history into subdir ok 21 - Check that prefix argument is required for split ok 22 - Check that the exists for a split ok 23 - check if --message works for split+rejoin ok 24 - check split with --branch ok 25 - check hash of split ok 26 - check split with --branch for an existing branch ok 27 - check split with --branch for an incompatible branch ok 28 - check split+rejoin ok 29 - add main-sub8 ok 30 - merge split into subproj ok 31 - add sub9 ok 32 - split for sub8 ok 33 - add main-sub10 ok 34 - split for sub10 ok 35 - merge split into subproj ok 36 - make sure exactly the right set of files ends up in the subproj ok 37 - make sure the subproj history *only* contains commits that affect the subdir ok 38 - pull from subproj ok 39 - make sure exactly the right set of files ends up in the mainline ok 40 - make sure each filename changed exactly once in the entire history ok 41 - make sure the --rejoin commits never make it into subproj ok 42 - make sure no "git subtree" tagged commits make it into subproj ok 43 - init main ok 44 - add main1 ok 45 - init sub ok 46 - add sub2 ok 47 - add sub as subdir in main ok 48 - add sub3 ok 49 - merge from sub ok 50 - add main-sub4 ok 51 - split for main-sub4 without --onto ok 52 - check that the commit parent is sub3 ok 53 - add main-sub5 ok 54 - split for main-sub5 without --onto ok 55 - verify one file change per commit # passed all 55 test(s) 1..55 /usr/bin/make aggregate-results make[4]: Entering directory `/<>/contrib/subtree/t' for f in ../../../t/test-results/t*-*.counts; do \ echo "$f"; \ done | '/bin/sh' ../../../t/aggregate-results.sh fixed 0 success 55 failed 0 broken 0 total 55 make[4]: Leaving directory `/<>/contrib/subtree/t' /usr/bin/make clean make[4]: Entering directory `/<>/contrib/subtree/t' rm -f -r 'trash directory'.* test-results rm -f -r valgrind/bin rm -f .prove make[4]: Leaving directory `/<>/contrib/subtree/t' make[3]: Leaving directory `/<>/contrib/subtree/t' make[2]: Leaving directory `/<>/contrib/subtree/t' make[1]: Leaving directory `/<>/contrib/subtree' touch build-arch-stamp fakeroot debian/rules binary-arch # git rm -rf '/<>/debian/git' install -d -m0755 '/<>/debian/git'/usr/bin DESTDIR='/<>/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 NO_PYTHON=1 USE_SRV_RR=1 USE_LIBPCRE=1 THREADED_DELTA_SEARCH=1 NO_CROSS_DIRECTORY_HARDLINKS=1 NO_INSTALL_HARDLINKS=1 DEFAULT_PAGER=pager DEFAULT_EDITOR=editor CC='gcc' CFLAGS='-Wall -g -O2 -fstack-protector --param=ssp-buffer-size=4 -Wformat -Werror=format-security -D_FORTIFY_SOURCE=2' LDFLAGS='-Wl,-Bsymbolic-functions -Wl,-z,relro' make[1]: Entering directory `/<>' GEN perl/PM.stamp make[2]: Entering directory `/<>/gitweb' make[3]: Entering directory `/<>' make[3]: `GIT-VERSION-FILE' is up to date. make[3]: Leaving directory `/<>' make[2]: Leaving directory `/<>/gitweb' GEN git-instaweb make[2]: Entering directory `/<>/git-gui' make[2]: Leaving directory `/<>/git-gui' make[2]: Entering directory `/<>/gitk-git' make[2]: Leaving directory `/<>/gitk-git' make[2]: Entering directory `/<>/perl' make[3]: Entering directory `/<>/perl' make[3]: Leaving directory `/<>/perl' make[2]: Leaving directory `/<>/perl' make[2]: Entering directory `/<>/templates' make[2]: Leaving directory `/<>/templates' install -d -m 755 '/<>/debian/git/usr/bin' install -d -m 755 '/<>/debian/git/usr/lib/git-core' install git-credential-store git-daemon git-fast-import git-http-backend git-imap-send git-sh-i18n--envsubst git-shell git-show-index git-upload-pack 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-am git-bisect git-difftool--helper git-filter-branch git-merge-octopus git-merge-one-file git-merge-resolve git-mergetool git-pull git-quiltimport git-rebase git-request-pull git-stash git-submodule git-web--browse git-add--interactive git-difftool git-archimport git-cvsexportcommit git-cvsimport git-cvsserver git-relink git-send-email git-svn git-p4 git-instaweb '/<>/debian/git/usr/lib/git-core' install -m 644 git-mergetool--lib git-parse-remote git-rebase--am git-rebase--interactive git-rebase--merge git-sh-setup git-sh-i18n '/<>/debian/git/usr/lib/git-core' install git git-upload-pack git-receive-pack git-upload-archive git-shell git-cvsserver '/<>/debian/git/usr/bin' /usr/bin/make -C templates DESTDIR='/<>/debian/git' install make[2]: Entering directory `/<>/templates' install -d -m 755 '/<>/debian/git/usr/share/git-core/templates' (cd blt && tar cf - .) | \ (cd '/<>/debian/git/usr/share/git-core/templates' && umask 022 && tar xof -) make[2]: Leaving directory `/<>/templates' install -d -m 755 '/<>/debian/git/usr/lib/git-core/mergetools' install -m 644 mergetools/* '/<>/debian/git/usr/lib/git-core/mergetools' install -d -m 755 '/<>/debian/git/usr/share/locale' (cd po/build/locale && tar cf - .) | \ (cd '/<>/debian/git/usr/share/locale' && umask 022 && tar xof -) /usr/bin/make -C perl prefix='/usr' DESTDIR='/<>/debian/git' install make[2]: Entering directory `/<>/perl' make[3]: Entering directory `/<>/perl' Installing /<>/debian/git/usr/share/perl5/Git.pm Installing /<>/debian/git/usr/share/perl5/Error.pm Installing /<>/debian/git/usr/share/perl5/Git/SVN.pm Installing /<>/debian/git/usr/share/perl5/Git/IndexInfo.pm Installing /<>/debian/git/usr/share/perl5/Git/I18N.pm Installing /<>/debian/git/usr/share/perl5/Git/SVN/Migration.pm Installing /<>/debian/git/usr/share/perl5/Git/SVN/Fetcher.pm Installing /<>/debian/git/usr/share/perl5/Git/SVN/Ra.pm Installing /<>/debian/git/usr/share/perl5/Git/SVN/Utils.pm Installing /<>/debian/git/usr/share/perl5/Git/SVN/GlobSpec.pm Installing /<>/debian/git/usr/share/perl5/Git/SVN/Prompt.pm Installing /<>/debian/git/usr/share/perl5/Git/SVN/Editor.pm Installing /<>/debian/git/usr/share/perl5/Git/SVN/Log.pm Installing /<>/debian/git/usr/share/perl5/Git/SVN/Memoize/YAML.pm Installing /<>/debian/git/usr/share/man/man3/Git.3pm Installing /<>/debian/git/usr/share/man/man3/Git::SVN::Fetcher.3pm Installing /<>/debian/git/usr/share/man/man3/private-Error.3pm Installing /<>/debian/git/usr/share/man/man3/Git::SVN::Ra.3pm Installing /<>/debian/git/usr/share/man/man3/Git::SVN::Memoize::YAML.3pm Installing /<>/debian/git/usr/share/man/man3/Git::I18N.3pm Installing /<>/debian/git/usr/share/man/man3/Git::SVN::Utils.3pm Installing /<>/debian/git/usr/share/man/man3/Git::SVN::Editor.3pm Installing /<>/debian/git/usr/share/man/man3/Git::SVN::Prompt.3pm make[3]: Leaving directory `/<>/perl' make[2]: Leaving directory `/<>/perl' /usr/bin/make -C gitweb install make[2]: Entering directory `/<>/gitweb' make[3]: Entering directory `/<>' make[3]: `GIT-VERSION-FILE' is up to date. make[3]: Leaving directory `/<>' install -d -m 755 '/<>/debian/git/usr/share/gitweb' install -m 755 gitweb.cgi '/<>/debian/git/usr/share/gitweb' install -d -m 755 '/<>/debian/git/usr/share/gitweb/static' install -m 644 static/gitweb.js static/gitweb.css static/git-logo.png static/git-favicon.png '/<>/debian/git/usr/share/gitweb/static' make[2]: Leaving directory `/<>/gitweb' /usr/bin/make -C gitk-git install make[2]: Entering directory `/<>/gitk-git' install -m 755 gitk-wish '/<>/debian/git/usr/bin'/gitk install -d -m 755 '/<>/debian/git/usr/share/gitk/lib/msgs' install -m 644 po/bg.msg '/<>/debian/git/usr/share/gitk/lib/msgs' && install -m 644 po/de.msg '/<>/debian/git/usr/share/gitk/lib/msgs' && install -m 644 po/es.msg '/<>/debian/git/usr/share/gitk/lib/msgs' && install -m 644 po/fr.msg '/<>/debian/git/usr/share/gitk/lib/msgs' && install -m 644 po/hu.msg '/<>/debian/git/usr/share/gitk/lib/msgs' && install -m 644 po/it.msg '/<>/debian/git/usr/share/gitk/lib/msgs' && install -m 644 po/ja.msg '/<>/debian/git/usr/share/gitk/lib/msgs' && install -m 644 po/pt_br.msg '/<>/debian/git/usr/share/gitk/lib/msgs' && install -m 644 po/ru.msg '/<>/debian/git/usr/share/gitk/lib/msgs' && install -m 644 po/sv.msg '/<>/debian/git/usr/share/gitk/lib/msgs' && true make[2]: Leaving directory `/<>/gitk-git' /usr/bin/make -C git-gui gitexecdir='/usr/lib/git-core' install make[2]: Entering directory `/<>/git-gui' DEST /<>/debian/git/usr/lib/git-core INSTALL 755 git-gui INSTALL 755 git-gui--askpass LINK git-citool -> git-gui DEST /<>/debian/git/usr/share/git-gui/lib INSTALL 644 tclIndex INSTALL 644 about.tcl INSTALL 644 blame.tcl INSTALL 644 branch.tcl INSTALL 644 branch_checkout.tcl INSTALL 644 branch_create.tcl INSTALL 644 branch_delete.tcl INSTALL 644 branch_rename.tcl INSTALL 644 browser.tcl INSTALL 644 checkout_op.tcl INSTALL 644 choose_font.tcl INSTALL 644 choose_repository.tcl INSTALL 644 choose_rev.tcl INSTALL 644 class.tcl INSTALL 644 commit.tcl INSTALL 644 console.tcl INSTALL 644 database.tcl INSTALL 644 date.tcl INSTALL 644 diff.tcl INSTALL 644 encoding.tcl INSTALL 644 error.tcl INSTALL 644 index.tcl INSTALL 644 line.tcl INSTALL 644 logo.tcl INSTALL 644 merge.tcl INSTALL 644 mergetool.tcl INSTALL 644 option.tcl INSTALL 644 remote.tcl INSTALL 644 remote_add.tcl INSTALL 644 remote_branch_delete.tcl INSTALL 644 search.tcl INSTALL 644 shortcut.tcl INSTALL 644 spellcheck.tcl INSTALL 644 sshkey.tcl INSTALL 644 status_bar.tcl INSTALL 644 themed.tcl INSTALL 644 tools.tcl INSTALL 644 tools_dlg.tcl INSTALL 644 transport.tcl INSTALL 644 win32.tcl INSTALL 644 git-gui.ico INSTALL 644 win32_shortcut.js DEST /<>/debian/git/usr/share/git-gui/lib/msgs INSTALL 644 bg.msg INSTALL 644 de.msg INSTALL 644 el.msg INSTALL 644 fr.msg INSTALL 644 hu.msg INSTALL 644 it.msg INSTALL 644 ja.msg INSTALL 644 nb.msg INSTALL 644 pt_br.msg INSTALL 644 ru.msg INSTALL 644 sv.msg INSTALL 644 zh_cn.msg make[2]: Leaving directory `/<>/git-gui' bindir=$(cd '/<>/debian/git/usr/bin' && pwd) && \ execdir=$(cd '/<>/debian/git/usr/lib/git-core' && pwd) && \ { test "$bindir/" = "$execdir/" || \ for p in git git-shell git-upload-pack git-cvsserver; do \ rm -f "$execdir/$p" && \ test -z "11" && \ ln "$bindir/$p" "$execdir/$p" 2>/dev/null || \ cp "$bindir/$p" "$execdir/$p" || exit; \ done; \ } && \ for p in git-receive-pack git-upload-archive; do \ rm -f "$bindir/$p" && \ test -z "1" && \ ln "$bindir/git" "$bindir/$p" 2>/dev/null || \ ln -s "git" "$bindir/$p" 2>/dev/null || \ cp "$bindir/git" "$bindir/$p" || exit; \ done && \ for p in git-add git-annotate git-apply git-archive git-bisect--helper git-blame git-branch git-bundle git-cat-file git-check-attr git-check-ignore git-check-mailmap git-check-ref-format git-checkout-index git-checkout git-clean git-clone git-column git-commit-tree git-commit git-config git-count-objects git-credential git-describe git-diff-files git-diff-index git-diff-tree git-diff git-fast-export git-fetch-pack git-fetch git-fmt-merge-msg git-for-each-ref git-fsck git-gc git-get-tar-commit-id git-grep git-hash-object git-help git-index-pack git-init-db git-log git-ls-files git-ls-remote git-ls-tree git-mailinfo git-mailsplit git-merge git-merge-base git-merge-file git-merge-index git-merge-ours git-merge-recursive git-merge-tree git-mktag git-mktree git-mv git-name-rev git-notes git-pack-objects git-pack-redundant git-pack-refs git-patch-id git-prune-packed git-prune git-push git-read-tree git-receive-pack git-reflog git-remote git-remote-ext git-remote-fd git-repack git-replace git-rerere git-reset git-rev-list git-rev-parse git-revert git-rm git-send-pack git-shortlog git-show-branch git-show-ref git-stripspace git-symbolic-ref git-tag git-unpack-file git-unpack-objects git-update-index git-update-ref git-update-server-info git-upload-archive git-var git-verify-pack git-verify-tag git-write-tree git-cherry git-cherry-pick git-format-patch git-fsck-objects git-init git-merge-subtree git-show git-stage git-status git-whatchanged; do \ rm -f "$execdir/$p" && \ test -z "1" && \ ln "$execdir/git" "$execdir/$p" 2>/dev/null || \ ln -s "git" "$execdir/$p" 2>/dev/null || \ cp "$execdir/git" "$execdir/$p" || exit; \ done && \ remote_curl_aliases="git-remote-https git-remote-ftp git-remote-ftps" && \ for p in $remote_curl_aliases; do \ rm -f "$execdir/$p" && \ test -z "1" && \ ln "$execdir/git-remote-http" "$execdir/$p" 2>/dev/null || \ ln -s "git-remote-http" "$execdir/$p" 2>/dev/null || \ cp "$execdir/git-remote-http" "$execdir/$p" || exit; \ done && \ ./check_bindir "z$bindir" "z$execdir" "$bindir/git-add" make[1]: Leaving directory `/<>' DESTDIR='/<>/debian/git' /usr/bin/make -C contrib/subtree 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 NO_PYTHON=1 USE_SRV_RR=1 USE_LIBPCRE=1 THREADED_DELTA_SEARCH=1 NO_CROSS_DIRECTORY_HARDLINKS=1 NO_INSTALL_HARDLINKS=1 DEFAULT_PAGER=pager DEFAULT_EDITOR=editor CC='gcc' CFLAGS='-Wall -g -O2 -fstack-protector --param=ssp-buffer-size=4 -Wformat -Werror=format-security -D_FORTIFY_SOURCE=2' LDFLAGS='-Wl,-Bsymbolic-functions -Wl,-z,relro' make[1]: Entering directory `/<>/contrib/subtree' install -d -m 755 /<>/debian/git/usr/lib/git-core install -m 755 git-subtree /<>/debian/git/usr/lib/git-core make[1]: Leaving directory `/<>/contrib/subtree' install -d -m0755 '/<>/debian/git'/var/lib/git rm -f '/<>/debian/git'/usr/share/perl5/Error.pm rm -rf '/<>/debian/git'/usr/share/man chmod 644 '/<>/debian/git'/usr/share/perl5/Git.pm find '/<>/debian/git'/usr/share/perl5/Git -type d | xargs chmod 0755 find '/<>/debian/git'/usr/share/perl5/Git -type f | xargs chmod 0644 # don't include arch, cvs, svn, email, gui tools, and gitk program for i in git-archimport git-cvs git-svn git-send-email \ git-gui git-citool; do \ rm -f '/<>/debian/git'/usr/lib/git-core/$i*; \ done rm -f '/<>/debian/git'/usr/bin/git-cvsserver rm -f '/<>/debian/git'/usr/bin/gitk for i in '/<>/debian/git'/usr/bin/* '/<>/debian/git'/usr/lib/git-core/*; do \ test -d $i || \ test "`head -c2 $i`" = '#!' || \ test "`head -c2 $i`" = '# ' || \ strip -R .comment -R .note $i; \ done # don't include git-gui's lib rm -rf '/<>/debian/git'/usr/share/git-gui/ # don't include gitk's lib rm -rf '/<>/debian/git'/usr/share/gitk/ # don't include git-svn's lib rm -rf '/<>/debian/git'/usr/share/perl5/Git/SVN* # bash completion install -d -m0755 '/<>/debian/git'/usr/share/bash-completion/completions install -m0644 contrib/completion/git-completion.bash \ '/<>/debian/git'/usr/share/bash-completion/completions/git ln -s git '/<>/debian/git'/usr/share/bash-completion/completions/gitk # bash prompt install -m0644 contrib/completion/git-prompt.sh \ '/<>/debian/git'/usr/lib/git-core/git-sh-prompt install -d -m0755 '/<>/debian/git'/etc/bash_completion.d install -m0644 debian/git-prompt.completion \ '/<>/debian/git'/etc/bash_completion.d/git-prompt # sanity check that #642603 fix is still in place test $(stat -c%h '/<>/debian/git'/usr/lib/git-core/git-branch) -le 10 # gitweb install -d -m0755 '/<>/debian/git'/usr/share/gitweb ln -s gitweb.cgi '/<>/debian/git'/usr/share/gitweb/index.cgi # contrib hooks install -d -m0755 '/<>/debian/git'/usr/share/git-core/contrib/hooks set -e; for i in contrib/hooks/*; do \ test "$i" != contrib/hooks/multimail || continue; \ install -m0755 "$i" \ '/<>/debian/git'/usr/share/git-core/contrib/hooks/; \ done # contrib install -d -m0755 '/<>/debian/git'/usr/share/doc/git cp -R contrib '/<>/debian/git'/usr/share/doc/git/ rm -rf '/<>/debian/git'/usr/share/doc/git/contrib/completion rm -rf '/<>/debian/git'/usr/share/doc/git/contrib/emacs rm -rf '/<>/debian/git'/usr/share/doc/git/contrib/mw-to-git find '/<>/debian/git'/usr/share/doc/git/contrib -type f | xargs chmod 0644 find '/<>/debian/git'/usr/share/doc/git/contrib -type d | xargs chmod 0755 # remove contrib hooks, they are now installed in # /usr/share/git-core/contrib, keep symlink for backward compatibility rm -rf '/<>/debian/git'/usr/share/doc/git/contrib/hooks ln -s ../../../git-core/contrib/hooks \ '/<>/debian/git'/usr/share/doc/git/contrib/ find '/<>/debian/git'/usr/share/doc/git/ -name .gitignore | xargs rm -f : implicit rm: cannot remove ‘debian/git/usr/share/doc/git/contrib’: Is a directory : debian/git/usr/share/doc/git/ + install -m0644 debian/copyright debian/git/usr/share/doc/git/ + install -m0644 debian/changelog debian/git/usr/share/doc/git/changelog.Debian + install -m0644 debian/changelog.upstream debian/git/usr/share/doc/git/changelog + install -m0644 README debian/git/usr/share/doc/git/ + install -d -m0755 debian/git/usr/share/doc/git/RelNotes + install -m0644 Documentation/RelNotes/1.5.0.1.txt debian/git/usr/share/doc/git/RelNotes/ + install -m0644 Documentation/RelNotes/1.5.0.2.txt debian/git/usr/share/doc/git/RelNotes/ + install -m0644 Documentation/RelNotes/1.5.0.3.txt debian/git/usr/share/doc/git/RelNotes/ + install -m0644 Documentation/RelNotes/1.5.0.4.txt debian/git/usr/share/doc/git/RelNotes/ + install -m0644 Documentation/RelNotes/1.5.0.5.txt debian/git/usr/share/doc/git/RelNotes/ + install -m0644 Documentation/RelNotes/1.5.0.6.txt debian/git/usr/share/doc/git/RelNotes/ + install -m0644 Documentation/RelNotes/1.5.0.7.txt debian/git/usr/share/doc/git/RelNotes/ + install -m0644 Documentation/RelNotes/1.5.0.txt debian/git/usr/share/doc/git/RelNotes/ + install -m0644 Documentation/RelNotes/1.5.1.1.txt debian/git/usr/share/doc/git/RelNotes/ + install -m0644 Documentation/RelNotes/1.5.1.2.txt debian/git/usr/share/doc/git/RelNotes/ + install -m0644 Documentation/RelNotes/1.5.1.3.txt debian/git/usr/share/doc/git/RelNotes/ + install -m0644 Documentation/RelNotes/1.5.1.4.txt debian/git/usr/share/doc/git/RelNotes/ + install -m0644 Documentation/RelNotes/1.5.1.5.txt debian/git/usr/share/doc/git/RelNotes/ + install -m0644 Documentation/RelNotes/1.5.1.6.txt debian/git/usr/share/doc/git/RelNotes/ + install -m0644 Documentation/RelNotes/1.5.1.txt debian/git/usr/share/doc/git/RelNotes/ + install -m0644 Documentation/RelNotes/1.5.2.1.txt debian/git/usr/share/doc/git/RelNotes/ + install -m0644 Documentation/RelNotes/1.5.2.2.txt debian/git/usr/share/doc/git/RelNotes/ + install -m0644 Documentation/RelNotes/1.5.2.3.txt debian/git/usr/share/doc/git/RelNotes/ + install -m0644 Documentation/RelNotes/1.5.2.4.txt debian/git/usr/share/doc/git/RelNotes/ + install -m0644 Documentation/RelNotes/1.5.2.5.txt debian/git/usr/share/doc/git/RelNotes/ + install -m0644 Documentation/RelNotes/1.5.2.txt debian/git/usr/share/doc/git/RelNotes/ + install -m0644 Documentation/RelNotes/1.5.3.1.txt debian/git/usr/share/doc/git/RelNotes/ + install -m0644 Documentation/RelNotes/1.5.3.2.txt debian/git/usr/share/doc/git/RelNotes/ + install -m0644 Documentation/RelNotes/1.5.3.3.txt debian/git/usr/share/doc/git/RelNotes/ + install -m0644 Documentation/RelNotes/1.5.3.4.txt debian/git/usr/share/doc/git/RelNotes/ + install -m0644 Documentation/RelNotes/1.5.3.5.txt debian/git/usr/share/doc/git/RelNotes/ + install -m0644 Documentation/RelNotes/1.5.3.6.txt debian/git/usr/share/doc/git/RelNotes/ + install -m0644 Documentation/RelNotes/1.5.3.7.txt debian/git/usr/share/doc/git/RelNotes/ + install -m0644 Documentation/RelNotes/1.5.3.8.txt debian/git/usr/share/doc/git/RelNotes/ + install -m0644 Documentation/RelNotes/1.5.3.txt debian/git/usr/share/doc/git/RelNotes/ + install -m0644 Documentation/RelNotes/1.5.4.1.txt debian/git/usr/share/doc/git/RelNotes/ + install -m0644 Documentation/RelNotes/1.5.4.2.txt debian/git/usr/share/doc/git/RelNotes/ + install -m0644 Documentation/RelNotes/1.5.4.3.txt debian/git/usr/share/doc/git/RelNotes/ + install -m0644 Documentation/RelNotes/1.5.4.4.txt debian/git/usr/share/doc/git/RelNotes/ + install -m0644 Documentation/RelNotes/1.5.4.5.txt debian/git/usr/share/doc/git/RelNotes/ + install -m0644 Documentation/RelNotes/1.5.4.6.txt debian/git/usr/share/doc/git/RelNotes/ + install -m0644 Documentation/RelNotes/1.5.4.7.txt debian/git/usr/share/doc/git/RelNotes/ + install -m0644 Documentation/RelNotes/1.5.4.txt debian/git/usr/share/doc/git/RelNotes/ + install -m0644 Documentation/RelNotes/1.5.5.1.txt debian/git/usr/share/doc/git/RelNotes/ + install -m0644 Documentation/RelNotes/1.5.5.2.txt debian/git/usr/share/doc/git/RelNotes/ + install -m0644 Documentation/RelNotes/1.5.5.3.txt debian/git/usr/share/doc/git/RelNotes/ + install -m0644 Documentation/RelNotes/1.5.5.4.txt debian/git/usr/share/doc/git/RelNotes/ + install -m0644 Documentation/RelNotes/1.5.5.5.txt debian/git/usr/share/doc/git/RelNotes/ + install -m0644 Documentation/RelNotes/1.5.5.6.txt debian/git/usr/share/doc/git/RelNotes/ + install -m0644 Documentation/RelNotes/1.5.5.txt debian/git/usr/share/doc/git/RelNotes/ + install -m0644 Documentation/RelNotes/1.5.6.1.txt debian/git/usr/share/doc/git/RelNotes/ + install -m0644 Documentation/RelNotes/1.5.6.2.txt debian/git/usr/share/doc/git/RelNotes/ + install -m0644 Documentation/RelNotes/1.5.6.3.txt debian/git/usr/share/doc/git/RelNotes/ + install -m0644 Documentation/RelNotes/1.5.6.4.txt debian/git/usr/share/doc/git/RelNotes/ + install -m0644 Documentation/RelNotes/1.5.6.5.txt debian/git/usr/share/doc/git/RelNotes/ + install -m0644 Documentation/RelNotes/1.5.6.6.txt debian/git/usr/share/doc/git/RelNotes/ + install -m0644 Documentation/RelNotes/1.5.6.txt debian/git/usr/share/doc/git/RelNotes/ + install -m0644 Documentation/RelNotes/1.6.0.1.txt debian/git/usr/share/doc/git/RelNotes/ + install -m0644 Documentation/RelNotes/1.6.0.2.txt debian/git/usr/share/doc/git/RelNotes/ + install -m0644 Documentation/RelNotes/1.6.0.3.txt debian/git/usr/share/doc/git/RelNotes/ + install -m0644 Documentation/RelNotes/1.6.0.4.txt debian/git/usr/share/doc/git/RelNotes/ + install -m0644 Documentation/RelNotes/1.6.0.5.txt debian/git/usr/share/doc/git/RelNotes/ + install -m0644 Documentation/RelNotes/1.6.0.6.txt debian/git/usr/share/doc/git/RelNotes/ + install -m0644 Documentation/RelNotes/1.6.0.txt debian/git/usr/share/doc/git/RelNotes/ + install -m0644 Documentation/RelNotes/1.6.1.1.txt debian/git/usr/share/doc/git/RelNotes/ + install -m0644 Documentation/RelNotes/1.6.1.2.txt debian/git/usr/share/doc/git/RelNotes/ + install -m0644 Documentation/RelNotes/1.6.1.3.txt debian/git/usr/share/doc/git/RelNotes/ + install -m0644 Documentation/RelNotes/1.6.1.4.txt debian/git/usr/share/doc/git/RelNotes/ + install -m0644 Documentation/RelNotes/1.6.1.txt debian/git/usr/share/doc/git/RelNotes/ + install -m0644 Documentation/RelNotes/1.6.2.1.txt debian/git/usr/share/doc/git/RelNotes/ + install -m0644 Documentation/RelNotes/1.6.2.2.txt debian/git/usr/share/doc/git/RelNotes/ + install -m0644 Documentation/RelNotes/1.6.2.3.txt debian/git/usr/share/doc/git/RelNotes/ + install -m0644 Documentation/RelNotes/1.6.2.4.txt debian/git/usr/share/doc/git/RelNotes/ + install -m0644 Documentation/RelNotes/1.6.2.5.txt debian/git/usr/share/doc/git/RelNotes/ + install -m0644 Documentation/RelNotes/1.6.2.txt debian/git/usr/share/doc/git/RelNotes/ + install -m0644 Documentation/RelNotes/1.6.3.1.txt debian/git/usr/share/doc/git/RelNotes/ + install -m0644 Documentation/RelNotes/1.6.3.2.txt debian/git/usr/share/doc/git/RelNotes/ + install -m0644 Documentation/RelNotes/1.6.3.3.txt debian/git/usr/share/doc/git/RelNotes/ + install -m0644 Documentation/RelNotes/1.6.3.4.txt debian/git/usr/share/doc/git/RelNotes/ + install -m0644 Documentation/RelNotes/1.6.3.txt debian/git/usr/share/doc/git/RelNotes/ + install -m0644 Documentation/RelNotes/1.6.4.1.txt debian/git/usr/share/doc/git/RelNotes/ + install -m0644 Documentation/RelNotes/1.6.4.2.txt debian/git/usr/share/doc/git/RelNotes/ + install -m0644 Documentation/RelNotes/1.6.4.3.txt debian/git/usr/share/doc/git/RelNotes/ + install -m0644 Documentation/RelNotes/1.6.4.4.txt debian/git/usr/share/doc/git/RelNotes/ + install -m0644 Documentation/RelNotes/1.6.4.5.txt debian/git/usr/share/doc/git/RelNotes/ + install -m0644 Documentation/RelNotes/1.6.4.txt debian/git/usr/share/doc/git/RelNotes/ + install -m0644 Documentation/RelNotes/1.6.5.1.txt debian/git/usr/share/doc/git/RelNotes/ + install -m0644 Documentation/RelNotes/1.6.5.2.txt debian/git/usr/share/doc/git/RelNotes/ + install -m0644 Documentation/RelNotes/1.6.5.3.txt debian/git/usr/share/doc/git/RelNotes/ + install -m0644 Documentation/RelNotes/1.6.5.4.txt debian/git/usr/share/doc/git/RelNotes/ + install -m0644 Documentation/RelNotes/1.6.5.5.txt debian/git/usr/share/doc/git/RelNotes/ + install -m0644 Documentation/RelNotes/1.6.5.6.txt debian/git/usr/share/doc/git/RelNotes/ + install -m0644 Documentation/RelNotes/1.6.5.7.txt debian/git/usr/share/doc/git/RelNotes/ + install -m0644 Documentation/RelNotes/1.6.5.8.txt debian/git/usr/share/doc/git/RelNotes/ + install -m0644 Documentation/RelNotes/1.6.5.9.txt debian/git/usr/share/doc/git/RelNotes/ + install -m0644 Documentation/RelNotes/1.6.5.txt debian/git/usr/share/doc/git/RelNotes/ + install -m0644 Documentation/RelNotes/1.6.6.1.txt debian/git/usr/share/doc/git/RelNotes/ + install -m0644 Documentation/RelNotes/1.6.6.2.txt debian/git/usr/share/doc/git/RelNotes/ + install -m0644 Documentation/RelNotes/1.6.6.3.txt debian/git/usr/share/doc/git/RelNotes/ + install -m0644 Documentation/RelNotes/1.6.6.txt debian/git/usr/share/doc/git/RelNotes/ + install -m0644 Documentation/RelNotes/1.7.0.1.txt debian/git/usr/share/doc/git/RelNotes/ + install -m0644 Documentation/RelNotes/1.7.0.2.txt debian/git/usr/share/doc/git/RelNotes/ + install -m0644 Documentation/RelNotes/1.7.0.3.txt debian/git/usr/share/doc/git/RelNotes/ + install -m0644 Documentation/RelNotes/1.7.0.4.txt debian/git/usr/share/doc/git/RelNotes/ + install -m0644 Documentation/RelNotes/1.7.0.5.txt debian/git/usr/share/doc/git/RelNotes/ + install -m0644 Documentation/RelNotes/1.7.0.6.txt debian/git/usr/share/doc/git/RelNotes/ + install -m0644 Documentation/RelNotes/1.7.0.7.txt debian/git/usr/share/doc/git/RelNotes/ + install -m0644 Documentation/RelNotes/1.7.0.8.txt debian/git/usr/share/doc/git/RelNotes/ + install -m0644 Documentation/RelNotes/1.7.0.9.txt debian/git/usr/share/doc/git/RelNotes/ + install -m0644 Documentation/RelNotes/1.7.0.txt debian/git/usr/share/doc/git/RelNotes/ + install -m0644 Documentation/RelNotes/1.7.1.1.txt debian/git/usr/share/doc/git/RelNotes/ + install -m0644 Documentation/RelNotes/1.7.1.2.txt debian/git/usr/share/doc/git/RelNotes/ + install -m0644 Documentation/RelNotes/1.7.1.3.txt debian/git/usr/share/doc/git/RelNotes/ + install -m0644 Documentation/RelNotes/1.7.1.4.txt debian/git/usr/share/doc/git/RelNotes/ + install -m0644 Documentation/RelNotes/1.7.1.txt debian/git/usr/share/doc/git/RelNotes/ + install -m0644 Documentation/RelNotes/1.7.10.1.txt debian/git/usr/share/doc/git/RelNotes/ + install -m0644 Documentation/RelNotes/1.7.10.2.txt debian/git/usr/share/doc/git/RelNotes/ + install -m0644 Documentation/RelNotes/1.7.10.3.txt debian/git/usr/share/doc/git/RelNotes/ + install -m0644 Documentation/RelNotes/1.7.10.4.txt debian/git/usr/share/doc/git/RelNotes/ + install -m0644 Documentation/RelNotes/1.7.10.5.txt debian/git/usr/share/doc/git/RelNotes/ + install -m0644 Documentation/RelNotes/1.7.10.txt debian/git/usr/share/doc/git/RelNotes/ + install -m0644 Documentation/RelNotes/1.7.11.1.txt debian/git/usr/share/doc/git/RelNotes/ + install -m0644 Documentation/RelNotes/1.7.11.2.txt debian/git/usr/share/doc/git/RelNotes/ + install -m0644 Documentation/RelNotes/1.7.11.3.txt debian/git/usr/share/doc/git/RelNotes/ + install -m0644 Documentation/RelNotes/1.7.11.4.txt debian/git/usr/share/doc/git/RelNotes/ + install -m0644 Documentation/RelNotes/1.7.11.5.txt debian/git/usr/share/doc/git/RelNotes/ + install -m0644 Documentation/RelNotes/1.7.11.6.txt debian/git/usr/share/doc/git/RelNotes/ + install -m0644 Documentation/RelNotes/1.7.11.7.txt debian/git/usr/share/doc/git/RelNotes/ + install -m0644 Documentation/RelNotes/1.7.11.txt debian/git/usr/share/doc/git/RelNotes/ + install -m0644 Documentation/RelNotes/1.7.12.1.txt debian/git/usr/share/doc/git/RelNotes/ + install -m0644 Documentation/RelNotes/1.7.12.2.txt debian/git/usr/share/doc/git/RelNotes/ + install -m0644 Documentation/RelNotes/1.7.12.3.txt debian/git/usr/share/doc/git/RelNotes/ + install -m0644 Documentation/RelNotes/1.7.12.4.txt debian/git/usr/share/doc/git/RelNotes/ + install -m0644 Documentation/RelNotes/1.7.12.txt debian/git/usr/share/doc/git/RelNotes/ + install -m0644 Documentation/RelNotes/1.7.2.1.txt debian/git/usr/share/doc/git/RelNotes/ + install -m0644 Documentation/RelNotes/1.7.2.2.txt debian/git/usr/share/doc/git/RelNotes/ + install -m0644 Documentation/RelNotes/1.7.2.3.txt debian/git/usr/share/doc/git/RelNotes/ + install -m0644 Documentation/RelNotes/1.7.2.4.txt debian/git/usr/share/doc/git/RelNotes/ + install -m0644 Documentation/RelNotes/1.7.2.5.txt debian/git/usr/share/doc/git/RelNotes/ + install -m0644 Documentation/RelNotes/1.7.2.txt debian/git/usr/share/doc/git/RelNotes/ + install -m0644 Documentation/RelNotes/1.7.3.1.txt debian/git/usr/share/doc/git/RelNotes/ + install -m0644 Documentation/RelNotes/1.7.3.2.txt debian/git/usr/share/doc/git/RelNotes/ + install -m0644 Documentation/RelNotes/1.7.3.3.txt debian/git/usr/share/doc/git/RelNotes/ + install -m0644 Documentation/RelNotes/1.7.3.4.txt debian/git/usr/share/doc/git/RelNotes/ + install -m0644 Documentation/RelNotes/1.7.3.5.txt debian/git/usr/share/doc/git/RelNotes/ + install -m0644 Documentation/RelNotes/1.7.3.txt debian/git/usr/share/doc/git/RelNotes/ + install -m0644 Documentation/RelNotes/1.7.4.1.txt debian/git/usr/share/doc/git/RelNotes/ + install -m0644 Documentation/RelNotes/1.7.4.2.txt debian/git/usr/share/doc/git/RelNotes/ + install -m0644 Documentation/RelNotes/1.7.4.3.txt debian/git/usr/share/doc/git/RelNotes/ + install -m0644 Documentation/RelNotes/1.7.4.4.txt debian/git/usr/share/doc/git/RelNotes/ + install -m0644 Documentation/RelNotes/1.7.4.5.txt debian/git/usr/share/doc/git/RelNotes/ + install -m0644 Documentation/RelNotes/1.7.4.txt debian/git/usr/share/doc/git/RelNotes/ + install -m0644 Documentation/RelNotes/1.7.5.1.txt debian/git/usr/share/doc/git/RelNotes/ + install -m0644 Documentation/RelNotes/1.7.5.2.txt debian/git/usr/share/doc/git/RelNotes/ + install -m0644 Documentation/RelNotes/1.7.5.3.txt debian/git/usr/share/doc/git/RelNotes/ + install -m0644 Documentation/RelNotes/1.7.5.4.txt debian/git/usr/share/doc/git/RelNotes/ + install -m0644 Documentation/RelNotes/1.7.5.txt debian/git/usr/share/doc/git/RelNotes/ + install -m0644 Documentation/RelNotes/1.7.6.1.txt debian/git/usr/share/doc/git/RelNotes/ + install -m0644 Documentation/RelNotes/1.7.6.2.txt debian/git/usr/share/doc/git/RelNotes/ + install -m0644 Documentation/RelNotes/1.7.6.3.txt debian/git/usr/share/doc/git/RelNotes/ + install -m0644 Documentation/RelNotes/1.7.6.4.txt debian/git/usr/share/doc/git/RelNotes/ + install -m0644 Documentation/RelNotes/1.7.6.5.txt debian/git/usr/share/doc/git/RelNotes/ + install -m0644 Documentation/RelNotes/1.7.6.6.txt debian/git/usr/share/doc/git/RelNotes/ + install -m0644 Documentation/RelNotes/1.7.6.txt debian/git/usr/share/doc/git/RelNotes/ + install -m0644 Documentation/RelNotes/1.7.7.1.txt debian/git/usr/share/doc/git/RelNotes/ + install -m0644 Documentation/RelNotes/1.7.7.2.txt debian/git/usr/share/doc/git/RelNotes/ + install -m0644 Documentation/RelNotes/1.7.7.3.txt debian/git/usr/share/doc/git/RelNotes/ + install -m0644 Documentation/RelNotes/1.7.7.4.txt debian/git/usr/share/doc/git/RelNotes/ + install -m0644 Documentation/RelNotes/1.7.7.5.txt debian/git/usr/share/doc/git/RelNotes/ + install -m0644 Documentation/RelNotes/1.7.7.6.txt debian/git/usr/share/doc/git/RelNotes/ + install -m0644 Documentation/RelNotes/1.7.7.7.txt debian/git/usr/share/doc/git/RelNotes/ + install -m0644 Documentation/RelNotes/1.7.7.txt debian/git/usr/share/doc/git/RelNotes/ + install -m0644 Documentation/RelNotes/1.7.8.1.txt debian/git/usr/share/doc/git/RelNotes/ + install -m0644 Documentation/RelNotes/1.7.8.2.txt debian/git/usr/share/doc/git/RelNotes/ + install -m0644 Documentation/RelNotes/1.7.8.3.txt debian/git/usr/share/doc/git/RelNotes/ + install -m0644 Documentation/RelNotes/1.7.8.4.txt debian/git/usr/share/doc/git/RelNotes/ + install -m0644 Documentation/RelNotes/1.7.8.5.txt debian/git/usr/share/doc/git/RelNotes/ + install -m0644 Documentation/RelNotes/1.7.8.6.txt debian/git/usr/share/doc/git/RelNotes/ + install -m0644 Documentation/RelNotes/1.7.8.txt debian/git/usr/share/doc/git/RelNotes/ + install -m0644 Documentation/RelNotes/1.7.9.1.txt debian/git/usr/share/doc/git/RelNotes/ + install -m0644 Documentation/RelNotes/1.7.9.2.txt debian/git/usr/share/doc/git/RelNotes/ + install -m0644 Documentation/RelNotes/1.7.9.3.txt debian/git/usr/share/doc/git/RelNotes/ + install -m0644 Documentation/RelNotes/1.7.9.4.txt debian/git/usr/share/doc/git/RelNotes/ + install -m0644 Documentation/RelNotes/1.7.9.5.txt debian/git/usr/share/doc/git/RelNotes/ + install -m0644 Documentation/RelNotes/1.7.9.6.txt debian/git/usr/share/doc/git/RelNotes/ + install -m0644 Documentation/RelNotes/1.7.9.7.txt debian/git/usr/share/doc/git/RelNotes/ + install -m0644 Documentation/RelNotes/1.7.9.txt debian/git/usr/share/doc/git/RelNotes/ + install -m0644 Documentation/RelNotes/1.8.0.1.txt debian/git/usr/share/doc/git/RelNotes/ + install -m0644 Documentation/RelNotes/1.8.0.2.txt debian/git/usr/share/doc/git/RelNotes/ + install -m0644 Documentation/RelNotes/1.8.0.3.txt debian/git/usr/share/doc/git/RelNotes/ + install -m0644 Documentation/RelNotes/1.8.0.txt debian/git/usr/share/doc/git/RelNotes/ + install -m0644 Documentation/RelNotes/1.8.1.1.txt debian/git/usr/share/doc/git/RelNotes/ + install -m0644 Documentation/RelNotes/1.8.1.2.txt debian/git/usr/share/doc/git/RelNotes/ + install -m0644 Documentation/RelNotes/1.8.1.3.txt debian/git/usr/share/doc/git/RelNotes/ + install -m0644 Documentation/RelNotes/1.8.1.4.txt debian/git/usr/share/doc/git/RelNotes/ + install -m0644 Documentation/RelNotes/1.8.1.5.txt debian/git/usr/share/doc/git/RelNotes/ + install -m0644 Documentation/RelNotes/1.8.1.6.txt debian/git/usr/share/doc/git/RelNotes/ + install -m0644 Documentation/RelNotes/1.8.1.txt debian/git/usr/share/doc/git/RelNotes/ + install -m0644 Documentation/RelNotes/1.8.2.1.txt debian/git/usr/share/doc/git/RelNotes/ + install -m0644 Documentation/RelNotes/1.8.2.2.txt debian/git/usr/share/doc/git/RelNotes/ + install -m0644 Documentation/RelNotes/1.8.2.3.txt debian/git/usr/share/doc/git/RelNotes/ + install -m0644 Documentation/RelNotes/1.8.2.txt debian/git/usr/share/doc/git/RelNotes/ + install -m0644 Documentation/RelNotes/1.8.3.1.txt debian/git/usr/share/doc/git/RelNotes/ + install -m0644 Documentation/RelNotes/1.8.3.2.txt debian/git/usr/share/doc/git/RelNotes/ + install -m0644 Documentation/RelNotes/1.8.3.3.txt debian/git/usr/share/doc/git/RelNotes/ + install -m0644 Documentation/RelNotes/1.8.3.4.txt debian/git/usr/share/doc/git/RelNotes/ + install -m0644 Documentation/RelNotes/1.8.3.txt debian/git/usr/share/doc/git/RelNotes/ + install -m0644 Documentation/RelNotes/1.8.4.1.txt debian/git/usr/share/doc/git/RelNotes/ + install -m0644 Documentation/RelNotes/1.8.4.2.txt debian/git/usr/share/doc/git/RelNotes/ + install -m0644 Documentation/RelNotes/1.8.4.3.txt debian/git/usr/share/doc/git/RelNotes/ + install -m0644 Documentation/RelNotes/1.8.4.4.txt debian/git/usr/share/doc/git/RelNotes/ + install -m0644 Documentation/RelNotes/1.8.4.5.txt debian/git/usr/share/doc/git/RelNotes/ + install -m0644 Documentation/RelNotes/1.8.4.txt debian/git/usr/share/doc/git/RelNotes/ + install -m0644 Documentation/RelNotes/1.8.5.1.txt debian/git/usr/share/doc/git/RelNotes/ + install -m0644 Documentation/RelNotes/1.8.5.2.txt debian/git/usr/share/doc/git/RelNotes/ + install -m0644 Documentation/RelNotes/1.8.5.3.txt debian/git/usr/share/doc/git/RelNotes/ + install -m0644 Documentation/RelNotes/1.8.5.4.txt debian/git/usr/share/doc/git/RelNotes/ + install -m0644 Documentation/RelNotes/1.8.5.5.txt debian/git/usr/share/doc/git/RelNotes/ + install -m0644 Documentation/RelNotes/1.8.5.txt debian/git/usr/share/doc/git/RelNotes/ + install -m0644 Documentation/RelNotes/1.9.0.txt debian/git/usr/share/doc/git/RelNotes/ + install -m0644 Documentation/RelNotes/1.9.1.txt debian/git/usr/share/doc/git/RelNotes/ + install -m0644 debian/git.README.Debian debian/git/usr/share/doc/git/README.Debian + install -m0644 debian/git.README.emacs debian/git/usr/share/doc/git/README.emacs + install -m0644 debian/git.README.source debian/git/usr/share/doc/git/README.source + install -m0644 debian/git.NEWS.Debian debian/git/usr/share/doc/git/NEWS.Debian + gzip -9 debian/git/usr/share/doc/git/NEWS.Debian : debian/git/usr/share/doc/git/examples/ : debian/git/usr/share/doc/git/ ok : debian/git/usr/share/lintian/overrides + install -m0644 debian/git.lintian-overrides debian/git/usr/share/lintian/overrides/git : debian/git/usr/share/doc-base ls: cannot access debian/git.doc-base.*: No such file or directory : debian/git/usr/share/doc,doc-base,lintian ok : debian/git/DEBIAN/ + install -m0644 debian/git.conffiles debian/git/DEBIAN/conffiles + install -m0755 debian/git.preinst debian/git/DEBIAN/preinst + install -m0755 debian/git.prerm debian/git/DEBIAN/prerm + install -m0755 debian/git.postinst debian/git/DEBIAN/postinst + install -m0755 debian/git.postrm debian/git/DEBIAN/postrm : debian/git/DEBIAN/md5sums : debian/git/DEBIAN/ ok : git.deb ok rm -f debian/substvars dpkg-shlibdeps '/<>/debian/git'/usr/bin/* '/<>/debian/git'/usr/lib/git-core/* objdump: /<>/debian/git/usr/lib/git-core/git-parse-remote: File format not recognized objdump: /<>/debian/git/usr/lib/git-core/git-relink: File format not recognized objdump: /<>/debian/git/usr/lib/git-core/git-sh-setup: File format not recognized objdump: /<>/debian/git/usr/lib/git-core/git-stash: File format not recognized objdump: /<>/debian/git/usr/lib/git-core/git-sh-prompt: File format not recognized objdump: /<>/debian/git/usr/lib/git-core/git-mergetool: File format not recognized objdump: /<>/debian/git/usr/lib/git-core/git-difftool: File format not recognized objdump: /<>/debian/git/usr/lib/git-core/git-filter-branch: File format not recognized objdump: /<>/debian/git/usr/lib/git-core/git-merge-octopus: File format not recognized objdump: /<>/debian/git/usr/lib/git-core/git-add--interactive: File format not recognized objdump: /<>/debian/git/usr/lib/git-core/git-instaweb: File format not recognized objdump: /<>/debian/git/usr/lib/git-core/git-difftool--helper: File format not recognized objdump: /<>/debian/git/usr/lib/git-core/git-rebase--am: File format not recognized objdump: /<>/debian/git/usr/lib/git-core/git-subtree: File format not recognized objdump: /<>/debian/git/usr/lib/git-core/git-mergetool--lib: File format not recognized objdump: /<>/debian/git/usr/lib/git-core/git-web--browse: File format not recognized objdump: /<>/debian/git/usr/lib/git-core/git-rebase--interactive: File format not recognized objdump: /<>/debian/git/usr/lib/git-core/git-p4: File format not recognized objdump: /<>/debian/git/usr/lib/git-core/git-merge-one-file: File format not recognized objdump: /<>/debian/git/usr/lib/git-core/git-quiltimport: File format not recognized objdump: /<>/debian/git/usr/lib/git-core/git-bisect: File format not recognized objdump: /<>/debian/git/usr/lib/git-core/git-sh-i18n: File format not recognized objdump: /<>/debian/git/usr/lib/git-core/git-pull: File format not recognized objdump: /<>/debian/git/usr/lib/git-core/git-am: File format not recognized objdump: /<>/debian/git/usr/lib/git-core/git-request-pull: File format not recognized objdump: /<>/debian/git/usr/lib/git-core/git-rebase: File format not recognized objdump: /<>/debian/git/usr/lib/git-core/git-submodule: File format not recognized objdump: /<>/debian/git/usr/lib/git-core/git-rebase--merge: File format not recognized objdump: /<>/debian/git/usr/lib/git-core/git-merge-resolve: File format not recognized objdump: Warning: '/<>/debian/git/usr/lib/git-core/mergetools' is not an ordinary file dpkg-gencontrol -isp -pgit -P'/<>/debian/git' dpkg-gencontrol: warning: File::FcntlLock not available; using flock which is not NFS-safe dpkg -b '/<>/debian/git' .. INFO: pkgstriptranslations version 121 pkgstriptranslations: processing git (in /<>/debian/git); do_strip: 1, oemstrip: pkgstriptranslations: preparing translation tarball git_1.9.1-1ubuntu0.4_arm64_translations.tar.gz...dpkg-distaddfile: warning: File::FcntlLock not available; using flock which is not NFS-safe done pkgmaintainermangler: Not overriding Maintainer for domain lists.ubuntu.com pkgstripfiles: processing control file: /<>/debian/git/DEBIAN/control, package git, directory /<>/debian/git .. removing usr/share/doc/git/changelog.gz pkgstripfiles: Truncating usr/share/doc/git/changelog.Debian.gz to topmost ten records OptiPNG 0.6.4: Advanced PNG optimizer. Copyright (C) 2001-2010 Cosmin Truta. ** Processing: ./usr/share/gitweb/static/git-favicon.png 16x16 pixels, 2 bits/pixel, 3 colors in palette Input IDAT size = 37 bytes Input file size = 115 bytes Trying: zc = 9 zm = 8 zs = 0 f = 0 IDAT size = 37 zc = 9 zm = 8 zs = 1 f = 0 zc = 1 zm = 8 zs = 2 f = 0 zc = 9 zm = 8 zs = 3 f = 0 zc = 9 zm = 8 zs = 0 f = 1 zc = 9 zm = 8 zs = 1 f = 1 zc = 1 zm = 8 zs = 2 f = 1 zc = 9 zm = 8 zs = 3 f = 1 zc = 9 zm = 8 zs = 0 f = 2 zc = 9 zm = 8 zs = 1 f = 2 zc = 1 zm = 8 zs = 2 f = 2 zc = 9 zm = 8 zs = 3 f = 2 zc = 9 zm = 8 zs = 0 f = 3 zc = 9 zm = 8 zs = 1 f = 3 zc = 1 zm = 8 zs = 2 f = 3 zc = 9 zm = 8 zs = 3 f = 3 zc = 9 zm = 8 zs = 0 f = 4 zc = 9 zm = 8 zs = 1 f = 4 zc = 1 zm = 8 zs = 2 f = 4 zc = 9 zm = 8 zs = 3 f = 4 zc = 9 zm = 8 zs = 0 f = 5 zc = 9 zm = 8 zs = 1 f = 5 zc = 1 zm = 8 zs = 2 f = 5 zc = 9 zm = 8 zs = 3 f = 5 ./usr/share/gitweb/static/git-favicon.png is already optimized. 115 115 100% ./usr/share/gitweb/static/git-favicon.png (Bigger 118) 115 115 100% OptiPNG 0.6.4: Advanced PNG optimizer. Copyright (C) 2001-2010 Cosmin Truta. ** Processing: ./usr/share/gitweb/static/git-logo.png 72x27 pixels, 8 bits/pixel, 8 colors in palette Reducing image to 4 bits/pixel, 8 colors in palette Input IDAT size = 114 bytes Input file size = 207 bytes Trying: zc = 9 zm = 8 zs = 0 f = 0 IDAT size = 115 zc = 9 zm = 8 zs = 1 f = 0 zc = 1 zm = 8 zs = 2 f = 0 zc = 9 zm = 8 zs = 3 f = 0 zc = 9 zm = 8 zs = 0 f = 1 zc = 9 zm = 8 zs = 1 f = 1 zc = 1 zm = 8 zs = 2 f = 1 zc = 9 zm = 8 zs = 3 f = 1 zc = 9 zm = 8 zs = 0 f = 2 zc = 9 zm = 8 zs = 1 f = 2 zc = 1 zm = 8 zs = 2 f = 2 zc = 9 zm = 8 zs = 3 f = 2 zc = 9 zm = 8 zs = 0 f = 3 zc = 9 zm = 8 zs = 1 f = 3 zc = 1 zm = 8 zs = 2 f = 3 zc = 9 zm = 8 zs = 3 f = 3 zc = 9 zm = 8 zs = 0 f = 4 zc = 9 zm = 8 zs = 1 f = 4 zc = 1 zm = 8 zs = 2 f = 4 zc = 9 zm = 8 zs = 3 f = 4 zc = 9 zm = 8 zs = 0 f = 5 zc = 9 zm = 8 zs = 1 f = 5 zc = 1 zm = 8 zs = 2 f = 5 zc = 9 zm = 8 zs = 3 f = 5 ./usr/share/gitweb/static/git-logo.png is already optimized. 207 207 100% ./usr/share/gitweb/static/git-logo.png 207 207 100% pkgstripfiles: PNG optimization for package git took 0 s dpkg-deb: warning: '/<>/debian/git/DEBIAN/control' contains user-defined field 'Original-Maintainer' dpkg-deb: warning: ignoring 1 warning about the control file(s) dpkg-deb: building package `git' in `../git_1.9.1-1ubuntu0.4_arm64.deb'. dpkg-genchanges -B -mLaunchpad Build Daemon >../git_1.9.1-1ubuntu0.4_arm64.changes dpkg-genchanges: arch-specific upload - not including arch-independent packages dpkg-genchanges: binary-only upload - not including any source code dpkg-source --after-build git-1.9.1 dpkg-buildpackage: binary only upload (no source included) -------------------------------------------------------------------------------- Build finished at 20170322-2043 Finished -------- I: Built successfully +------------------------------------------------------------------------------+ | Post Build Chroot | +------------------------------------------------------------------------------+ +------------------------------------------------------------------------------+ | Changes | +------------------------------------------------------------------------------+ git_1.9.1-1ubuntu0.4_arm64.changes: ----------------------------------- Format: 1.8 Date: Wed, 22 Mar 2017 15:20:36 -0400 Source: git Binary: git git-man git-core git-doc git-arch git-bzr git-cvs git-svn git-mediawiki git-email git-daemon-run git-daemon-sysvinit git-gui gitk git-el gitweb git-all Architecture: arm64 arm64_translations Version: 1:1.9.1-1ubuntu0.4 Distribution: trusty Urgency: medium Maintainer: Launchpad Build Daemon Changed-By: Marc Deslauriers Description: git - fast, scalable, distributed revision control system git-all - fast, scalable, distributed revision control system (all subpacka git-arch - fast, scalable, distributed revision control system (arch interop git-bzr - fast, scalable, distributed revision control system (bzr interope git-core - fast, scalable, distributed revision control system (obsolete) git-cvs - fast, scalable, distributed revision control system (cvs interope git-daemon-run - fast, scalable, distributed revision control system (git-daemon s git-daemon-sysvinit - fast, scalable, distributed revision control system (git-daemon s git-doc - fast, scalable, distributed revision control system (documentatio git-el - fast, scalable, distributed revision control system (emacs suppor git-email - fast, scalable, distributed revision control system (email add-on git-gui - fast, scalable, distributed revision control system (GUI) git-man - fast, scalable, distributed revision control system (manual pages git-mediawiki - fast, scalable, distributed revision control system (MediaWiki in git-svn - fast, scalable, distributed revision control system (svn interope gitk - fast, scalable, distributed revision control system (revision tre gitweb - fast, scalable, distributed revision control system (web interfac Changes: git (1:1.9.1-1ubuntu0.4) trusty-security; urgency=medium . * SECURITY UPDATE: code execution via command completion - debian/diff/0018-CVE-2014-9938.patch: don't put unsanitized branch names in $PS1 in contrib/completion/git-prompt.sh, added test to t/t9903-bash-prompt.sh. - CVE-2014-9938 Checksums-Sha1: c3c34ade56f8f6a2a1d5e1a6fc703def47c2d6a5 1953058 git_1.9.1-1ubuntu0.4_arm64.deb e7736fbbf3d9f02ade7f33c7287cd89cce00c0a4 1310514 git_1.9.1-1ubuntu0.4_arm64_translations.tar.gz Checksums-Sha256: aeceaedf82b88a1931007b54b97a163292132caba9295e3365d49160c2f9aad8 1953058 git_1.9.1-1ubuntu0.4_arm64.deb b4459d2d72e8a794d52ff1dfbfdf0b273fca3f396dbc65b982bb2d77679dc103 1310514 git_1.9.1-1ubuntu0.4_arm64_translations.tar.gz Files: a5b866f5974d5a1d4ba4257b673aa51d 1953058 vcs optional git_1.9.1-1ubuntu0.4_arm64.deb efd5ae8aa2b0b1ca07880a6b6fb3936a 1310514 raw-translations - git_1.9.1-1ubuntu0.4_arm64_translations.tar.gz Original-Maintainer: Gerrit Pape +------------------------------------------------------------------------------+ | Package contents | +------------------------------------------------------------------------------+ git_1.9.1-1ubuntu0.4_arm64.deb ------------------------------ new debian package, version 2.0. size 1953058 bytes: control archive=14950 bytes. 34 bytes, 1 lines conffiles 1778 bytes, 30 lines control 31389 bytes, 419 lines md5sums 1570 bytes, 45 lines * postinst #!/bin/sh 1080 bytes, 35 lines * postrm #!/bin/sh 3143 bytes, 98 lines * preinst #!/bin/sh 478 bytes, 12 lines * prerm #!/bin/sh Package: git Version: 1:1.9.1-1ubuntu0.4 Architecture: arm64 Maintainer: Ubuntu Developers Installed-Size: 17704 Depends: libc6 (>= 2.17), libcurl3-gnutls (>= 7.16.2), libexpat1 (>= 2.0.1), libpcre3, zlib1g (>= 1:1.2.0), perl-modules, liberror-perl, git-man (>> 1:1.9.1), git-man (<< 1:1.9.1-.) Recommends: patch, less, rsync, ssh-client Suggests: gettext-base, git-daemon-run | git-daemon-sysvinit, git-doc, git-el, git-email, git-gui, gitk, gitweb, git-arch, git-bzr, git-cvs, git-mediawiki, git-svn Breaks: bash-completion (<< 1:1.90-1), cogito (<= 0.18.2+), git-buildpackage (<< 0.6.5), git-core (<< 1:1.7.0.4-1.), gitosis (<< 0.2+20090917-7), gitpkg (<< 0.15), gitweb (<< 1:1.7.4~rc1), guilt (<< 0.33), stgit (<< 0.15), stgit-contrib (<< 0.15) Replaces: git-core (<< 1:1.7.0.4-1.), gitweb (<< 1:1.7.4~rc1) Provides: git-completion, git-core Section: vcs Priority: optional Multi-Arch: foreign Homepage: http://git-scm.com/ Description: fast, scalable, distributed revision control system Git is popular version control system designed to handle very large projects with speed and efficiency; it is used for many high profile open source projects, most notably the Linux kernel. . Git falls in the category of distributed source code management tools. Every Git working directory is a full-fledged repository with full revision tracking capabilities, not dependent on network access or a central server. . This package provides the git main components with minimal dependencies. Additional functionality, e.g. a graphical user interface and revision tree visualizer, tools for interoperating with other VCS's, or a web interface, is provided as separate git* packages. Original-Maintainer: Gerrit Pape drwxr-xr-x root/root 0 2017-03-22 20:41 ./ drwxr-xr-x root/root 0 2017-03-22 20:41 ./etc/ drwxr-xr-x root/root 0 2017-03-22 20:41 ./etc/bash_completion.d/ -rw-r--r-- root/root 439 2017-03-22 20:41 ./etc/bash_completion.d/git-prompt drwxr-xr-x root/root 0 2017-03-22 20:40 ./usr/ drwxr-xr-x root/root 0 2017-03-22 20:41 ./usr/bin/ -rwxr-xr-x root/root 1371456 2017-03-22 20:41 ./usr/bin/git lrwxrwxrwx root/root 0 2017-03-22 20:41 ./usr/bin/git-receive-pack -> git -rwxr-xr-x root/root 646072 2017-03-22 20:41 ./usr/bin/git-shell lrwxrwxrwx root/root 0 2017-03-22 20:41 ./usr/bin/git-upload-archive -> git -rwxr-xr-x root/root 715912 2017-03-22 20:41 ./usr/bin/git-upload-pack drwxr-xr-x root/root 0 2017-03-22 20:40 ./usr/lib/ drwxr-xr-x root/root 0 2017-03-22 20:41 ./usr/lib/git-core/ -rwxr-xr-x root/root 1371456 2017-03-22 20:41 ./usr/lib/git-core/git lrwxrwxrwx root/root 0 2017-03-22 20:41 ./usr/lib/git-core/git-add -> git -rwxr-xr-x root/root 36841 2017-03-22 20:40 ./usr/lib/git-core/git-add--interactive -rwxr-xr-x root/root 23060 2017-03-22 20:40 ./usr/lib/git-core/git-am lrwxrwxrwx root/root 0 2017-03-22 20:41 ./usr/lib/git-core/git-annotate -> git lrwxrwxrwx root/root 0 2017-03-22 20:41 ./usr/lib/git-core/git-apply -> git lrwxrwxrwx root/root 0 2017-03-22 20:41 ./usr/lib/git-core/git-archive -> git -rwxr-xr-x root/root 11997 2017-03-22 20:40 ./usr/lib/git-core/git-bisect lrwxrwxrwx root/root 0 2017-03-22 20:41 ./usr/lib/git-core/git-bisect--helper -> git lrwxrwxrwx root/root 0 2017-03-22 20:41 ./usr/lib/git-core/git-blame -> git lrwxrwxrwx root/root 0 2017-03-22 20:41 ./usr/lib/git-core/git-branch -> git lrwxrwxrwx root/root 0 2017-03-22 20:41 ./usr/lib/git-core/git-bundle -> git lrwxrwxrwx root/root 0 2017-03-22 20:41 ./usr/lib/git-core/git-cat-file -> git lrwxrwxrwx root/root 0 2017-03-22 20:41 ./usr/lib/git-core/git-check-attr -> git lrwxrwxrwx root/root 0 2017-03-22 20:41 ./usr/lib/git-core/git-check-ignore -> git lrwxrwxrwx root/root 0 2017-03-22 20:41 ./usr/lib/git-core/git-check-mailmap -> git lrwxrwxrwx root/root 0 2017-03-22 20:41 ./usr/lib/git-core/git-check-ref-format -> git lrwxrwxrwx root/root 0 2017-03-22 20:41 ./usr/lib/git-core/git-checkout -> git lrwxrwxrwx root/root 0 2017-03-22 20:41 ./usr/lib/git-core/git-checkout-index -> git lrwxrwxrwx root/root 0 2017-03-22 20:41 ./usr/lib/git-core/git-cherry -> git lrwxrwxrwx root/root 0 2017-03-22 20:41 ./usr/lib/git-core/git-cherry-pick -> git lrwxrwxrwx root/root 0 2017-03-22 20:41 ./usr/lib/git-core/git-clean -> git lrwxrwxrwx root/root 0 2017-03-22 20:41 ./usr/lib/git-core/git-clone -> git lrwxrwxrwx root/root 0 2017-03-22 20:41 ./usr/lib/git-core/git-column -> git lrwxrwxrwx root/root 0 2017-03-22 20:41 ./usr/lib/git-core/git-commit -> git lrwxrwxrwx root/root 0 2017-03-22 20:41 ./usr/lib/git-core/git-commit-tree -> git lrwxrwxrwx root/root 0 2017-03-22 20:41 ./usr/lib/git-core/git-config -> git lrwxrwxrwx root/root 0 2017-03-22 20:41 ./usr/lib/git-core/git-count-objects -> git lrwxrwxrwx root/root 0 2017-03-22 20:41 ./usr/lib/git-core/git-credential -> git -rwxr-xr-x root/root 645952 2017-03-22 20:41 ./usr/lib/git-core/git-credential-cache -rwxr-xr-x root/root 654248 2017-03-22 20:41 ./usr/lib/git-core/git-credential-cache--daemon -rwxr-xr-x root/root 650088 2017-03-22 20:41 ./usr/lib/git-core/git-credential-store -rwxr-xr-x root/root 666832 2017-03-22 20:41 ./usr/lib/git-core/git-daemon lrwxrwxrwx root/root 0 2017-03-22 20:41 ./usr/lib/git-core/git-describe -> git lrwxrwxrwx root/root 0 2017-03-22 20:41 ./usr/lib/git-core/git-diff -> git lrwxrwxrwx root/root 0 2017-03-22 20:41 ./usr/lib/git-core/git-diff-files -> git lrwxrwxrwx root/root 0 2017-03-22 20:41 ./usr/lib/git-core/git-diff-index -> git lrwxrwxrwx root/root 0 2017-03-22 20:41 ./usr/lib/git-core/git-diff-tree -> git -rwxr-xr-x root/root 13318 2017-03-22 20:40 ./usr/lib/git-core/git-difftool -rwxr-xr-x root/root 1968 2017-03-22 20:40 ./usr/lib/git-core/git-difftool--helper lrwxrwxrwx root/root 0 2017-03-22 20:41 ./usr/lib/git-core/git-fast-export -> git -rwxr-xr-x root/root 679184 2017-03-22 20:41 ./usr/lib/git-core/git-fast-import lrwxrwxrwx root/root 0 2017-03-22 20:41 ./usr/lib/git-core/git-fetch -> git lrwxrwxrwx root/root 0 2017-03-22 20:41 ./usr/lib/git-core/git-fetch-pack -> git -rwxr-xr-x root/root 11658 2017-03-22 20:40 ./usr/lib/git-core/git-filter-branch lrwxrwxrwx root/root 0 2017-03-22 20:41 ./usr/lib/git-core/git-fmt-merge-msg -> git lrwxrwxrwx root/root 0 2017-03-22 20:41 ./usr/lib/git-core/git-for-each-ref -> git lrwxrwxrwx root/root 0 2017-03-22 20:41 ./usr/lib/git-core/git-format-patch -> git lrwxrwxrwx root/root 0 2017-03-22 20:41 ./usr/lib/git-core/git-fsck -> git lrwxrwxrwx root/root 0 2017-03-22 20:41 ./usr/lib/git-core/git-fsck-objects -> git lrwxrwxrwx root/root 0 2017-03-22 20:41 ./usr/lib/git-core/git-gc -> git lrwxrwxrwx root/root 0 2017-03-22 20:41 ./usr/lib/git-core/git-get-tar-commit-id -> git lrwxrwxrwx root/root 0 2017-03-22 20:41 ./usr/lib/git-core/git-grep -> git lrwxrwxrwx root/root 0 2017-03-22 20:41 ./usr/lib/git-core/git-hash-object -> git lrwxrwxrwx root/root 0 2017-03-22 20:41 ./usr/lib/git-core/git-help -> git -rwxr-xr-x root/root 654456 2017-03-22 20:41 ./usr/lib/git-core/git-http-backend -rwxr-xr-x root/root 736760 2017-03-22 20:41 ./usr/lib/git-core/git-http-fetch -rwxr-xr-x root/root 753208 2017-03-22 20:41 ./usr/lib/git-core/git-http-push -rwxr-xr-x root/root 658448 2017-03-22 20:41 ./usr/lib/git-core/git-imap-send lrwxrwxrwx root/root 0 2017-03-22 20:41 ./usr/lib/git-core/git-index-pack -> git lrwxrwxrwx root/root 0 2017-03-22 20:41 ./usr/lib/git-core/git-init -> git lrwxrwxrwx root/root 0 2017-03-22 20:41 ./usr/lib/git-core/git-init-db -> git -rwxr-xr-x root/root 18259 2017-03-22 20:40 ./usr/lib/git-core/git-instaweb lrwxrwxrwx root/root 0 2017-03-22 20:41 ./usr/lib/git-core/git-log -> git lrwxrwxrwx root/root 0 2017-03-22 20:41 ./usr/lib/git-core/git-ls-files -> git lrwxrwxrwx root/root 0 2017-03-22 20:41 ./usr/lib/git-core/git-ls-remote -> git lrwxrwxrwx root/root 0 2017-03-22 20:41 ./usr/lib/git-core/git-ls-tree -> git lrwxrwxrwx root/root 0 2017-03-22 20:41 ./usr/lib/git-core/git-mailinfo -> git lrwxrwxrwx root/root 0 2017-03-22 20:41 ./usr/lib/git-core/git-mailsplit -> git lrwxrwxrwx root/root 0 2017-03-22 20:41 ./usr/lib/git-core/git-merge -> git lrwxrwxrwx root/root 0 2017-03-22 20:41 ./usr/lib/git-core/git-merge-base -> git lrwxrwxrwx root/root 0 2017-03-22 20:41 ./usr/lib/git-core/git-merge-file -> git lrwxrwxrwx root/root 0 2017-03-22 20:41 ./usr/lib/git-core/git-merge-index -> git -rwxr-xr-x root/root 2207 2017-03-22 20:40 ./usr/lib/git-core/git-merge-octopus -rwxr-xr-x root/root 3482 2017-03-22 20:40 ./usr/lib/git-core/git-merge-one-file lrwxrwxrwx root/root 0 2017-03-22 20:41 ./usr/lib/git-core/git-merge-ours -> git lrwxrwxrwx root/root 0 2017-03-22 20:41 ./usr/lib/git-core/git-merge-recursive -> git -rwxr-xr-x root/root 944 2017-03-22 20:40 ./usr/lib/git-core/git-merge-resolve lrwxrwxrwx root/root 0 2017-03-22 20:41 ./usr/lib/git-core/git-merge-subtree -> git lrwxrwxrwx root/root 0 2017-03-22 20:41 ./usr/lib/git-core/git-merge-tree -> git -rwxr-xr-x root/root 8377 2017-03-22 20:40 ./usr/lib/git-core/git-mergetool -rw-r--r-- root/root 7562 2017-03-22 20:40 ./usr/lib/git-core/git-mergetool--lib lrwxrwxrwx root/root 0 2017-03-22 20:41 ./usr/lib/git-core/git-mktag -> git lrwxrwxrwx root/root 0 2017-03-22 20:41 ./usr/lib/git-core/git-mktree -> git lrwxrwxrwx root/root 0 2017-03-22 20:41 ./usr/lib/git-core/git-mv -> git lrwxrwxrwx root/root 0 2017-03-22 20:41 ./usr/lib/git-core/git-name-rev -> git lrwxrwxrwx root/root 0 2017-03-22 20:41 ./usr/lib/git-core/git-notes -> git -rwxr-xr-x root/root 101 2017-03-22 20:40 ./usr/lib/git-core/git-p4 lrwxrwxrwx root/root 0 2017-03-22 20:41 ./usr/lib/git-core/git-pack-objects -> git lrwxrwxrwx root/root 0 2017-03-22 20:41 ./usr/lib/git-core/git-pack-redundant -> git lrwxrwxrwx root/root 0 2017-03-22 20:41 ./usr/lib/git-core/git-pack-refs -> git -rw-r--r-- root/root 2313 2017-03-22 20:40 ./usr/lib/git-core/git-parse-remote lrwxrwxrwx root/root 0 2017-03-22 20:41 ./usr/lib/git-core/git-patch-id -> git lrwxrwxrwx root/root 0 2017-03-22 20:41 ./usr/lib/git-core/git-prune -> git lrwxrwxrwx root/root 0 2017-03-22 20:41 ./usr/lib/git-core/git-prune-packed -> git -rwxr-xr-x root/root 8497 2017-03-22 20:40 ./usr/lib/git-core/git-pull lrwxrwxrwx root/root 0 2017-03-22 20:41 ./usr/lib/git-core/git-push -> git -rwxr-xr-x root/root 3349 2017-03-22 20:40 ./usr/lib/git-core/git-quiltimport lrwxrwxrwx root/root 0 2017-03-22 20:41 ./usr/lib/git-core/git-read-tree -> git -rwxr-xr-x root/root 15596 2017-03-22 20:40 ./usr/lib/git-core/git-rebase -rw-r--r-- root/root 1587 2017-03-22 20:40 ./usr/lib/git-core/git-rebase--am -rw-r--r-- root/root 27226 2017-03-22 20:40 ./usr/lib/git-core/git-rebase--interactive -rw-r--r-- root/root 3200 2017-03-22 20:40 ./usr/lib/git-core/git-rebase--merge lrwxrwxrwx root/root 0 2017-03-22 20:41 ./usr/lib/git-core/git-receive-pack -> git lrwxrwxrwx root/root 0 2017-03-22 20:41 ./usr/lib/git-core/git-reflog -> git -rwxr-xr-x root/root 4198 2017-03-22 20:40 ./usr/lib/git-core/git-relink lrwxrwxrwx root/root 0 2017-03-22 20:41 ./usr/lib/git-core/git-remote -> git lrwxrwxrwx root/root 0 2017-03-22 20:41 ./usr/lib/git-core/git-remote-ext -> git lrwxrwxrwx root/root 0 2017-03-22 20:41 ./usr/lib/git-core/git-remote-fd -> git lrwxrwxrwx root/root 0 2017-03-22 20:41 ./usr/lib/git-core/git-remote-ftp -> git-remote-http lrwxrwxrwx root/root 0 2017-03-22 20:41 ./usr/lib/git-core/git-remote-ftps -> git-remote-http -rwxr-xr-x root/root 744976 2017-03-22 20:41 ./usr/lib/git-core/git-remote-http lrwxrwxrwx root/root 0 2017-03-22 20:41 ./usr/lib/git-core/git-remote-https -> git-remote-http -rwxr-xr-x root/root 662432 2017-03-22 20:41 ./usr/lib/git-core/git-remote-testsvn lrwxrwxrwx root/root 0 2017-03-22 20:41 ./usr/lib/git-core/git-repack -> git lrwxrwxrwx root/root 0 2017-03-22 20:41 ./usr/lib/git-core/git-replace -> git -rwxr-xr-x root/root 3813 2017-03-22 20:40 ./usr/lib/git-core/git-request-pull lrwxrwxrwx root/root 0 2017-03-22 20:41 ./usr/lib/git-core/git-rerere -> git lrwxrwxrwx root/root 0 2017-03-22 20:41 ./usr/lib/git-core/git-reset -> git lrwxrwxrwx root/root 0 2017-03-22 20:41 ./usr/lib/git-core/git-rev-list -> git lrwxrwxrwx root/root 0 2017-03-22 20:41 ./usr/lib/git-core/git-rev-parse -> git lrwxrwxrwx root/root 0 2017-03-22 20:41 ./usr/lib/git-core/git-revert -> git lrwxrwxrwx root/root 0 2017-03-22 20:41 ./usr/lib/git-core/git-rm -> git lrwxrwxrwx root/root 0 2017-03-22 20:41 ./usr/lib/git-core/git-send-pack -> git -rw-r--r-- root/root 1972 2017-03-22 20:40 ./usr/lib/git-core/git-sh-i18n -rwxr-xr-x root/root 645920 2017-03-22 20:41 ./usr/lib/git-core/git-sh-i18n--envsubst -rw-r--r-- root/root 14473 2017-03-22 20:41 ./usr/lib/git-core/git-sh-prompt -rw-r--r-- root/root 8170 2017-03-22 20:40 ./usr/lib/git-core/git-sh-setup -rwxr-xr-x root/root 646072 2017-03-22 20:41 ./usr/lib/git-core/git-shell lrwxrwxrwx root/root 0 2017-03-22 20:41 ./usr/lib/git-core/git-shortlog -> git lrwxrwxrwx root/root 0 2017-03-22 20:41 ./usr/lib/git-core/git-show -> git lrwxrwxrwx root/root 0 2017-03-22 20:41 ./usr/lib/git-core/git-show-branch -> git -rwxr-xr-x root/root 645960 2017-03-22 20:41 ./usr/lib/git-core/git-show-index lrwxrwxrwx root/root 0 2017-03-22 20:41 ./usr/lib/git-core/git-show-ref -> git lrwxrwxrwx root/root 0 2017-03-22 20:41 ./usr/lib/git-core/git-stage -> git -rwxr-xr-x root/root 13463 2017-03-22 20:40 ./usr/lib/git-core/git-stash lrwxrwxrwx root/root 0 2017-03-22 20:41 ./usr/lib/git-core/git-status -> git lrwxrwxrwx root/root 0 2017-03-22 20:41 ./usr/lib/git-core/git-stripspace -> git -rwxr-xr-x root/root 32493 2017-03-22 20:40 ./usr/lib/git-core/git-submodule -rwxr-xr-x root/root 15641 2017-03-22 20:41 ./usr/lib/git-core/git-subtree lrwxrwxrwx root/root 0 2017-03-22 20:41 ./usr/lib/git-core/git-symbolic-ref -> git lrwxrwxrwx root/root 0 2017-03-22 20:41 ./usr/lib/git-core/git-tag -> git lrwxrwxrwx root/root 0 2017-03-22 20:41 ./usr/lib/git-core/git-unpack-file -> git lrwxrwxrwx root/root 0 2017-03-22 20:41 ./usr/lib/git-core/git-unpack-objects -> git lrwxrwxrwx root/root 0 2017-03-22 20:41 ./usr/lib/git-core/git-update-index -> git lrwxrwxrwx root/root 0 2017-03-22 20:41 ./usr/lib/git-core/git-update-ref -> git lrwxrwxrwx root/root 0 2017-03-22 20:41 ./usr/lib/git-core/git-update-server-info -> git lrwxrwxrwx root/root 0 2017-03-22 20:41 ./usr/lib/git-core/git-upload-archive -> git -rwxr-xr-x root/root 715912 2017-03-22 20:41 ./usr/lib/git-core/git-upload-pack lrwxrwxrwx root/root 0 2017-03-22 20:41 ./usr/lib/git-core/git-var -> git lrwxrwxrwx root/root 0 2017-03-22 20:41 ./usr/lib/git-core/git-verify-pack -> git lrwxrwxrwx root/root 0 2017-03-22 20:41 ./usr/lib/git-core/git-verify-tag -> git -rwxr-xr-x root/root 4398 2017-03-22 20:40 ./usr/lib/git-core/git-web--browse lrwxrwxrwx root/root 0 2017-03-22 20:41 ./usr/lib/git-core/git-whatchanged -> git lrwxrwxrwx root/root 0 2017-03-22 20:41 ./usr/lib/git-core/git-write-tree -> git drwxr-xr-x root/root 0 2017-03-22 20:40 ./usr/lib/git-core/mergetools/ -rw-r--r-- root/root 392 2017-03-22 20:40 ./usr/lib/git-core/mergetools/araxis -rw-r--r-- root/root 401 2017-03-22 20:40 ./usr/lib/git-core/mergetools/bc3 -rw-r--r-- root/root 387 2017-03-22 20:40 ./usr/lib/git-core/mergetools/codecompare -rw-r--r-- root/root 628 2017-03-22 20:40 ./usr/lib/git-core/mergetools/deltawalker -rw-r--r-- root/root 286 2017-03-22 20:40 ./usr/lib/git-core/mergetools/diffmerge -rw-r--r-- root/root 282 2017-03-22 20:40 ./usr/lib/git-core/mergetools/diffuse -rw-r--r-- root/root 340 2017-03-22 20:40 ./usr/lib/git-core/mergetools/ecmerge -rw-r--r-- root/root 415 2017-03-22 20:40 ./usr/lib/git-core/mergetools/emerge -rw-r--r-- root/root 29 2017-03-22 20:40 ./usr/lib/git-core/mergetools/gvimdiff -rw-r--r-- root/root 29 2017-03-22 20:40 ./usr/lib/git-core/mergetools/gvimdiff2 -rw-r--r-- root/root 499 2017-03-22 20:40 ./usr/lib/git-core/mergetools/kdiff3 -rw-r--r-- root/root 83 2017-03-22 20:40 ./usr/lib/git-core/mergetools/kompare -rw-r--r-- root/root 680 2017-03-22 20:40 ./usr/lib/git-core/mergetools/meld -rw-r--r-- root/root 301 2017-03-22 20:40 ./usr/lib/git-core/mergetools/opendiff -rw-r--r-- root/root 651 2017-03-22 20:40 ./usr/lib/git-core/mergetools/p4merge -rw-r--r-- root/root 224 2017-03-22 20:40 ./usr/lib/git-core/mergetools/tkdiff -rw-r--r-- root/root 638 2017-03-22 20:40 ./usr/lib/git-core/mergetools/tortoisemerge -rw-r--r-- root/root 625 2017-03-22 20:40 ./usr/lib/git-core/mergetools/vimdiff -rw-r--r-- root/root 29 2017-03-22 20:40 ./usr/lib/git-core/mergetools/vimdiff2 -rw-r--r-- root/root 618 2017-03-22 20:40 ./usr/lib/git-core/mergetools/xxdiff drwxr-xr-x root/root 0 2017-03-22 20:42 ./usr/share/ drwxr-xr-x root/root 0 2017-03-22 20:41 ./usr/share/bash-completion/ drwxr-xr-x root/root 0 2017-03-22 20:41 ./usr/share/bash-completion/completions/ -rw-r--r-- root/root 54528 2017-03-22 20:41 ./usr/share/bash-completion/completions/git lrwxrwxrwx root/root 0 2017-03-22 20:41 ./usr/share/bash-completion/completions/gitk -> git drwxr-xr-x root/root 0 2017-03-22 20:41 ./usr/share/doc/ drwxr-xr-x root/root 0 2017-03-22 20:42 ./usr/share/doc/git/ -rw-r--r-- root/root 1744 2017-03-22 20:41 ./usr/share/doc/git/NEWS.Debian.gz -rw-r--r-- root/root 2625 2017-03-22 20:41 ./usr/share/doc/git/README -rw-r--r-- root/root 2561 2017-03-22 20:41 ./usr/share/doc/git/README.Debian -rw-r--r-- root/root 1294 2017-03-22 20:41 ./usr/share/doc/git/README.emacs -rw-r--r-- root/root 3040 2017-03-22 20:41 ./usr/share/doc/git/README.source drwxr-xr-x root/root 0 2017-03-22 20:41 ./usr/share/doc/git/RelNotes/ -rw-r--r-- root/root 1255 2017-03-22 20:41 ./usr/share/doc/git/RelNotes/1.5.0.1.txt -rw-r--r-- root/root 2308 2017-03-22 20:41 ./usr/share/doc/git/RelNotes/1.5.0.2.txt -rw-r--r-- root/root 1577 2017-03-22 20:41 ./usr/share/doc/git/RelNotes/1.5.0.3.txt -rw-r--r-- root/root 462 2017-03-22 20:41 ./usr/share/doc/git/RelNotes/1.5.0.4.txt -rw-r--r-- root/root 609 2017-03-22 20:41 ./usr/share/doc/git/RelNotes/1.5.0.5.txt -rw-r--r-- root/root 484 2017-03-22 20:41 ./usr/share/doc/git/RelNotes/1.5.0.6.txt -rw-r--r-- root/root 482 2017-03-22 20:41 ./usr/share/doc/git/RelNotes/1.5.0.7.txt -rw-r--r-- root/root 18638 2017-03-22 20:41 ./usr/share/doc/git/RelNotes/1.5.0.txt -rw-r--r-- root/root 2164 2017-03-22 20:41 ./usr/share/doc/git/RelNotes/1.5.1.1.txt -rw-r--r-- root/root 1651 2017-03-22 20:41 ./usr/share/doc/git/RelNotes/1.5.1.2.txt -rw-r--r-- root/root 1566 2017-03-22 20:41 ./usr/share/doc/git/RelNotes/1.5.1.3.txt -rw-r--r-- root/root 843 2017-03-22 20:41 ./usr/share/doc/git/RelNotes/1.5.1.4.txt -rw-r--r-- root/root 1430 2017-03-22 20:41 ./usr/share/doc/git/RelNotes/1.5.1.5.txt -rw-r--r-- root/root 1519 2017-03-22 20:41 ./usr/share/doc/git/RelNotes/1.5.1.6.txt -rw-r--r-- root/root 13288 2017-03-22 20:41 ./usr/share/doc/git/RelNotes/1.5.1.txt -rw-r--r-- root/root 1457 2017-03-22 20:41 ./usr/share/doc/git/RelNotes/1.5.2.1.txt -rw-r--r-- root/root 2086 2017-03-22 20:41 ./usr/share/doc/git/RelNotes/1.5.2.2.txt -rw-r--r-- root/root 796 2017-03-22 20:41 ./usr/share/doc/git/RelNotes/1.5.2.3.txt -rw-r--r-- root/root 802 2017-03-22 20:41 ./usr/share/doc/git/RelNotes/1.5.2.4.txt -rw-r--r-- root/root 928 2017-03-22 20:41 ./usr/share/doc/git/RelNotes/1.5.2.5.txt -rw-r--r-- root/root 7355 2017-03-22 20:41 ./usr/share/doc/git/RelNotes/1.5.2.txt -rw-r--r-- root/root 326 2017-03-22 20:41 ./usr/share/doc/git/RelNotes/1.5.3.1.txt -rw-r--r-- root/root 1931 2017-03-22 20:41 ./usr/share/doc/git/RelNotes/1.5.3.2.txt -rw-r--r-- root/root 896 2017-03-22 20:41 ./usr/share/doc/git/RelNotes/1.5.3.3.txt -rw-r--r-- root/root 1208 2017-03-22 20:41 ./usr/share/doc/git/RelNotes/1.5.3.4.txt -rw-r--r-- root/root 3376 2017-03-22 20:41 ./usr/share/doc/git/RelNotes/1.5.3.5.txt -rw-r--r-- root/root 1432 2017-03-22 20:41 ./usr/share/doc/git/RelNotes/1.5.3.6.txt -rw-r--r-- root/root 1584 2017-03-22 20:41 ./usr/share/doc/git/RelNotes/1.5.3.7.txt -rw-r--r-- root/root 783 2017-03-22 20:41 ./usr/share/doc/git/RelNotes/1.5.3.8.txt -rw-r--r-- root/root 14030 2017-03-22 20:41 ./usr/share/doc/git/RelNotes/1.5.3.txt -rw-r--r-- root/root 524 2017-03-22 20:41 ./usr/share/doc/git/RelNotes/1.5.4.1.txt -rw-r--r-- root/root 1530 2017-03-22 20:41 ./usr/share/doc/git/RelNotes/1.5.4.2.txt -rw-r--r-- root/root 997 2017-03-22 20:41 ./usr/share/doc/git/RelNotes/1.5.4.3.txt -rw-r--r-- root/root 2617 2017-03-22 20:41 ./usr/share/doc/git/RelNotes/1.5.4.4.txt -rw-r--r-- root/root 2241 2017-03-22 20:41 ./usr/share/doc/git/RelNotes/1.5.4.5.txt -rw-r--r-- root/root 1440 2017-03-22 20:41 ./usr/share/doc/git/RelNotes/1.5.4.6.txt -rw-r--r-- root/root 342 2017-03-22 20:41 ./usr/share/doc/git/RelNotes/1.5.4.7.txt -rw-r--r-- root/root 14424 2017-03-22 20:41 ./usr/share/doc/git/RelNotes/1.5.4.txt -rw-r--r-- root/root 1499 2017-03-22 20:41 ./usr/share/doc/git/RelNotes/1.5.5.1.txt -rw-r--r-- root/root 772 2017-03-22 20:41 ./usr/share/doc/git/RelNotes/1.5.5.2.txt -rw-r--r-- root/root 305 2017-03-22 20:41 ./usr/share/doc/git/RelNotes/1.5.5.3.txt -rw-r--r-- root/root 140 2017-03-22 20:41 ./usr/share/doc/git/RelNotes/1.5.5.4.txt -rw-r--r-- root/root 449 2017-03-22 20:41 ./usr/share/doc/git/RelNotes/1.5.5.5.txt -rw-r--r-- root/root 342 2017-03-22 20:41 ./usr/share/doc/git/RelNotes/1.5.5.6.txt -rw-r--r-- root/root 7596 2017-03-22 20:41 ./usr/share/doc/git/RelNotes/1.5.5.txt -rw-r--r-- root/root 793 2017-03-22 20:41 ./usr/share/doc/git/RelNotes/1.5.6.1.txt -rw-r--r-- root/root 1457 2017-03-22 20:41 ./usr/share/doc/git/RelNotes/1.5.6.2.txt -rw-r--r-- root/root 2113 2017-03-22 20:41 ./usr/share/doc/git/RelNotes/1.5.6.3.txt -rw-r--r-- root/root 1573 2017-03-22 20:41 ./usr/share/doc/git/RelNotes/1.5.6.4.txt -rw-r--r-- root/root 1041 2017-03-22 20:41 ./usr/share/doc/git/RelNotes/1.5.6.5.txt -rw-r--r-- root/root 342 2017-03-22 20:41 ./usr/share/doc/git/RelNotes/1.5.6.6.txt -rw-r--r-- root/root 3843 2017-03-22 20:41 ./usr/share/doc/git/RelNotes/1.5.6.txt -rw-r--r-- root/root 1188 2017-03-22 20:41 ./usr/share/doc/git/RelNotes/1.6.0.1.txt -rw-r--r-- root/root 2840 2017-03-22 20:41 ./usr/share/doc/git/RelNotes/1.6.0.2.txt -rw-r--r-- root/root 4318 2017-03-22 20:41 ./usr/share/doc/git/RelNotes/1.6.0.3.txt -rw-r--r-- root/root 1293 2017-03-22 20:41 ./usr/share/doc/git/RelNotes/1.6.0.4.txt -rw-r--r-- root/root 2014 2017-03-22 20:41 ./usr/share/doc/git/RelNotes/1.6.0.5.txt -rw-r--r-- root/root 1193 2017-03-22 20:41 ./usr/share/doc/git/RelNotes/1.6.0.6.txt -rw-r--r-- root/root 10049 2017-03-22 20:41 ./usr/share/doc/git/RelNotes/1.6.0.txt -rw-r--r-- root/root 1976 2017-03-22 20:41 ./usr/share/doc/git/RelNotes/1.6.1.1.txt -rw-r--r-- root/root 1640 2017-03-22 20:41 ./usr/share/doc/git/RelNotes/1.6.1.2.txt -rw-r--r-- root/root 847 2017-03-22 20:41 ./usr/share/doc/git/RelNotes/1.6.1.3.txt -rw-r--r-- root/root 1593 2017-03-22 20:41 ./usr/share/doc/git/RelNotes/1.6.1.4.txt -rw-r--r-- root/root 10322 2017-03-22 20:41 ./usr/share/doc/git/RelNotes/1.6.1.txt -rw-r--r-- root/root 597 2017-03-22 20:41 ./usr/share/doc/git/RelNotes/1.6.2.1.txt -rw-r--r-- root/root 1508 2017-03-22 20:41 ./usr/share/doc/git/RelNotes/1.6.2.2.txt -rw-r--r-- root/root 781 2017-03-22 20:41 ./usr/share/doc/git/RelNotes/1.6.2.3.txt -rw-r--r-- root/root 1351 2017-03-22 20:41 ./usr/share/doc/git/RelNotes/1.6.2.4.txt -rw-r--r-- root/root 688 2017-03-22 20:41 ./usr/share/doc/git/RelNotes/1.6.2.5.txt -rw-r--r-- root/root 5892 2017-03-22 20:41 ./usr/share/doc/git/RelNotes/1.6.2.txt -rw-r--r-- root/root 343 2017-03-22 20:41 ./usr/share/doc/git/RelNotes/1.6.3.1.txt -rw-r--r-- root/root 2271 2017-03-22 20:41 ./usr/share/doc/git/RelNotes/1.6.3.2.txt -rw-r--r-- root/root 1379 2017-03-22 20:41 ./usr/share/doc/git/RelNotes/1.6.3.3.txt -rw-r--r-- root/root 1206 2017-03-22 20:41 ./usr/share/doc/git/RelNotes/1.6.3.4.txt -rw-r--r-- root/root 6791 2017-03-22 20:41 ./usr/share/doc/git/RelNotes/1.6.3.txt -rw-r--r-- root/root 1906 2017-03-22 20:41 ./usr/share/doc/git/RelNotes/1.6.4.1.txt -rw-r--r-- root/root 1210 2017-03-22 20:41 ./usr/share/doc/git/RelNotes/1.6.4.2.txt -rw-r--r-- root/root 1146 2017-03-22 20:41 ./usr/share/doc/git/RelNotes/1.6.4.3.txt -rw-r--r-- root/root 1034 2017-03-22 20:41 ./usr/share/doc/git/RelNotes/1.6.4.4.txt -rw-r--r-- root/root 605 2017-03-22 20:41 ./usr/share/doc/git/RelNotes/1.6.4.5.txt -rw-r--r-- root/root 5357 2017-03-22 20:41 ./usr/share/doc/git/RelNotes/1.6.4.txt -rw-r--r-- root/root 549 2017-03-22 20:41 ./usr/share/doc/git/RelNotes/1.6.5.1.txt -rw-r--r-- root/root 581 2017-03-22 20:41 ./usr/share/doc/git/RelNotes/1.6.5.2.txt -rw-r--r-- root/root 2485 2017-03-22 20:41 ./usr/share/doc/git/RelNotes/1.6.5.3.txt -rw-r--r-- root/root 1275 2017-03-22 20:41 ./usr/share/doc/git/RelNotes/1.6.5.4.txt -rw-r--r-- root/root 1891 2017-03-22 20:41 ./usr/share/doc/git/RelNotes/1.6.5.5.txt -rw-r--r-- root/root 791 2017-03-22 20:41 ./usr/share/doc/git/RelNotes/1.6.5.6.txt -rw-r--r-- root/root 771 2017-03-22 20:41 ./usr/share/doc/git/RelNotes/1.6.5.7.txt -rw-r--r-- root/root 900 2017-03-22 20:41 ./usr/share/doc/git/RelNotes/1.6.5.8.txt -rw-r--r-- root/root 581 2017-03-22 20:41 ./usr/share/doc/git/RelNotes/1.6.5.9.txt -rw-r--r-- root/root 6294 2017-03-22 20:41 ./usr/share/doc/git/RelNotes/1.6.5.txt -rw-r--r-- root/root 1230 2017-03-22 20:41 ./usr/share/doc/git/RelNotes/1.6.6.1.txt -rw-r--r-- root/root 1599 2017-03-22 20:41 ./usr/share/doc/git/RelNotes/1.6.6.2.txt -rw-r--r-- root/root 751 2017-03-22 20:41 ./usr/share/doc/git/RelNotes/1.6.6.3.txt -rw-r--r-- root/root 9463 2017-03-22 20:41 ./usr/share/doc/git/RelNotes/1.6.6.txt -rw-r--r-- root/root 1287 2017-03-22 20:41 ./usr/share/doc/git/RelNotes/1.7.0.1.txt -rw-r--r-- root/root 1476 2017-03-22 20:41 ./usr/share/doc/git/RelNotes/1.7.0.2.txt -rw-r--r-- root/root 1176 2017-03-22 20:41 ./usr/share/doc/git/RelNotes/1.7.0.3.txt -rw-r--r-- root/root 888 2017-03-22 20:41 ./usr/share/doc/git/RelNotes/1.7.0.4.txt -rw-r--r-- root/root 915 2017-03-22 20:41 ./usr/share/doc/git/RelNotes/1.7.0.5.txt -rw-r--r-- root/root 365 2017-03-22 20:41 ./usr/share/doc/git/RelNotes/1.7.0.6.txt -rw-r--r-- root/root 467 2017-03-22 20:41 ./usr/share/doc/git/RelNotes/1.7.0.7.txt -rw-r--r-- root/root 452 2017-03-22 20:41 ./usr/share/doc/git/RelNotes/1.7.0.8.txt -rw-r--r-- root/root 219 2017-03-22 20:41 ./usr/share/doc/git/RelNotes/1.7.0.9.txt -rw-r--r-- root/root 8765 2017-03-22 20:41 ./usr/share/doc/git/RelNotes/1.7.0.txt -rw-r--r-- root/root 3825 2017-03-22 20:41 ./usr/share/doc/git/RelNotes/1.7.1.1.txt -rw-r--r-- root/root 1069 2017-03-22 20:41 ./usr/share/doc/git/RelNotes/1.7.1.2.txt -rw-r--r-- root/root 452 2017-03-22 20:41 ./usr/share/doc/git/RelNotes/1.7.1.3.txt -rw-r--r-- root/root 219 2017-03-22 20:41 ./usr/share/doc/git/RelNotes/1.7.1.4.txt -rw-r--r-- root/root 2941 2017-03-22 20:41 ./usr/share/doc/git/RelNotes/1.7.1.txt -rw-r--r-- root/root 3074 2017-03-22 20:41 ./usr/share/doc/git/RelNotes/1.7.10.1.txt -rw-r--r-- root/root 3445 2017-03-22 20:41 ./usr/share/doc/git/RelNotes/1.7.10.2.txt -rw-r--r-- root/root 1876 2017-03-22 20:41 ./usr/share/doc/git/RelNotes/1.7.10.3.txt -rw-r--r-- root/root 1056 2017-03-22 20:41 ./usr/share/doc/git/RelNotes/1.7.10.4.txt -rw-r--r-- root/root 397 2017-03-22 20:41 ./usr/share/doc/git/RelNotes/1.7.10.5.txt -rw-r--r-- root/root 9025 2017-03-22 20:41 ./usr/share/doc/git/RelNotes/1.7.10.txt -rw-r--r-- root/root 224 2017-03-22 20:41 ./usr/share/doc/git/RelNotes/1.7.11.1.txt -rw-r--r-- root/root 2291 2017-03-22 20:41 ./usr/share/doc/git/RelNotes/1.7.11.2.txt -rw-r--r-- root/root 2314 2017-03-22 20:41 ./usr/share/doc/git/RelNotes/1.7.11.3.txt -rw-r--r-- root/root 1171 2017-03-22 20:41 ./usr/share/doc/git/RelNotes/1.7.11.4.txt -rw-r--r-- root/root 1292 2017-03-22 20:41 ./usr/share/doc/git/RelNotes/1.7.11.5.txt -rw-r--r-- root/root 3436 2017-03-22 20:41 ./usr/share/doc/git/RelNotes/1.7.11.6.txt -rw-r--r-- root/root 1959 2017-03-22 20:41 ./usr/share/doc/git/RelNotes/1.7.11.7.txt -rw-r--r-- root/root 5506 2017-03-22 20:41 ./usr/share/doc/git/RelNotes/1.7.11.txt -rw-r--r-- root/root 5800 2017-03-22 20:41 ./usr/share/doc/git/RelNotes/1.7.12.1.txt -rw-r--r-- root/root 1767 2017-03-22 20:41 ./usr/share/doc/git/RelNotes/1.7.12.2.txt -rw-r--r-- root/root 1330 2017-03-22 20:41 ./usr/share/doc/git/RelNotes/1.7.12.3.txt -rw-r--r-- root/root 712 2017-03-22 20:41 ./usr/share/doc/git/RelNotes/1.7.12.4.txt -rw-r--r-- root/root 5336 2017-03-22 20:41 ./usr/share/doc/git/RelNotes/1.7.12.txt -rw-r--r-- root/root 806 2017-03-22 20:41 ./usr/share/doc/git/RelNotes/1.7.2.1.txt -rw-r--r-- root/root 695 2017-03-22 20:41 ./usr/share/doc/git/RelNotes/1.7.2.2.txt -rw-r--r-- root/root 1355 2017-03-22 20:41 ./usr/share/doc/git/RelNotes/1.7.2.3.txt -rw-r--r-- root/root 452 2017-03-22 20:41 ./usr/share/doc/git/RelNotes/1.7.2.4.txt -rw-r--r-- root/root 219 2017-03-22 20:41 ./usr/share/doc/git/RelNotes/1.7.2.5.txt -rw-r--r-- root/root 5978 2017-03-22 20:41 ./usr/share/doc/git/RelNotes/1.7.2.txt -rw-r--r-- root/root 425 2017-03-22 20:41 ./usr/share/doc/git/RelNotes/1.7.3.1.txt -rw-r--r-- root/root 149 2017-03-22 20:41 ./usr/share/doc/git/RelNotes/1.7.3.2.txt -rw-r--r-- root/root 2075 2017-03-22 20:41 ./usr/share/doc/git/RelNotes/1.7.3.3.txt -rw-r--r-- root/root 1639 2017-03-22 20:41 ./usr/share/doc/git/RelNotes/1.7.3.4.txt -rw-r--r-- root/root 1454 2017-03-22 20:41 ./usr/share/doc/git/RelNotes/1.7.3.5.txt -rw-r--r-- root/root 2642 2017-03-22 20:41 ./usr/share/doc/git/RelNotes/1.7.3.txt -rw-r--r-- root/root 899 2017-03-22 20:41 ./usr/share/doc/git/RelNotes/1.7.4.1.txt -rw-r--r-- root/root 2290 2017-03-22 20:41 ./usr/share/doc/git/RelNotes/1.7.4.2.txt -rw-r--r-- root/root 1245 2017-03-22 20:41 ./usr/share/doc/git/RelNotes/1.7.4.3.txt -rw-r--r-- root/root 1288 2017-03-22 20:41 ./usr/share/doc/git/RelNotes/1.7.4.4.txt -rw-r--r-- root/root 127 2017-03-22 20:41 ./usr/share/doc/git/RelNotes/1.7.4.5.txt -rw-r--r-- root/root 6502 2017-03-22 20:41 ./usr/share/doc/git/RelNotes/1.7.4.txt -rw-r--r-- root/root 1905 2017-03-22 20:41 ./usr/share/doc/git/RelNotes/1.7.5.1.txt -rw-r--r-- root/root 2189 2017-03-22 20:41 ./usr/share/doc/git/RelNotes/1.7.5.2.txt -rw-r--r-- root/root 1101 2017-03-22 20:41 ./usr/share/doc/git/RelNotes/1.7.5.3.txt -rw-r--r-- root/root 754 2017-03-22 20:41 ./usr/share/doc/git/RelNotes/1.7.5.4.txt -rw-r--r-- root/root 5329 2017-03-22 20:41 ./usr/share/doc/git/RelNotes/1.7.5.txt -rw-r--r-- root/root 2248 2017-03-22 20:41 ./usr/share/doc/git/RelNotes/1.7.6.1.txt -rw-r--r-- root/root 245 2017-03-22 20:41 ./usr/share/doc/git/RelNotes/1.7.6.2.txt -rw-r--r-- root/root 792 2017-03-22 20:41 ./usr/share/doc/git/RelNotes/1.7.6.3.txt -rw-r--r-- root/root 1264 2017-03-22 20:41 ./usr/share/doc/git/RelNotes/1.7.6.4.txt -rw-r--r-- root/root 969 2017-03-22 20:41 ./usr/share/doc/git/RelNotes/1.7.6.5.txt -rw-r--r-- root/root 587 2017-03-22 20:41 ./usr/share/doc/git/RelNotes/1.7.6.6.txt -rw-r--r-- root/root 5507 2017-03-22 20:41 ./usr/share/doc/git/RelNotes/1.7.6.txt -rw-r--r-- root/root 2432 2017-03-22 20:41 ./usr/share/doc/git/RelNotes/1.7.7.1.txt -rw-r--r-- root/root 1630 2017-03-22 20:41 ./usr/share/doc/git/RelNotes/1.7.7.2.txt -rw-r--r-- root/root 696 2017-03-22 20:41 ./usr/share/doc/git/RelNotes/1.7.7.3.txt -rw-r--r-- root/root 444 2017-03-22 20:41 ./usr/share/doc/git/RelNotes/1.7.7.4.txt -rw-r--r-- root/root 481 2017-03-22 20:41 ./usr/share/doc/git/RelNotes/1.7.7.5.txt -rw-r--r-- root/root 791 2017-03-22 20:41 ./usr/share/doc/git/RelNotes/1.7.7.6.txt -rw-r--r-- root/root 334 2017-03-22 20:41 ./usr/share/doc/git/RelNotes/1.7.7.7.txt -rw-r--r-- root/root 5409 2017-03-22 20:41 ./usr/share/doc/git/RelNotes/1.7.7.txt -rw-r--r-- root/root 1438 2017-03-22 20:41 ./usr/share/doc/git/RelNotes/1.7.8.1.txt -rw-r--r-- root/root 2925 2017-03-22 20:41 ./usr/share/doc/git/RelNotes/1.7.8.2.txt -rw-r--r-- root/root 431 2017-03-22 20:41 ./usr/share/doc/git/RelNotes/1.7.8.3.txt -rw-r--r-- root/root 921 2017-03-22 20:41 ./usr/share/doc/git/RelNotes/1.7.8.4.txt -rw-r--r-- root/root 606 2017-03-22 20:41 ./usr/share/doc/git/RelNotes/1.7.8.5.txt -rw-r--r-- root/root 621 2017-03-22 20:41 ./usr/share/doc/git/RelNotes/1.7.8.6.txt -rw-r--r-- root/root 6351 2017-03-22 20:41 ./usr/share/doc/git/RelNotes/1.7.8.txt -rw-r--r-- root/root 2461 2017-03-22 20:41 ./usr/share/doc/git/RelNotes/1.7.9.1.txt -rw-r--r-- root/root 2706 2017-03-22 20:41 ./usr/share/doc/git/RelNotes/1.7.9.2.txt -rw-r--r-- root/root 1958 2017-03-22 20:41 ./usr/share/doc/git/RelNotes/1.7.9.3.txt -rw-r--r-- root/root 887 2017-03-22 20:41 ./usr/share/doc/git/RelNotes/1.7.9.4.txt -rw-r--r-- root/root 731 2017-03-22 20:41 ./usr/share/doc/git/RelNotes/1.7.9.5.txt -rw-r--r-- root/root 432 2017-03-22 20:41 ./usr/share/doc/git/RelNotes/1.7.9.6.txt -rw-r--r-- root/root 371 2017-03-22 20:41 ./usr/share/doc/git/RelNotes/1.7.9.7.txt -rw-r--r-- root/root 4373 2017-03-22 20:41 ./usr/share/doc/git/RelNotes/1.7.9.txt -rw-r--r-- root/root 2454 2017-03-22 20:41 ./usr/share/doc/git/RelNotes/1.8.0.1.txt -rw-r--r-- root/root 1250 2017-03-22 20:41 ./usr/share/doc/git/RelNotes/1.8.0.2.txt -rw-r--r-- root/root 424 2017-03-22 20:41 ./usr/share/doc/git/RelNotes/1.8.0.3.txt -rw-r--r-- root/root 11073 2017-03-22 20:41 ./usr/share/doc/git/RelNotes/1.8.0.txt -rw-r--r-- root/root 3577 2017-03-22 20:41 ./usr/share/doc/git/RelNotes/1.8.1.1.txt -rw-r--r-- root/root 991 2017-03-22 20:41 ./usr/share/doc/git/RelNotes/1.8.1.2.txt -rw-r--r-- root/root 1740 2017-03-22 20:41 ./usr/share/doc/git/RelNotes/1.8.1.3.txt -rw-r--r-- root/root 337 2017-03-22 20:41 ./usr/share/doc/git/RelNotes/1.8.1.4.txt -rw-r--r-- root/root 1940 2017-03-22 20:41 ./usr/share/doc/git/RelNotes/1.8.1.5.txt -rw-r--r-- root/root 1563 2017-03-22 20:41 ./usr/share/doc/git/RelNotes/1.8.1.6.txt -rw-r--r-- root/root 9624 2017-03-22 20:41 ./usr/share/doc/git/RelNotes/1.8.1.txt -rw-r--r-- root/root 4561 2017-03-22 20:41 ./usr/share/doc/git/RelNotes/1.8.2.1.txt -rw-r--r-- root/root 2438 2017-03-22 20:41 ./usr/share/doc/git/RelNotes/1.8.2.2.txt -rw-r--r-- root/root 672 2017-03-22 20:41 ./usr/share/doc/git/RelNotes/1.8.2.3.txt -rw-r--r-- root/root 22140 2017-03-22 20:41 ./usr/share/doc/git/RelNotes/1.8.2.txt -rw-r--r-- root/root 431 2017-03-22 20:41 ./usr/share/doc/git/RelNotes/1.8.3.1.txt -rw-r--r-- root/root 2406 2017-03-22 20:41 ./usr/share/doc/git/RelNotes/1.8.3.2.txt -rw-r--r-- root/root 1778 2017-03-22 20:41 ./usr/share/doc/git/RelNotes/1.8.3.3.txt -rw-r--r-- root/root 700 2017-03-22 20:41 ./usr/share/doc/git/RelNotes/1.8.3.4.txt -rw-r--r-- root/root 18336 2017-03-22 20:41 ./usr/share/doc/git/RelNotes/1.8.3.txt -rw-r--r-- root/root 3010 2017-03-22 20:41 ./usr/share/doc/git/RelNotes/1.8.4.1.txt -rw-r--r-- root/root 3292 2017-03-22 20:41 ./usr/share/doc/git/RelNotes/1.8.4.2.txt -rw-r--r-- root/root 2206 2017-03-22 20:41 ./usr/share/doc/git/RelNotes/1.8.4.3.txt -rw-r--r-- root/root 340 2017-03-22 20:41 ./usr/share/doc/git/RelNotes/1.8.4.4.txt -rw-r--r-- root/root 421 2017-03-22 20:41 ./usr/share/doc/git/RelNotes/1.8.4.5.txt -rw-r--r-- root/root 21237 2017-03-22 20:41 ./usr/share/doc/git/RelNotes/1.8.4.txt -rw-r--r-- root/root 254 2017-03-22 20:41 ./usr/share/doc/git/RelNotes/1.8.5.1.txt -rw-r--r-- root/root 656 2017-03-22 20:41 ./usr/share/doc/git/RelNotes/1.8.5.2.txt -rw-r--r-- root/root 859 2017-03-22 20:41 ./usr/share/doc/git/RelNotes/1.8.5.3.txt -rw-r--r-- root/root 1912 2017-03-22 20:41 ./usr/share/doc/git/RelNotes/1.8.5.4.txt -rw-r--r-- root/root 1466 2017-03-22 20:41 ./usr/share/doc/git/RelNotes/1.8.5.5.txt -rw-r--r-- root/root 20348 2017-03-22 20:41 ./usr/share/doc/git/RelNotes/1.8.5.txt -rw-r--r-- root/root 15198 2017-03-22 20:41 ./usr/share/doc/git/RelNotes/1.9.0.txt -rw-r--r-- root/root 2409 2017-03-22 20:41 ./usr/share/doc/git/RelNotes/1.9.1.txt -rw-r--r-- root/root 1704 2017-03-22 20:42 ./usr/share/doc/git/changelog.Debian.gz drwxr-xr-x root/root 0 2017-03-22 20:41 ./usr/share/doc/git/contrib/ -rw-r--r-- root/root 2113 2017-03-22 20:41 ./usr/share/doc/git/contrib/README drwxr-xr-x root/root 0 2017-03-22 20:41 ./usr/share/doc/git/contrib/buildsystems/ -rw-r--r-- root/root 1100 2017-03-22 20:41 ./usr/share/doc/git/contrib/buildsystems/Generators.pm drwxr-xr-x root/root 0 2017-03-22 20:41 ./usr/share/doc/git/contrib/buildsystems/Generators/ -rw-r--r-- root/root 5063 2017-03-22 20:41 ./usr/share/doc/git/contrib/buildsystems/Generators/QMake.pm -rw-r--r-- root/root 16344 2017-03-22 20:41 ./usr/share/doc/git/contrib/buildsystems/Generators/Vcproj.pm -rw-r--r-- root/root 11033 2017-03-22 20:41 ./usr/share/doc/git/contrib/buildsystems/engine.pl -rw-r--r-- root/root 1208 2017-03-22 20:41 ./usr/share/doc/git/contrib/buildsystems/generate -rw-r--r-- root/root 6675 2017-03-22 20:41 ./usr/share/doc/git/contrib/buildsystems/parse.pl drwxr-xr-x root/root 0 2017-03-22 20:41 ./usr/share/doc/git/contrib/contacts/ -rw-r--r-- root/root 4560 2017-03-22 20:41 ./usr/share/doc/git/contrib/contacts/git-contacts -rw-r--r-- root/root 2584 2017-03-22 20:41 ./usr/share/doc/git/contrib/contacts/git-contacts.txt drwxr-xr-x root/root 0 2017-03-22 20:41 ./usr/share/doc/git/contrib/convert-objects/ -rw-r--r-- root/root 7436 2017-03-22 20:41 ./usr/share/doc/git/contrib/convert-objects/convert-objects.c -rw-r--r-- root/root 464 2017-03-22 20:41 ./usr/share/doc/git/contrib/convert-objects/git-convert-objects.txt drwxr-xr-x root/root 0 2017-03-22 20:41 ./usr/share/doc/git/contrib/credential/ drwxr-xr-x root/root 0 2017-03-22 20:41 ./usr/share/doc/git/contrib/credential/gnome-keyring/ -rw-r--r-- root/root 459 2017-03-22 20:41 ./usr/share/doc/git/contrib/credential/gnome-keyring/Makefile -rw-r--r-- root/root 11707 2017-03-22 20:41 ./usr/share/doc/git/contrib/credential/gnome-keyring/git-credential-gnome-keyring.c drwxr-xr-x root/root 0 2017-03-22 20:41 ./usr/share/doc/git/contrib/credential/netrc/ -rw-r--r-- root/root 48 2017-03-22 20:41 ./usr/share/doc/git/contrib/credential/netrc/Makefile -rw-r--r-- root/root 10285 2017-03-22 20:41 ./usr/share/doc/git/contrib/credential/netrc/git-credential-netrc -rw-r--r-- root/root 337 2017-03-22 20:41 ./usr/share/doc/git/contrib/credential/netrc/test.netrc -rw-r--r-- root/root 2950 2017-03-22 20:41 ./usr/share/doc/git/contrib/credential/netrc/test.pl drwxr-xr-x root/root 0 2017-03-22 20:41 ./usr/share/doc/git/contrib/credential/osxkeychain/ -rw-r--r-- root/root 420 2017-03-22 20:41 ./usr/share/doc/git/contrib/credential/osxkeychain/Makefile -rw-r--r-- root/root 3865 2017-03-22 20:41 ./usr/share/doc/git/contrib/credential/osxkeychain/git-credential-osxkeychain.c drwxr-xr-x root/root 0 2017-03-22 20:41 ./usr/share/doc/git/contrib/credential/wincred/ -rw-r--r-- root/root 279 2017-03-22 20:41 ./usr/share/doc/git/contrib/credential/wincred/Makefile -rw-r--r-- root/root 7347 2017-03-22 20:41 ./usr/share/doc/git/contrib/credential/wincred/git-credential-wincred.c drwxr-xr-x root/root 0 2017-03-22 20:41 ./usr/share/doc/git/contrib/diff-highlight/ -rw-r--r-- root/root 5343 2017-03-22 20:41 ./usr/share/doc/git/contrib/diff-highlight/README -rw-r--r-- root/root 3811 2017-03-22 20:41 ./usr/share/doc/git/contrib/diff-highlight/diff-highlight drwxr-xr-x root/root 0 2017-03-22 20:41 ./usr/share/doc/git/contrib/diffall/ -rw-r--r-- root/root 1286 2017-03-22 20:41 ./usr/share/doc/git/contrib/diffall/README -rw-r--r-- root/root 5698 2017-03-22 20:41 ./usr/share/doc/git/contrib/diffall/git-diffall drwxr-xr-x root/root 0 2017-03-22 20:41 ./usr/share/doc/git/contrib/examples/ -rw-r--r-- root/root 167 2017-03-22 20:41 ./usr/share/doc/git/contrib/examples/README -rw-r--r-- root/root 13040 2017-03-22 20:41 ./usr/share/doc/git/contrib/examples/builtin-fetch--tool.c -rw-r--r-- root/root 7618 2017-03-22 20:41 ./usr/share/doc/git/contrib/examples/git-checkout.sh -rw-r--r-- root/root 2261 2017-03-22 20:41 ./usr/share/doc/git/contrib/examples/git-clean.sh -rw-r--r-- root/root 12696 2017-03-22 20:41 ./usr/share/doc/git/contrib/examples/git-clone.sh -rw-r--r-- root/root 14376 2017-03-22 20:41 ./usr/share/doc/git/contrib/examples/git-commit.sh -rw-r--r-- root/root 9111 2017-03-22 20:41 ./usr/share/doc/git/contrib/examples/git-fetch.sh -rw-r--r-- root/root 594 2017-03-22 20:41 ./usr/share/doc/git/contrib/examples/git-gc.sh -rw-r--r-- root/root 372 2017-03-22 20:41 ./usr/share/doc/git/contrib/examples/git-log.sh -rw-r--r-- root/root 2544 2017-03-22 20:41 ./usr/share/doc/git/contrib/examples/git-ls-remote.sh -rw-r--r-- root/root 338 2017-03-22 20:41 ./usr/share/doc/git/contrib/examples/git-merge-ours.sh -rw-r--r-- root/root 14419 2017-03-22 20:41 ./usr/share/doc/git/contrib/examples/git-merge.sh -rw-r--r-- root/root 2717 2017-03-22 20:41 ./usr/share/doc/git/contrib/examples/git-notes.sh -rw-r--r-- root/root 10388 2017-03-22 20:41 ./usr/share/doc/git/contrib/examples/git-remote.perl -rw-r--r-- root/root 4983 2017-03-22 20:41 ./usr/share/doc/git/contrib/examples/git-repack.sh -rw-r--r-- root/root 6195 2017-03-22 20:41 ./usr/share/doc/git/contrib/examples/git-rerere.perl -rw-r--r-- root/root 2304 2017-03-22 20:41 ./usr/share/doc/git/contrib/examples/git-reset.sh -rw-r--r-- root/root 2715 2017-03-22 20:41 ./usr/share/doc/git/contrib/examples/git-resolve.sh -rw-r--r-- root/root 4694 2017-03-22 20:41 ./usr/share/doc/git/contrib/examples/git-revert.sh -rw-r--r-- root/root 24971 2017-03-22 20:41 ./usr/share/doc/git/contrib/examples/git-svnimport.perl -rw-r--r-- root/root 5391 2017-03-22 20:41 ./usr/share/doc/git/contrib/examples/git-svnimport.txt -rw-r--r-- root/root 4027 2017-03-22 20:41 ./usr/share/doc/git/contrib/examples/git-tag.sh -rw-r--r-- root/root 749 2017-03-22 20:41 ./usr/share/doc/git/contrib/examples/git-verify-tag.sh -rw-r--r-- root/root 924 2017-03-22 20:41 ./usr/share/doc/git/contrib/examples/git-whatchanged.sh drwxr-xr-x root/root 0 2017-03-22 20:41 ./usr/share/doc/git/contrib/fast-import/ -rw-r--r-- root/root 1451 2017-03-22 20:41 ./usr/share/doc/git/contrib/fast-import/git-import.perl -rw-r--r-- root/root 724 2017-03-22 20:41 ./usr/share/doc/git/contrib/fast-import/git-import.sh -rw-r--r-- root/root 476 2017-03-22 20:41 ./usr/share/doc/git/contrib/fast-import/git-p4.README -rw-r--r-- root/root 11199 2017-03-22 20:41 ./usr/share/doc/git/contrib/fast-import/import-directories.perl -rw-r--r-- root/root 5330 2017-03-22 20:41 ./usr/share/doc/git/contrib/fast-import/import-tars.perl -rw-r--r-- root/root 2241 2017-03-22 20:41 ./usr/share/doc/git/contrib/fast-import/import-zips.py drwxr-xr-x root/root 0 2017-03-22 20:41 ./usr/share/doc/git/contrib/git-jump/ -rw-r--r-- root/root 2829 2017-03-22 20:41 ./usr/share/doc/git/contrib/git-jump/README -rw-r--r-- root/root 1353 2017-03-22 20:41 ./usr/share/doc/git/contrib/git-jump/git-jump -rw-r--r-- root/root 4388 2017-03-22 20:41 ./usr/share/doc/git/contrib/git-resurrect.sh drwxr-xr-x root/root 0 2017-03-22 20:41 ./usr/share/doc/git/contrib/git-shell-commands/ -rw-r--r-- root/root 839 2017-03-22 20:41 ./usr/share/doc/git/contrib/git-shell-commands/README -rw-r--r-- root/root 283 2017-03-22 20:41 ./usr/share/doc/git/contrib/git-shell-commands/help -rw-r--r-- root/root 227 2017-03-22 20:41 ./usr/share/doc/git/contrib/git-shell-commands/list drwxr-xr-x root/root 0 2017-03-22 20:41 ./usr/share/doc/git/contrib/gitview/ -rw-r--r-- root/root 38465 2017-03-22 20:41 ./usr/share/doc/git/contrib/gitview/gitview -rw-r--r-- root/root 835 2017-03-22 20:41 ./usr/share/doc/git/contrib/gitview/gitview.txt drwxr-xr-x root/root 0 2017-03-22 20:41 ./usr/share/doc/git/contrib/hg-to-git/ -rw-r--r-- root/root 8074 2017-03-22 20:41 ./usr/share/doc/git/contrib/hg-to-git/hg-to-git.py -rw-r--r-- root/root 890 2017-03-22 20:41 ./usr/share/doc/git/contrib/hg-to-git/hg-to-git.txt lrwxrwxrwx root/root 0 2017-03-22 20:41 ./usr/share/doc/git/contrib/hooks -> ../../../git-core/contrib/hooks drwxr-xr-x root/root 0 2017-03-22 20:41 ./usr/share/doc/git/contrib/persistent-https/ -rw-r--r-- root/root 11358 2017-03-22 20:41 ./usr/share/doc/git/contrib/persistent-https/LICENSE -rw-r--r-- root/root 1383 2017-03-22 20:41 ./usr/share/doc/git/contrib/persistent-https/Makefile -rw-r--r-- root/root 1659 2017-03-22 20:41 ./usr/share/doc/git/contrib/persistent-https/README -rw-r--r-- root/root 4937 2017-03-22 20:41 ./usr/share/doc/git/contrib/persistent-https/client.go -rw-r--r-- root/root 2424 2017-03-22 20:41 ./usr/share/doc/git/contrib/persistent-https/main.go -rw-r--r-- root/root 4786 2017-03-22 20:41 ./usr/share/doc/git/contrib/persistent-https/proxy.go -rw-r--r-- root/root 2917 2017-03-22 20:41 ./usr/share/doc/git/contrib/persistent-https/socket.go drwxr-xr-x root/root 0 2017-03-22 20:41 ./usr/share/doc/git/contrib/remote-helpers/ -rw-r--r-- root/root 291 2017-03-22 20:41 ./usr/share/doc/git/contrib/remote-helpers/Makefile -rw-r--r-- root/root 26661 2017-03-22 20:41 ./usr/share/doc/git/contrib/remote-helpers/git-remote-bzr -rw-r--r-- root/root 33855 2017-03-22 20:41 ./usr/share/doc/git/contrib/remote-helpers/git-remote-hg -rw-r--r-- root/root 6936 2017-03-22 20:41 ./usr/share/doc/git/contrib/remote-helpers/test-bzr.sh -rw-r--r-- root/root 4556 2017-03-22 20:41 ./usr/share/doc/git/contrib/remote-helpers/test-hg-bidi.sh -rw-r--r-- root/root 10208 2017-03-22 20:41 ./usr/share/doc/git/contrib/remote-helpers/test-hg-hg-git.sh -rw-r--r-- root/root 15247 2017-03-22 20:41 ./usr/share/doc/git/contrib/remote-helpers/test-hg.sh -rw-r--r-- root/root 770 2017-03-22 20:41 ./usr/share/doc/git/contrib/remotes2config.sh -rw-r--r-- root/root 1009 2017-03-22 20:41 ./usr/share/doc/git/contrib/rerere-train.sh drwxr-xr-x root/root 0 2017-03-22 20:41 ./usr/share/doc/git/contrib/stats/ -rw-r--r-- root/root 708 2017-03-22 20:41 ./usr/share/doc/git/contrib/stats/git-common-hash -rw-r--r-- root/root 1319 2017-03-22 20:41 ./usr/share/doc/git/contrib/stats/mailmap.pl -rw-r--r-- root/root 6675 2017-03-22 20:41 ./usr/share/doc/git/contrib/stats/packinfo.pl drwxr-xr-x root/root 0 2017-03-22 20:41 ./usr/share/doc/git/contrib/subtree/ -rw-r--r-- root/root 17987 2017-03-22 20:41 ./usr/share/doc/git/contrib/subtree/COPYING -rw-r--r-- root/root 566 2017-03-22 20:41 ./usr/share/doc/git/contrib/subtree/INSTALL -rw-r--r-- root/root 1476 2017-03-22 20:41 ./usr/share/doc/git/contrib/subtree/Makefile -rw-r--r-- root/root 211 2017-03-22 20:41 ./usr/share/doc/git/contrib/subtree/README -rw-r--r-- root/root 15641 2017-03-22 20:41 ./usr/share/doc/git/contrib/subtree/git-subtree -rw-r--r-- root/root 15641 2017-03-22 20:41 ./usr/share/doc/git/contrib/subtree/git-subtree.sh -rw-r--r-- root/root 12776 2017-03-22 20:41 ./usr/share/doc/git/contrib/subtree/git-subtree.txt drwxr-xr-x root/root 0 2017-03-22 20:41 ./usr/share/doc/git/contrib/subtree/t/ -rw-r--r-- root/root 1637 2017-03-22 20:41 ./usr/share/doc/git/contrib/subtree/t/Makefile -rw-r--r-- root/root 13422 2017-03-22 20:41 ./usr/share/doc/git/contrib/subtree/t/t7900-subtree.sh -rw-r--r-- root/root 1733 2017-03-22 20:41 ./usr/share/doc/git/contrib/subtree/todo drwxr-xr-x root/root 0 2017-03-22 20:41 ./usr/share/doc/git/contrib/svn-fe/ -rw-r--r-- root/root 1495 2017-03-22 20:41 ./usr/share/doc/git/contrib/svn-fe/Makefile -rw-r--r-- root/root 361 2017-03-22 20:41 ./usr/share/doc/git/contrib/svn-fe/svn-fe.c -rw-r--r-- root/root 2092 2017-03-22 20:41 ./usr/share/doc/git/contrib/svn-fe/svn-fe.txt -rw-r--r-- root/root 2198 2017-03-22 20:41 ./usr/share/doc/git/contrib/svn-fe/svnrdump_sim.py drwxr-xr-x root/root 0 2017-03-22 20:41 ./usr/share/doc/git/contrib/thunderbird-patch-inline/ -rw-r--r-- root/root 725 2017-03-22 20:41 ./usr/share/doc/git/contrib/thunderbird-patch-inline/README -rw-r--r-- root/root 1402 2017-03-22 20:41 ./usr/share/doc/git/contrib/thunderbird-patch-inline/appp.sh drwxr-xr-x root/root 0 2017-03-22 20:41 ./usr/share/doc/git/contrib/vim/ -rw-r--r-- root/root 855 2017-03-22 20:41 ./usr/share/doc/git/contrib/vim/README drwxr-xr-x root/root 0 2017-03-22 20:41 ./usr/share/doc/git/contrib/workdir/ -rw-r--r-- root/root 1886 2017-03-22 20:41 ./usr/share/doc/git/contrib/workdir/git-new-workdir -rw-r--r-- root/root 17608 2017-03-22 20:41 ./usr/share/doc/git/copyright drwxr-xr-x root/root 0 2017-03-22 20:41 ./usr/share/git-core/ drwxr-xr-x root/root 0 2017-03-22 20:41 ./usr/share/git-core/contrib/ drwxr-xr-x root/root 0 2017-03-22 20:41 ./usr/share/git-core/contrib/hooks/ -rwxr-xr-x root/root 22070 2017-03-22 20:41 ./usr/share/git-core/contrib/hooks/post-receive-email -rwxr-xr-x root/root 1259 2017-03-22 20:41 ./usr/share/git-core/contrib/hooks/pre-auto-gc-battery -rwxr-xr-x root/root 6920 2017-03-22 20:41 ./usr/share/git-core/contrib/hooks/setgitperms.perl -rwxr-xr-x root/root 11647 2017-03-22 20:41 ./usr/share/git-core/contrib/hooks/update-paranoid drwxr-xr-x root/root 0 2017-03-22 20:07 ./usr/share/git-core/templates/ drwxr-xr-x root/root 0 2017-03-22 20:07 ./usr/share/git-core/templates/branches/ -rw-r--r-- root/root 73 2017-03-22 20:07 ./usr/share/git-core/templates/description drwxr-xr-x root/root 0 2017-03-22 20:07 ./usr/share/git-core/templates/hooks/ -rwxr-xr-x root/root 452 2017-03-22 20:07 ./usr/share/git-core/templates/hooks/applypatch-msg.sample -rwxr-xr-x root/root 896 2017-03-22 20:07 ./usr/share/git-core/templates/hooks/commit-msg.sample -rwxr-xr-x root/root 189 2017-03-22 20:07 ./usr/share/git-core/templates/hooks/post-update.sample -rwxr-xr-x root/root 398 2017-03-22 20:07 ./usr/share/git-core/templates/hooks/pre-applypatch.sample -rwxr-xr-x root/root 1642 2017-03-22 20:07 ./usr/share/git-core/templates/hooks/pre-commit.sample -rwxr-xr-x root/root 1352 2017-03-22 20:07 ./usr/share/git-core/templates/hooks/pre-push.sample -rwxr-xr-x root/root 4898 2017-03-22 20:07 ./usr/share/git-core/templates/hooks/pre-rebase.sample -rwxr-xr-x root/root 1239 2017-03-22 20:07 ./usr/share/git-core/templates/hooks/prepare-commit-msg.sample -rwxr-xr-x root/root 3611 2017-03-22 20:07 ./usr/share/git-core/templates/hooks/update.sample drwxr-xr-x root/root 0 2017-03-22 20:07 ./usr/share/git-core/templates/info/ -rw-r--r-- root/root 240 2017-03-22 20:07 ./usr/share/git-core/templates/info/exclude drwxr-xr-x root/root 0 2017-03-22 20:41 ./usr/share/gitweb/ -rwxr-xr-x root/root 251307 2017-03-22 20:40 ./usr/share/gitweb/gitweb.cgi lrwxrwxrwx root/root 0 2017-03-22 20:41 ./usr/share/gitweb/index.cgi -> gitweb.cgi drwxr-xr-x root/root 0 2017-03-22 20:42 ./usr/share/gitweb/static/ -rw-r--r-- root/root 115 2017-03-22 20:40 ./usr/share/gitweb/static/git-favicon.png -rw-r--r-- root/root 207 2017-03-22 20:42 ./usr/share/gitweb/static/git-logo.png -rw-r--r-- root/root 10586 2017-03-22 20:40 ./usr/share/gitweb/static/gitweb.css -rw-r--r-- root/root 48814 2017-03-22 20:40 ./usr/share/gitweb/static/gitweb.js drwxr-xr-x root/root 0 2017-03-22 20:41 ./usr/share/lintian/ drwxr-xr-x root/root 0 2017-03-22 20:41 ./usr/share/lintian/overrides/ -rw-r--r-- root/root 486 2017-03-22 20:41 ./usr/share/lintian/overrides/git drwxr-xr-x root/root 0 2017-03-22 20:41 ./usr/share/perl5/ -rw-r--r-- root/root 44726 2014-03-18 21:45 ./usr/share/perl5/Git.pm drwxr-xr-x root/root 0 2017-03-22 20:41 ./usr/share/perl5/Git/ -rw-r--r-- root/root 1977 2014-03-18 21:45 ./usr/share/perl5/Git/I18N.pm -rw-r--r-- root/root 644 2014-03-18 21:45 ./usr/share/perl5/Git/IndexInfo.pm drwxr-xr-x root/root 0 2017-03-22 20:41 ./var/ drwxr-xr-x root/root 0 2017-03-22 20:41 ./var/lib/ drwxr-xr-x root/root 0 2017-03-22 20:41 ./var/lib/git/ +------------------------------------------------------------------------------+ | Post Build | +------------------------------------------------------------------------------+ +------------------------------------------------------------------------------+ | Cleanup | +------------------------------------------------------------------------------+ Not removing build depends: as requested Keeping session: +------------------------------------------------------------------------------+ | Summary | +------------------------------------------------------------------------------+ Build Architecture: arm64 Build-Space: 255116 Build-Time: 2274 Distribution: trusty Host Architecture: arm64 Install-Time: 52 Job: git_1.9.1-1ubuntu0.4.dsc Machine Architecture: arm64 Package: git Package-Time: 2334 Source-Version: 1:1.9.1-1ubuntu0.4 Space: 255116 Status: successful Version: 1:1.9.1-1ubuntu0.4 -------------------------------------------------------------------------------- Finished at 20170322-2043 Build needed 00:38:54, 255116k disc space RUN: /usr/share/launchpad-buildd/slavebin/scan-for-processes ['scan-for-processes', 'PACKAGEBUILD-12321260'] Scanning for processes to kill in build /home/buildd/build-PACKAGEBUILD-12321260/chroot-autobuild... RUN: /usr/share/launchpad-buildd/slavebin/umount-chroot ['umount-chroot', 'PACKAGEBUILD-12321260'] Unmounting chroot for build PACKAGEBUILD-12321260... RUN: /usr/share/launchpad-buildd/slavebin/remove-build ['remove-build', 'PACKAGEBUILD-12321260'] Removing build PACKAGEBUILD-12321260