Log for failed build of git-core_1:1.5.3.8-1 (dist=hardy-autotest)
Build Daemon user
noreply at buildd.ubuntu.com
Sun Feb 17 13:39:48 GMT 2008
Automatic build of git-core_1:1.5.3.8-1 on royal by sbuild/powerpc 1.170.5
Build started at 20080217-1334
******************************************************************************
Checking available source versions...
Fetching source files...
Reading package lists...
Building dependency tree...
Reading state information...
Need to get 1781kB of source archives.
Get:1 http://archive.internal hardy-autotest/main git-core 1:1.5.3.8-1 (dsc) [836B]
Get:2 http://archive.internal hardy-autotest/main git-core 1:1.5.3.8-1 (tar) [1615kB]
Get:3 http://archive.internal hardy-autotest/main git-core 1:1.5.3.8-1 (diff) [166kB]
Fetched 1781kB in 0s (20.8MB/s)
Download complete and in download only mode
** Using build dependencies supplied by package:
Build-Depends: asciidoc (>> 8.0.0), libcurl4-gnutls-dev | libcurl3-gnutls-dev, libexpat1-dev, libsvn-perl | libsvn-core-perl, libz-dev, subversion, tcl8.4, unzip, xmlto
Checking for already installed source dependencies...
asciidoc: missing
libcurl4-gnutls-dev: missing
libcurl3-gnutls-dev: missing
libexpat1-dev: missing
libsvn-perl: missing
libsvn-core-perl: missing
libz-dev: missing
subversion: missing
tcl8.4: missing
unzip: missing
xmlto: missing
Checking for source dependency conflicts...
/usr/bin/sudo /usr/bin/apt-get --purge $CHROOT_OPTIONS -q -y install asciidoc libcurl4-gnutls-dev libexpat1-dev libsvn-perl libz-dev subversion tcl8.4 unzip xmlto
Reading package lists...
Building dependency tree...
Reading state information...
Note, selecting zlib1g-dev instead of libz-dev
The following packages were automatically installed and are no longer required:
upstart-compat-sysv startup-tasks system-services upstart
Use 'apt-get autoremove' to remove them.
The following extra packages will be installed:
comerr-dev docbook-xml docbook-xsl libapr1 libaprutil1 libcurl3-gnutls
libexpat1 libgcrypt11 libgcrypt11-dev libglib2.0-0 libgnutls-dev libgnutls13
libgnutlsxx13 libgpg-error-dev libgpg-error0 libidn11 libidn11-dev libkadm55
libkeyutils1 libkrb5-dev libkrb53 libldap-2.4-2 libldap2-dev liblzo2-2
liblzo2-dev libncursesw5 libneon27 libopencdk10 libopencdk10-dev
libpaper-utils libpaper1 libpcre3 libpq5 libreadline5 libsasl2-2
libsasl2-modules libsqlite3-0 libssl0.9.8 libsvn1 libtasn1-3 libtasn1-3-dev
libxml2 libxml2-utils libxslt1.1 mime-support pkg-config python python2.5
readline-common sgml-base sgml-data ucf xml-core xsltproc zlib1g-dev
Suggested packages:
doc-base docbook docbook-dsssl docbook-defguide xalan libsaxon-java
libxalan2-java libcurl3-dbg rng-tools libgcrypt11-doc gnutls-doc gnutls-bin
krb5-doc krb5-user libsasl2-modules-gssapi-mit
libsasl2-modules-gssapi-heimdal libsasl2-modules-ldap libsasl2-modules-otp
libsasl2-modules-sql python-doc python-tk python-profiler python2.5-doc
sgml-base-doc perlsgml doc-html-w3 opensp db4.6-util subversion-tools
tclreadline zip debhelper passivetex w3m
Recommended packages:
docbook-utils fop source-highlight vim-addon-manager docbook-xsl-doc-html
docbook-xsl-doc-pdf docbook-xsl-doc-text docbook-xsl-doc ca-certificates
libglib2.0-data libgpmg1 file
The following NEW packages will be installed:
asciidoc comerr-dev docbook-xml docbook-xsl libapr1 libaprutil1
libcurl3-gnutls libcurl4-gnutls-dev libexpat1 libexpat1-dev libgcrypt11
libgcrypt11-dev libglib2.0-0 libgnutls-dev libgnutls13 libgnutlsxx13
libgpg-error-dev libgpg-error0 libidn11 libidn11-dev libkadm55 libkeyutils1
libkrb5-dev libkrb53 libldap-2.4-2 libldap2-dev liblzo2-2 liblzo2-dev
libncursesw5 libneon27 libopencdk10 libopencdk10-dev libpaper-utils
libpaper1 libpcre3 libpq5 libreadline5 libsasl2-2 libsasl2-modules
libsqlite3-0 libssl0.9.8 libsvn-perl libsvn1 libtasn1-3 libtasn1-3-dev
libxml2 libxml2-utils libxslt1.1 mime-support pkg-config python python2.5
readline-common sgml-base sgml-data subversion tcl8.4 ucf unzip xml-core
xmlto xsltproc zlib1g-dev
0 upgraded, 63 newly installed, 0 to remove and 0 not upgraded.
Need to get 2997kB/20.2MB of archives.
After unpacking 72.7MB of additional disk space will be used.
Get:1 http://ftpmaster.internal hardy/main asciidoc 8.2.2-1 [861kB]
Get:2 http://ftpmaster.internal hardy/main libneon27 0.27.2-1 [137kB]
Get:3 http://ftpmaster.internal hardy/main libsvn1 1.4.6dfsg1-0ubuntu1 [687kB]
Get:4 http://ftpmaster.internal hardy/main libsvn-perl 1.4.6dfsg1-0ubuntu1 [870kB]
Get:5 http://ftpmaster.internal hardy/main subversion 1.4.6dfsg1-0ubuntu1 [272kB]
Get:6 http://ftpmaster.internal hardy/main unzip 5.52-10ubuntu1 [170kB]
Fetched 2997kB in 0s (4451kB/s)
Selecting previously deselected package libgpg-error0.
(Reading database ... 9490 files and directories currently installed.)
Unpacking libgpg-error0 (from .../libgpg-error0_1.4-2ubuntu7_powerpc.deb) ...
Selecting previously deselected package libgcrypt11.
Unpacking libgcrypt11 (from .../libgcrypt11_1.2.4-2ubuntu7_powerpc.deb) ...
Selecting previously deselected package liblzo2-2.
Unpacking liblzo2-2 (from .../liblzo2-2_2.02-3_powerpc.deb) ...
Selecting previously deselected package libopencdk10.
Unpacking libopencdk10 (from .../libopencdk10_0.6.6-1ubuntu1_powerpc.deb) ...
Selecting previously deselected package libtasn1-3.
Unpacking libtasn1-3 (from .../libtasn1-3_1.1-1_powerpc.deb) ...
Selecting previously deselected package libgnutls13.
Unpacking libgnutls13 (from .../libgnutls13_2.0.4-1ubuntu1_powerpc.deb) ...
Selecting previously deselected package libidn11.
Unpacking libidn11 (from .../libidn11_1.1-1_powerpc.deb) ...
Selecting previously deselected package libkeyutils1.
Unpacking libkeyutils1 (from .../libkeyutils1_1.2-4_powerpc.deb) ...
Selecting previously deselected package libkrb53.
Unpacking libkrb53 (from .../libkrb53_1.6.dfsg.3~beta1-2_powerpc.deb) ...
Selecting previously deselected package libssl0.9.8.
Unpacking libssl0.9.8 (from .../libssl0.9.8_0.9.8g-4ubuntu1_powerpc.deb) ...
Selecting previously deselected package libsasl2-modules.
Unpacking libsasl2-modules (from .../libsasl2-modules_2.1.22.dfsg1-16ubuntu4_powerpc.deb) ...
Selecting previously deselected package libsasl2-2.
Unpacking libsasl2-2 (from .../libsasl2-2_2.1.22.dfsg1-16ubuntu4_powerpc.deb) ...
Selecting previously deselected package libldap-2.4-2.
Unpacking libldap-2.4-2 (from .../libldap-2.4-2_2.4.7-5ubuntu1_powerpc.deb) ...
Selecting previously deselected package libcurl3-gnutls.
Unpacking libcurl3-gnutls (from .../libcurl3-gnutls_7.18.0-1ubuntu2_powerpc.deb) ...
Selecting previously deselected package libncursesw5.
Unpacking libncursesw5 (from .../libncursesw5_5.6+20071124-1ubuntu1_powerpc.deb) ...
Selecting previously deselected package readline-common.
Unpacking readline-common (from .../readline-common_5.2-3build1_all.deb) ...
Selecting previously deselected package libreadline5.
Unpacking libreadline5 (from .../libreadline5_5.2-3build1_powerpc.deb) ...
Selecting previously deselected package libsqlite3-0.
Unpacking libsqlite3-0 (from .../libsqlite3-0_3.4.2-2_powerpc.deb) ...
Selecting previously deselected package mime-support.
Unpacking mime-support (from .../mime-support_3.39-1_all.deb) ...
Selecting previously deselected package python2.5.
Unpacking python2.5 (from .../python2.5_2.5.1-6ubuntu1_powerpc.deb) ...
Selecting previously deselected package python.
Unpacking python (from .../python_2.5.1-1ubuntu2_all.deb) ...
Selecting previously deselected package libexpat1.
Unpacking libexpat1 (from .../libexpat1_2.0.1-0ubuntu1_powerpc.deb) ...
Selecting previously deselected package ucf.
Unpacking ucf (from .../ucf_3.004-0ubuntu3_all.deb) ...
Moving old data out of the way
Selecting previously deselected package asciidoc.
Unpacking asciidoc (from .../asciidoc_8.2.2-1_all.deb) ...
Selecting previously deselected package sgml-base.
Unpacking sgml-base (from .../sgml-base_1.26_all.deb) ...
Selecting previously deselected package xml-core.
Unpacking xml-core (from .../archives/xml-core_0.11_all.deb) ...
Selecting previously deselected package sgml-data.
Unpacking sgml-data (from .../sgml-data_2.0.3_all.deb) ...
Selecting previously deselected package docbook-xml.
Unpacking docbook-xml (from .../docbook-xml_4.5-5_all.deb) ...
Selecting previously deselected package docbook-xsl.
Unpacking docbook-xsl (from .../docbook-xsl_1.73.2.dfsg.1-2_all.deb) ...
Selecting previously deselected package libapr1.
Unpacking libapr1 (from .../libapr1_1.2.11-1_powerpc.deb) ...
Selecting previously deselected package libpq5.
Unpacking libpq5 (from .../libpq5_8.3.0-1_powerpc.deb) ...
Selecting previously deselected package libaprutil1.
Unpacking libaprutil1 (from .../libaprutil1_1.2.12+dfsg-2build1_powerpc.deb) ...
Selecting previously deselected package libgnutlsxx13.
Unpacking libgnutlsxx13 (from .../libgnutlsxx13_2.0.4-1ubuntu1_powerpc.deb) ...
Selecting previously deselected package libgpg-error-dev.
Unpacking libgpg-error-dev (from .../libgpg-error-dev_1.4-2ubuntu7_powerpc.deb) ...
Selecting previously deselected package libgcrypt11-dev.
Unpacking libgcrypt11-dev (from .../libgcrypt11-dev_1.2.4-2ubuntu7_powerpc.deb) ...
Selecting previously deselected package zlib1g-dev.
Unpacking zlib1g-dev (from .../zlib1g-dev_1%3a1.2.3.3.dfsg-7ubuntu1_powerpc.deb) ...
Selecting previously deselected package libtasn1-3-dev.
Unpacking libtasn1-3-dev (from .../libtasn1-3-dev_1.1-1_powerpc.deb) ...
Selecting previously deselected package libopencdk10-dev.
Unpacking libopencdk10-dev (from .../libopencdk10-dev_0.6.6-1ubuntu1_powerpc.deb) ...
Selecting previously deselected package liblzo2-dev.
Unpacking liblzo2-dev (from .../liblzo2-dev_2.02-3_powerpc.deb) ...
Selecting previously deselected package libgnutls-dev.
Unpacking libgnutls-dev (from .../libgnutls-dev_2.0.4-1ubuntu1_powerpc.deb) ...
Selecting previously deselected package libpcre3.
Unpacking libpcre3 (from .../libpcre3_7.4-1ubuntu1_powerpc.deb) ...
Selecting previously deselected package libglib2.0-0.
Unpacking libglib2.0-0 (from .../libglib2.0-0_2.15.5-0ubuntu1_powerpc.deb) ...
Selecting previously deselected package pkg-config.
Unpacking pkg-config (from .../pkg-config_0.22-1_powerpc.deb) ...
Selecting previously deselected package libidn11-dev.
Unpacking libidn11-dev (from .../libidn11-dev_1.1-1_powerpc.deb) ...
Selecting previously deselected package libkadm55.
Unpacking libkadm55 (from .../libkadm55_1.6.dfsg.3~beta1-2_powerpc.deb) ...
Selecting previously deselected package comerr-dev.
Unpacking comerr-dev (from .../comerr-dev_2.1-1.40.3-1_powerpc.deb) ...
Selecting previously deselected package libkrb5-dev.
Unpacking libkrb5-dev (from .../libkrb5-dev_1.6.dfsg.3~beta1-2_powerpc.deb) ...
Selecting previously deselected package libldap2-dev.
Unpacking libldap2-dev (from .../libldap2-dev_2.4.7-5ubuntu1_powerpc.deb) ...
Selecting previously deselected package libcurl4-gnutls-dev.
Unpacking libcurl4-gnutls-dev (from .../libcurl4-gnutls-dev_7.18.0-1ubuntu2_powerpc.deb) ...
Selecting previously deselected package libexpat1-dev.
Unpacking libexpat1-dev (from .../libexpat1-dev_2.0.1-0ubuntu1_powerpc.deb) ...
Selecting previously deselected package libxml2.
Unpacking libxml2 (from .../libxml2_2.6.31.dfsg-1ubuntu1_powerpc.deb) ...
Selecting previously deselected package libneon27.
Unpacking libneon27 (from .../libneon27_0.27.2-1_powerpc.deb) ...
Selecting previously deselected package libpaper1.
Unpacking libpaper1 (from .../libpaper1_1.1.23_powerpc.deb) ...
Selecting previously deselected package libpaper-utils.
Unpacking libpaper-utils (from .../libpaper-utils_1.1.23_powerpc.deb) ...
Selecting previously deselected package libsvn1.
Unpacking libsvn1 (from .../libsvn1_1.4.6dfsg1-0ubuntu1_powerpc.deb) ...
Selecting previously deselected package libsvn-perl.
Unpacking libsvn-perl (from .../libsvn-perl_1.4.6dfsg1-0ubuntu1_powerpc.deb) ...
Selecting previously deselected package libxml2-utils.
Unpacking libxml2-utils (from .../libxml2-utils_2.6.31.dfsg-1ubuntu1_powerpc.deb) ...
Selecting previously deselected package libxslt1.1.
Unpacking libxslt1.1 (from .../libxslt1.1_1.1.22-1ubuntu1_powerpc.deb) ...
Selecting previously deselected package subversion.
Unpacking subversion (from .../subversion_1.4.6dfsg1-0ubuntu1_powerpc.deb) ...
Selecting previously deselected package tcl8.4.
Unpacking tcl8.4 (from .../tcl8.4_8.4.16-4_powerpc.deb) ...
Selecting previously deselected package unzip.
Unpacking unzip (from .../unzip_5.52-10ubuntu1_powerpc.deb) ...
Selecting previously deselected package xsltproc.
Unpacking xsltproc (from .../xsltproc_1.1.22-1ubuntu1_powerpc.deb) ...
Selecting previously deselected package xmlto.
Unpacking xmlto (from .../xmlto_0.0.18-5.1build1_powerpc.deb) ...
Setting up libgpg-error0 (1.4-2ubuntu7) ...
Setting up libgcrypt11 (1.2.4-2ubuntu7) ...
Setting up liblzo2-2 (2.02-3) ...
Setting up libopencdk10 (0.6.6-1ubuntu1) ...
Setting up libtasn1-3 (1.1-1) ...
Setting up libgnutls13 (2.0.4-1ubuntu1) ...
Setting up libidn11 (1.1-1) ...
Setting up libkeyutils1 (1.2-4) ...
Setting up libkrb53 (1.6.dfsg.3~beta1-2) ...
Setting up libssl0.9.8 (0.9.8g-4ubuntu1) ...
Setting up libncursesw5 (5.6+20071124-1ubuntu1) ...
Setting up readline-common (5.2-3build1) ...
Setting up libreadline5 (5.2-3build1) ...
Setting up libsqlite3-0 (3.4.2-2) ...
Setting up mime-support (3.39-1) ...
Setting up python2.5 (2.5.1-6ubuntu1) ...
Setting up python (2.5.1-1ubuntu2) ...
Setting up libexpat1 (2.0.1-0ubuntu1) ...
Setting up ucf (3.004-0ubuntu3) ...
Setting up asciidoc (8.2.2-1) ...
Setting up sgml-base (1.26) ...
Setting up xml-core (0.11) ...
Setting up sgml-data (2.0.3) ...
Setting up docbook-xml (4.5-5) ...
Setting up docbook-xsl (1.73.2.dfsg.1-2) ...
Setting up libapr1 (1.2.11-1) ...
Setting up libgnutlsxx13 (2.0.4-1ubuntu1) ...
Setting up libgpg-error-dev (1.4-2ubuntu7) ...
Setting up libgcrypt11-dev (1.2.4-2ubuntu7) ...
Setting up zlib1g-dev (1.2.3.3.dfsg-7ubuntu1) ...
Setting up libtasn1-3-dev (1.1-1) ...
Setting up libopencdk10-dev (0.6.6-1ubuntu1) ...
Setting up liblzo2-dev (2.02-3) ...
Setting up libgnutls-dev (2.0.4-1ubuntu1) ...
Setting up libpcre3 (7.4-1ubuntu1) ...
Setting up libglib2.0-0 (2.15.5-0ubuntu1) ...
Setting up pkg-config (0.22-1) ...
Setting up libidn11-dev (1.1-1) ...
Setting up libkadm55 (1.6.dfsg.3~beta1-2) ...
Setting up comerr-dev (2.1-1.40.3-1) ...
Setting up libkrb5-dev (1.6.dfsg.3~beta1-2) ...
Setting up libexpat1-dev (2.0.1-0ubuntu1) ...
Setting up libxml2 (2.6.31.dfsg-1ubuntu1) ...
Setting up libneon27 (0.27.2-1) ...
Setting up libpaper1 (1.1.23) ...
Creating config file /etc/papersize with new version
Setting up libpaper-utils (1.1.23) ...
Setting up libxml2-utils (2.6.31.dfsg-1ubuntu1) ...
Setting up libxslt1.1 (1.1.22-1ubuntu1) ...
Setting up tcl8.4 (8.4.16-4) ...
Setting up unzip (5.52-10ubuntu1) ...
Setting up xsltproc (1.1.22-1ubuntu1) ...
Setting up xmlto (0.0.18-5.1build1) ...
Setting up libsasl2-modules (2.1.22.dfsg1-16ubuntu4) ...
Setting up libsasl2-2 (2.1.22.dfsg1-16ubuntu4) ...
Setting up libldap-2.4-2 (2.4.7-5ubuntu1) ...
Setting up libcurl3-gnutls (7.18.0-1ubuntu2) ...
Setting up libpq5 (8.3.0-1) ...
Setting up libaprutil1 (1.2.12+dfsg-2build1) ...
Setting up libldap2-dev (2.4.7-5ubuntu1) ...
Setting up libcurl4-gnutls-dev (7.18.0-1ubuntu2) ...
Setting up libsvn1 (1.4.6dfsg1-0ubuntu1) ...
Setting up libsvn-perl (1.4.6dfsg1-0ubuntu1) ...
Setting up subversion (1.4.6dfsg1-0ubuntu1) ...
Checking correctness of source dependencies...
Toolchain package versions: libc6-dev_2.7-5ubuntu2 make_3.81-3build1 dpkg-dev_1.14.16.6ubuntu3 linux-libc-dev_2.6.24-8.14 gcc-4.2_4.2.3-1ubuntu2 g++-4.2_4.2.3-1ubuntu2 binutils_2.18.1~cvs20080103-0ubuntu1 libstdc++6_4.2.3-1ubuntu2 libstdc++6-4.2-dev_4.2.3-1ubuntu2
------------------------------------------------------------------------------
dpkg-source: extracting git-core in git-core-1.5.3.8
dpkg-source: unpacking git-core_1.5.3.8.orig.tar.gz
dpkg-source: applying /srv/royal.buildd/home/buildd/build-hardy-autotest/git-core_1.5.3.8-1.diff.gz
dpkg-buildpackage: set CPPFLAGS to default value:
dpkg-buildpackage: set CFLAGS to default value: -g -O2
dpkg-buildpackage: set CXXFLAGS to default value: -g -O2
dpkg-buildpackage: set FFLAGS to default value: -g -O2
dpkg-buildpackage: set LDFLAGS to default value: -Wl,-Bsymbolic-functions
dpkg-buildpackage: source package git-core
dpkg-buildpackage: source version 1:1.5.3.8-1
dpkg-buildpackage: host architecture powerpc
/usr/bin/fakeroot debian/rules clean
/usr/bin/make clean NO_OPENSSL=1 GITWEB_CONFIG=/etc/gitweb.conf prefix=/usr mandir=/usr/share/man INSTALLDIRS=vendor WITH_P4IMPORT=1 PYTHON_PATH=/usr/bin/python TCLTK_PATH=/usr/bin/wish8.4 PPC_SHA1=1
make[1]: Entering directory `/build/buildd/git-core-1.5.3.8'
GIT_VERSION = 1.5.3.8
make[1]: Leaving directory `/build/buildd/git-core-1.5.3.8'
make[1]: Entering directory `/build/buildd/git-core-1.5.3.8'
rm -f *.o mozilla-sha1/*.o arm/*.o ppc/*.o compat/*.o xdiff/*.o \
libgit.a xdiff/lib.a
rm -f git-convert-objects git-fetch-pack git-hash-object git-index-pack git-local-fetch git-fast-import git-daemon git-merge-index git-mktag git-mktree git-patch-id git-peek-remote git-receive-pack git-send-pack git-shell git-show-index git-ssh-fetch git-ssh-upload git-unpack-file git-update-server-info git-upload-pack git-pack-redundant git-var git-merge-tree git-imap-send git-merge-recursive git-ssh-pull git-ssh-push git-http-fetch git-http-push git-bisect git-checkout git-clean git-clone git-commit git-fetch git-ls-remote git-merge-one-file git-mergetool git-parse-remote git-pull git-rebase git-rebase--interactive git-repack git-request-pull git-reset git-sh-setup git-am git-merge git-merge-stupid git-merge-octopus git-merge-resolve git-merge-ours git-lost-found git-quiltimport git-submodule git-filter-branch git-stash git-add--interactive git-archimport git-cvsimport git-relink git-cvsserver git-remote git-svnimport git-cvsexportcommit git-send-email git-svn git-status git-instaweb git-merge-subtree git-format-patch git-show git-whatchanged git-cherry git-get-tar-commit-id git-init git-repo-config git-fsck-objects git-cherry-pick git-add git-annotate git-apply git-archive git-blame git-branch git-bundle git-cat-file git-check-attr git-checkout-index git-check-ref-format git-commit-tree git-count-objects git-describe git-diff git-diff-files git-diff-index git-diff-tree git-fetch--tool git-fmt-merge-msg git-for-each-ref git-fsck git-gc git-grep git-init-db git-log git-ls-files git-ls-tree git-mailinfo git-mailsplit git-merge-base git-merge-file git-mv git-name-rev git-pack-objects git-prune git-prune-packed git-push git-read-tree git-reflog git-config git-rerere git-rev-list git-rev-parse git-revert git-rm git-runstatus git-shortlog git-show-branch git-stripspace git-symbolic-ref git-tag git-tar-tree git-unpack-objects git-update-index git-update-ref git-upload-archive git-verify-pack git-verify-tag git-write-tree git-show-ref git-pack-refs git
rm -f test-chmtime test-genrandom test-date test-delta test-sha1 test-match-trees test-absolute-path
rm -f *.spec *.pyc *.pyo */*.pyc */*.pyo common-cmds.h TAGS tags
rm -f -r autom4te.cache
rm -f config.log config.mak.autogen config.mak.append config.status config.cache
rm -f -r git-1.5.3.8 .doc-tmp-dir
rm -f git-1.5.3.8.tar.gz git-core_1.5.3.8-*.tar.gz
rm -f git-htmldocs-1.5.3.8.tar.gz git-manpages-1.5.3.8.tar.gz
rm -f gitweb/gitweb.cgi
/usr/bin/make -C Documentation/ clean
make[2]: Entering directory `/build/buildd/git-core-1.5.3.8/Documentation'
rm -f doc.dep+ doc.dep
perl ./build-docdep.perl >doc.dep+
mv doc.dep+ doc.dep
/usr/bin/make -C ../ GIT-VERSION-FILE
make[3]: Entering directory `/build/buildd/git-core-1.5.3.8'
make[3]: `GIT-VERSION-FILE' is up to date.
make[3]: Leaving directory `/build/buildd/git-core-1.5.3.8'
make[2]: Leaving directory `/build/buildd/git-core-1.5.3.8/Documentation'
make[2]: Entering directory `/build/buildd/git-core-1.5.3.8/Documentation'
/usr/bin/make -C ../ GIT-VERSION-FILE
make[3]: Entering directory `/build/buildd/git-core-1.5.3.8'
make[3]: `GIT-VERSION-FILE' is up to date.
make[3]: Leaving directory `/build/buildd/git-core-1.5.3.8'
rm -f *.xml *.xml+ *.html *.html+ *.1 *.5 *.7 *.texi *.texi+ howto-index.txt howto/*.html doc.dep
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 *.made
make[2]: Leaving directory `/build/buildd/git-core-1.5.3.8/Documentation'
/usr/bin/make -C perl clean
make[2]: Entering directory `/build/buildd/git-core-1.5.3.8/perl'
rm -f ppport.h
rm -f perl.mak
rm -f perl.mak.old
make[2]: Leaving directory `/build/buildd/git-core-1.5.3.8/perl'
/usr/bin/make -C templates/ clean
make[2]: Entering directory `/build/buildd/git-core-1.5.3.8/templates'
rm -f -r blt boilerplates.made
make[2]: Leaving directory `/build/buildd/git-core-1.5.3.8/templates'
/usr/bin/make -C t/ clean
make[2]: Entering directory `/build/buildd/git-core-1.5.3.8/t'
rm -f -r trash
make[2]: Leaving directory `/build/buildd/git-core-1.5.3.8/t'
rm -f gitk-wish
/usr/bin/make -C git-gui clean
make[2]: Entering directory `/build/buildd/git-core-1.5.3.8/git-gui'
GITGUI_VERSION = 0.8.4
make[2]: Leaving directory `/build/buildd/git-core-1.5.3.8/git-gui'
make[2]: Entering directory `/build/buildd/git-core-1.5.3.8/git-gui'
rm -f git-citool git-gui lib/tclIndex
rm -f GIT-VERSION-FILE GIT-GUI-VARS
make[2]: Leaving directory `/build/buildd/git-core-1.5.3.8/git-gui'
rm -f GIT-VERSION-FILE GIT-CFLAGS GIT-GUI-VARS
make[1]: Leaving directory `/build/buildd/git-core-1.5.3.8'
! test -e patch-stamp || \
for i in `ls -1r debian/diff/*.diff || :`; do patch -p1 -R <$i; done
rm -rf '/build/buildd/git-core-1.5.3.8/tmp'
rm -f patch-stamp build-arch-stamp build-indep-stamp
rm -rf '/build/buildd/git-core-1.5.3.8/debian/git'-core '/build/buildd/git-core-1.5.3.8/debian/git'-doc '/build/buildd/git-core-1.5.3.8/debian/git'-arch '/build/buildd/git-core-1.5.3.8/debian/git'-cvs \
'/build/buildd/git-core-1.5.3.8/debian/git'-svn '/build/buildd/git-core-1.5.3.8/debian/git'-email '/build/buildd/git-core-1.5.3.8/debian/git'-daemon-run '/build/buildd/git-core-1.5.3.8/debian/git'-gui \
'/build/buildd/git-core-1.5.3.8/debian/git'k '/build/buildd/git-core-1.5.3.8/debian/git'web
rm -f debian/files debian/substvars changelog
debian/rules build
for i in `ls -1 debian/diff/*.diff || :`; do \
patch -p1 <$i || exit 1; \
done
patching file pager.c
patching file builtin-tag.c
patching file git-sh-setup.sh
patching file t/t7005-editor.sh
patching file ident.c
patching file contrib/hooks/post-receive-email
patching file Makefile
patching file perl/Makefile.PL
touch patch-stamp
gcc -v
Using built-in specs.
Target: powerpc-linux-gnu
Configured with: ../src/configure -v --enable-languages=c,c++,fortran,objc,obj-c++,treelang --prefix=/usr --enable-shared --with-system-zlib --libexecdir=/usr/lib --without-included-gettext --enable-threads=posix --enable-nls --with-gxx-include-dir=/usr/include/c++/4.2 --program-suffix=-4.2 --enable-clocale=gnu --enable-libstdcxx-debug --enable-objc-gc --enable-mpfr --disable-softfloat --enable-secureplt --enable-targets=powerpc-linux,powerpc64-linux --with-cpu=default32 --with-long-double-128 --enable-checking=release --build=powerpc-linux-gnu --host=powerpc-linux-gnu --target=powerpc-linux-gnu
Thread model: posix
gcc version 4.2.3 (Ubuntu 4.2.3-1ubuntu2)
DESTDIR='/build/buildd/git-core-1.5.3.8/debian/git'-core /usr/bin/make all test \
CC='gcc' CFLAGS='-g -Wall -O2' NO_OPENSSL=1 GITWEB_CONFIG=/etc/gitweb.conf prefix=/usr mandir=/usr/share/man INSTALLDIRS=vendor WITH_P4IMPORT=1 PYTHON_PATH=/usr/bin/python TCLTK_PATH=/usr/bin/wish8.4 PPC_SHA1=1
make[1]: Entering directory `/build/buildd/git-core-1.5.3.8'
GIT_VERSION = 1.5.3.8
make[1]: Leaving directory `/build/buildd/git-core-1.5.3.8'
make[1]: Entering directory `/build/buildd/git-core-1.5.3.8'
* new build flags or prefix
CC convert-objects.o
CC blob.o
CC commit.o
CC connect.o
CC csum-file.o
CC cache-tree.o
CC base85.o
CC date.o
CC diff-delta.o
CC entry.o
CC exec_cmd.o
CC ident.o
CC interpolate.o
CC lockfile.o
CC patch-ids.o
CC object.o
CC pack-check.o
CC pack-write.o
CC patch-delta.o
CC path.o
CC pkt-line.o
CC sideband.o
CC reachable.o
CC reflog-walk.o
CC quote.o
CC read-cache.o
CC refs.o
CC run-command.o
CC dir.o
CC object-refs.o
CC server-info.o
CC setup.o
CC sha1_file.o
CC sha1_name.o
CC strbuf.o
CC tag.o
CC tree.o
CC usage.o
CC config.o
CC environment.o
CC ctype.o
CC copy.o
CC revision.o
CC pager.o
CC tree-walk.o
CC xdiff-interface.o
CC write_or_die.o
CC trace.o
CC list-objects.o
CC grep.o
CC match-trees.o
CC alloc.o
CC merge-file.o
CC path-list.o
GEN common-cmds.h
CC help.o
CC unpack-trees.o
CC diff.o
CC diff-lib.o
CC diffcore-break.o
CC diffcore-order.o
CC diffcore-pickaxe.o
CC diffcore-rename.o
CC tree-diff.o
CC combine-diff.o
CC diffcore-delta.o
CC log-tree.o
CC color.o
CC wt-status.o
CC archive-zip.o
CC archive-tar.o
CC shallow.o
CC utf8.o
CC convert.o
CC attr.o
CC decorate.o
CC progress.o
CC mailmap.o
CC symlinks.o
CC remote.o
CC ppc/sha1.o
CC ppc/sha1ppc.o
CC compat/strlcpy.o
AR libgit.a
CC xdiff/xdiffi.o
CC xdiff/xprepare.o
CC xdiff/xutils.o
CC xdiff/xemit.o
CC xdiff/xmerge.o
AR xdiff/lib.a
LINK git-convert-objects
CC fetch-pack.o
LINK git-fetch-pack
CC hash-object.o
LINK git-hash-object
CC index-pack.o
LINK git-index-pack
CC local-fetch.o
CC fetch.o
LINK git-local-fetch
CC fast-import.o
LINK git-fast-import
CC daemon.o
LINK git-daemon
CC merge-index.o
LINK git-merge-index
CC mktag.o
LINK git-mktag
CC mktree.o
LINK git-mktree
CC patch-id.o
LINK git-patch-id
CC peek-remote.o
LINK git-peek-remote
CC receive-pack.o
LINK git-receive-pack
CC send-pack.o
LINK git-send-pack
CC shell.o
LINK git-shell
CC show-index.o
LINK git-show-index
CC ssh-fetch.o
CC rsh.o
LINK git-ssh-fetch
CC ssh-upload.o
LINK git-ssh-upload
CC unpack-file.o
LINK git-unpack-file
CC update-server-info.o
LINK git-update-server-info
CC upload-pack.o
LINK git-upload-pack
CC pack-redundant.o
LINK git-pack-redundant
CC var.o
LINK git-var
CC merge-tree.o
LINK git-merge-tree
CC imap-send.o
LINK git-imap-send
CC merge-recursive.o
LINK git-merge-recursive
CC ssh-pull.o
LINK git-ssh-pull
CC ssh-push.o
LINK git-ssh-push
CC http.o
CC http-fetch.o
LINK git-http-fetch
CC http-push.o
LINK git-http-push
GEN git-bisect
GEN git-checkout
GEN git-clean
GEN git-clone
GEN git-commit
GEN git-fetch
GEN git-ls-remote
GEN git-merge-one-file
GEN git-mergetool
GEN git-parse-remote
GEN git-pull
GEN git-rebase
GEN git-rebase--interactive
GEN git-repack
GEN git-request-pull
GEN git-reset
GEN git-sh-setup
GEN git-am
GEN git-merge
GEN git-merge-stupid
GEN git-merge-octopus
GEN git-merge-resolve
GEN git-merge-ours
GEN git-lost-found
GEN git-quiltimport
GEN git-submodule
GEN git-filter-branch
GEN git-stash
make[2]: Entering directory `/build/buildd/git-core-1.5.3.8/perl'
/usr/bin/perl Makefile.PL PREFIX='/usr'
Writing perl.mak for Git
make[2]: Leaving directory `/build/buildd/git-core-1.5.3.8/perl'
GEN git-add--interactive
GEN git-archimport
GEN git-cvsimport
GEN git-relink
GEN git-cvsserver
GEN git-remote
GEN git-svnimport
GEN git-cvsexportcommit
GEN git-send-email
GEN git-svn
GEN git-status
GEN gitweb/gitweb.cgi
GEN git-instaweb
BUILTIN git-merge-subtree
CC git.o
CC builtin-add.o
CC builtin-annotate.o
CC builtin-apply.o
CC builtin-archive.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-checkout-index.o
CC builtin-check-ref-format.o
CC builtin-commit-tree.o
CC builtin-count-objects.o
CC builtin-describe.o
CC builtin-diff.o
CC builtin-diff-files.o
CC builtin-diff-index.o
CC builtin-diff-tree.o
CC builtin-fetch--tool.o
CC builtin-fmt-merge-msg.o
CC builtin-for-each-ref.o
CC builtin-fsck.o
CC builtin-gc.o
CC builtin-grep.o
CC builtin-init-db.o
CC builtin-log.o
CC builtin-ls-files.o
CC builtin-ls-tree.o
CC builtin-mailinfo.o
CC builtin-mailsplit.o
CC builtin-merge-base.o
CC builtin-merge-file.o
CC builtin-mv.o
CC builtin-name-rev.o
CC builtin-pack-objects.o
CC builtin-prune.o
CC builtin-prune-packed.o
CC builtin-push.o
CC builtin-read-tree.o
CC builtin-reflog.o
CC builtin-config.o
CC builtin-rerere.o
CC builtin-rev-list.o
CC builtin-rev-parse.o
CC builtin-revert.o
CC builtin-rm.o
CC builtin-runstatus.o
CC builtin-shortlog.o
CC builtin-show-branch.o
CC builtin-stripspace.o
CC builtin-symbolic-ref.o
CC builtin-tag.o
CC builtin-tar-tree.o
CC builtin-unpack-objects.o
CC builtin-update-index.o
CC builtin-update-ref.o
CC builtin-upload-archive.o
CC builtin-verify-pack.o
CC builtin-verify-tag.o
CC builtin-write-tree.o
CC builtin-show-ref.o
CC builtin-pack-refs.o
LINK git
BUILTIN git-format-patch
BUILTIN git-show
BUILTIN git-whatchanged
BUILTIN git-cherry
BUILTIN git-get-tar-commit-id
BUILTIN git-init
BUILTIN git-repo-config
BUILTIN git-fsck-objects
BUILTIN git-cherry-pick
BUILTIN git-add
BUILTIN git-annotate
BUILTIN git-apply
BUILTIN git-archive
BUILTIN git-blame
BUILTIN git-branch
BUILTIN git-bundle
BUILTIN git-cat-file
BUILTIN git-check-attr
BUILTIN git-checkout-index
BUILTIN git-check-ref-format
BUILTIN git-commit-tree
BUILTIN git-count-objects
BUILTIN git-describe
BUILTIN git-diff
BUILTIN git-diff-files
BUILTIN git-diff-index
BUILTIN git-diff-tree
BUILTIN git-fetch--tool
BUILTIN git-fmt-merge-msg
BUILTIN git-for-each-ref
BUILTIN git-fsck
BUILTIN git-gc
BUILTIN git-grep
BUILTIN git-init-db
BUILTIN git-log
BUILTIN git-ls-files
BUILTIN git-ls-tree
BUILTIN git-mailinfo
BUILTIN git-mailsplit
BUILTIN git-merge-base
BUILTIN git-merge-file
BUILTIN git-mv
BUILTIN git-name-rev
BUILTIN git-pack-objects
BUILTIN git-prune
BUILTIN git-prune-packed
BUILTIN git-push
BUILTIN git-read-tree
BUILTIN git-reflog
BUILTIN git-config
BUILTIN git-rerere
BUILTIN git-rev-list
BUILTIN git-rev-parse
BUILTIN git-revert
BUILTIN git-rm
BUILTIN git-runstatus
BUILTIN git-shortlog
BUILTIN git-show-branch
BUILTIN git-stripspace
BUILTIN git-symbolic-ref
BUILTIN git-tag
BUILTIN git-tar-tree
BUILTIN git-unpack-objects
BUILTIN git-update-index
BUILTIN git-update-ref
BUILTIN git-upload-archive
BUILTIN git-verify-pack
BUILTIN git-verify-tag
BUILTIN git-write-tree
BUILTIN git-show-ref
BUILTIN git-pack-refs
* new Tcl/Tk interpreter location
GEN gitk-wish
make[2]: Entering directory `/build/buildd/git-core-1.5.3.8/git-gui'
GITGUI_VERSION = 0.8.4
make[2]: Leaving directory `/build/buildd/git-core-1.5.3.8/git-gui'
make[2]: Entering directory `/build/buildd/git-core-1.5.3.8/git-gui'
* new locations or Tcl/Tk interpreter
GEN git-gui
BUILTIN git-citool
INDEX lib/
make[2]: Leaving directory `/build/buildd/git-core-1.5.3.8/git-gui'
make[2]: Entering directory `/build/buildd/git-core-1.5.3.8/perl'
make[3]: Entering directory `/build/buildd/git-core-1.5.3.8/perl'
cp private-Error.pm blib/lib/Error.pm
cp Git.pm blib/lib/Git.pm
Manifying blib/man3/private-Error.3pm
Manifying blib/man3/Git.3pm
make[3]: Leaving directory `/build/buildd/git-core-1.5.3.8/perl'
make[2]: Leaving directory `/build/buildd/git-core-1.5.3.8/perl'
make[2]: Entering directory `/build/buildd/git-core-1.5.3.8/templates'
make[2]: Leaving directory `/build/buildd/git-core-1.5.3.8/templates'
CC test-chmtime.o
LINK test-chmtime
CC test-genrandom.o
LINK test-genrandom
CC test-date.o
LINK test-date
CC test-delta.o
LINK test-delta
CC test-sha1.o
LINK test-sha1
CC test-match-trees.o
LINK test-match-trees
CC test-absolute-path.o
LINK test-absolute-path
/usr/bin/make -C t/ all
make[2]: Entering directory `/build/buildd/git-core-1.5.3.8/t'
*** t0000-basic.sh ***
* ok 1: .git/objects should be empty after git init in an empty repo.
* ok 2: .git/objects should have 3 subdirectories.
* ok 3: git update-index without --add should fail adding.
* ok 4: git update-index with --add should succeed.
* ok 5: writing tree out with git write-tree
* ok 6: validate object ID of a known tree.
* ok 7: git update-index without --remove should fail removing.
* ok 8: git update-index with --remove should be able to remove.
* ok 9: git write-tree should be able to write an empty tree.
* ok 10: validate object ID of a known tree.
* ok 11: adding various types of objects with git update-index --add.
* ok 12: showing stage with git ls-files --stage
* ok 13: validate git ls-files output for a known tree.
* ok 14: writing tree out with git write-tree.
* ok 15: validate object ID for a known tree.
* ok 16: showing tree with git ls-tree
* ok 17: git ls-tree output for a known tree.
* ok 18: showing tree with git ls-tree -r
* ok 19: git ls-tree -r output for a known tree.
* ok 20: showing tree with git ls-tree -r -t
* ok 21: git ls-tree -r output for a known tree.
* ok 22: writing partial tree out with git write-tree --prefix.
* ok 23: validate object ID for a known tree.
* ok 24: writing partial tree out with git write-tree --prefix.
* ok 25: validate object ID for a known tree.
* ok 26: put invalid objects into the index.
* ok 27: writing this tree without --missing-ok.
* ok 28: writing this tree with --missing-ok.
* ok 29: git read-tree followed by write-tree should be idempotent.
* ok 30: validate git diff-files output for a know cache/work tree state.
* ok 31: git update-index --refresh should succeed.
* ok 32: no diff after checkout and git update-index --refresh.
* ok 33: git commit-tree records the correct tree in a commit.
* ok 34: git commit-tree records the correct parent in a commit.
* ok 35: git commit-tree omits duplicated parent in a commit.
* ok 36: update-index D/F conflict
* ok 37: absolute path works as expected
* passed all 37 test(s)
*** t0001-init.sh ***
* ok 1: plain
* ok 2: plain with GIT_WORK_TREE
* ok 3: plain bare
* ok 4: plain bare with GIT_WORK_TREE
* ok 5: GIT_DIR bare
* ok 6: GIT_DIR non-bare
* ok 7: GIT_DIR & GIT_WORK_TREE (1)
* ok 8: GIT_DIR & GIT_WORK_TREE (2)
* passed all 8 test(s)
*** t0010-racy-git.sh ***
* ok 1: Racy GIT trial #0 part A
* ok 2: Racy GIT trial #0 part B
* ok 3: Racy GIT trial #1 part A
* ok 4: Racy GIT trial #1 part B
* ok 5: Racy GIT trial #2 part A
* ok 6: Racy GIT trial #2 part B
* ok 7: Racy GIT trial #3 part A
* ok 8: Racy GIT trial #3 part B
* ok 9: Racy GIT trial #4 part A
* ok 10: Racy GIT trial #4 part B
* passed all 10 test(s)
*** t0020-crlf.sh ***
* ok 1: setup
* ok 2: update with autocrlf=input
* ok 3: update with autocrlf=true
* ok 4: checkout with autocrlf=true
* ok 5: checkout with autocrlf=input
* ok 6: apply patch (autocrlf=input)
* ok 7: apply patch --cached (autocrlf=input)
* ok 8: apply patch --index (autocrlf=input)
* ok 9: apply patch (autocrlf=true)
* ok 10: apply patch --cached (autocrlf=true)
* ok 11: apply patch --index (autocrlf=true)
* ok 12: .gitattributes says two is binary
* ok 13: .gitattributes says two is input
* ok 14: .gitattributes says two and three are text
* ok 15: in-tree .gitattributes (1)
* ok 16: in-tree .gitattributes (2)
* ok 17: in-tree .gitattributes (3)
* ok 18: in-tree .gitattributes (4)
* ok 19: invalid .gitattributes (must not crash)
* passed all 19 test(s)
*** t0021-conversion.sh ***
* ok 1: setup
* ok 2: check
* ok 3: expanded_in_repo
* passed all 3 test(s)
*** t0022-crlf-rename.sh ***
* ok 1: setup
* ok 2: diff -M
* passed all 2 test(s)
*** t0023-crlf-am.sh ***
* ok 1: setup
* ok 2: am
* passed all 2 test(s)
*** t0030-stripspace.sh ***
* ok 1: long lines without spaces should be unchanged
* ok 2: lines with spaces at the beginning should be unchanged
* ok 3: lines with intermediate spaces should be unchanged
* ok 4: consecutive blank lines should be unified
* ok 5: only consecutive blank lines should be completely removed
* ok 6: consecutive blank lines at the beginning should be removed
* ok 7: consecutive blank lines at the end should be removed
* ok 8: text without newline at end should end with newline
* ok 9: text plus spaces without newline at end should end with newline
* ok 10: text plus spaces without newline at end should not show spaces
* ok 11: text plus spaces without newline should show the correct lines
* ok 12: text plus spaces at end should not show spaces
* ok 13: text plus spaces at end should be cleaned and newline must remain
* ok 14: spaces with newline at end should be replaced with empty string
* ok 15: spaces without newline at end should not show spaces
* ok 16: spaces without newline at end should be replaced with empty string
* ok 17: consecutive text lines should be unchanged
* ok 18: strip comments, too
* passed all 18 test(s)
*** t1000-read-tree-m-3way.sh ***
* 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 4: adding test file DN and Z/DN
* 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 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 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 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 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 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: 3-way merge with git read-tree -m, empty cache
* ok 46: 3-way merge with git read-tree -m, match H
* ok 47: 1 - must not have an entry not in A.
* ok 48: 2 - must match B in !O && !A && B case.
* ok 49: 2 - matching B alone is OK in !O && !A && B case.
* ok 50: 3 - must match A in !O && A && !B case.
* ok 51: 3 - matching A alone is OK in !O && A && !B case.
* ok 52: 3 (fail) - must match A in !O && A && !B case.
* ok 53: 4 - must match and be up-to-date in !O && A && B && A!=B case.
* ok 54: 4 (fail) - must match and be up-to-date in !O && A && B && A!=B case.
* ok 55: 4 (fail) - must match and be up-to-date in !O && A && B && A!=B case.
* ok 56: 5 - must match in !O && A && B && A==B case.
* ok 57: 5 - must match in !O && A && B && A==B case.
* ok 58: 5 (fail) - must match A in !O && A && B && A==B case.
* ok 59: 6 - must not exist in O && !A && !B case
* ok 60: 7 - must not exist in O && !A && B && O!=B case
* ok 61: 8 - must not exist in O && !A && B && O==B case
* ok 62: 9 - must match and be up-to-date in O && A && !B && O!=A case
* ok 63: 9 (fail) - must match and be up-to-date in O && A && !B && O!=A case
* ok 64: 9 (fail) - must match and be up-to-date in O && A && !B && O!=A case
* ok 65: 10 - must match and be up-to-date in O && A && !B && O==A case
* ok 66: 10 (fail) - must match and be up-to-date in O && A && !B && O==A case
* ok 67: 10 (fail) - must match and be up-to-date in O && A && !B && O==A case
* ok 68: 11 - must match and be up-to-date in O && A && B && O!=A && O!=B && A!=B case
* ok 69: 11 (fail) - must match and be up-to-date in O && A && B && O!=A && O!=B && A!=B case
* ok 70: 11 (fail) - must match and be up-to-date in O && A && B && O!=A && O!=B && A!=B case
* ok 71: 12 - must match A in O && A && B && O!=A && A==B case
* ok 72: 12 - must match A in O && A && B && O!=A && A==B case
* ok 73: 12 (fail) - must match A in O && A && B && O!=A && A==B case
* ok 74: 13 - must match A in O && A && B && O!=A && O==B case
* ok 75: 13 - must match A in O && A && B && O!=A && O==B case
* ok 76: 14 - must match and be up-to-date in O && A && B && O==A && O!=B case
* ok 77: 14 - may match B in O && A && B && O==A && O!=B case
* ok 78: 14 (fail) - must match and be up-to-date in O && A && B && O==A && O!=B case
* ok 79: 14 (fail) - must match and be up-to-date in O && A && B && O==A && O!=B case
* ok 80: 15 - must match A in O && A && B && O==A && O==B case
* ok 81: 15 - must match A in O && A && B && O==A && O==B case
* ok 82: 15 (fail) - must match A in O && A && B && O==A && O==B case
* ok 83: 16 - A matches in one and B matches in another.
* passed all 83 test(s)
*** t1001-read-tree-m-2way.sh ***
* ok 1: setup
* ok 2: 1, 2, 3 - no carry forward
* ok 3: 4 - carry forward local addition.
* ok 4: 5 - carry forward local addition.
* ok 5: 6 - local addition already has the same.
* ok 6: 7 - local addition already has the same.
* ok 7: 8 - conflicting addition.
* ok 8: 9 - conflicting addition.
* ok 9: 10 - path removed.
* ok 10: 11 - dirty path removed.
* ok 11: 12 - unmatching local changes being removed.
* ok 12: 13 - unmatching local changes being removed.
* ok 13: 14 - unchanged in two heads.
* ok 14: 15 - unchanged in two heads.
* ok 15: 16 - conflicting local change.
* ok 16: 17 - conflicting local change.
* ok 17: 18 - local change already having a good result.
* ok 18: 19 - local change already having a good result, further modified.
* ok 19: 20 - no local change, use new tree.
* ok 20: 21 - no local change, dirty cache.
* ok 21: 22 - local change cache updated.
* ok 22: DF vs DF/DF case setup.
* ok 23: DF vs DF/DF case test.
* passed all 23 test(s)
*** t1002-read-tree-m-u-2way.sh ***
* ok 1: setup
* ok 2: 1, 2, 3 - no carry forward
* ok 3: 4 - carry forward local addition.
* ok 4: 5 - carry forward local addition.
* ok 5: 6 - local addition already has the same.
* ok 6: 7 - local addition already has the same.
* ok 7: 8 - conflicting addition.
* ok 8: 9 - conflicting addition.
* ok 9: 10 - path removed.
* ok 10: 11 - dirty path removed.
* ok 11: 12 - unmatching local changes being removed.
* ok 12: 13 - unmatching local changes being removed.
* ok 13: 14 - unchanged in two heads.
* ok 14: 15 - unchanged in two heads.
* ok 15: 16 - conflicting local change.
* ok 16: 17 - conflicting local change.
* ok 17: 18 - local change already having a good result.
* ok 18: 19 - local change already having a good result, further modified.
* ok 19: 20 - no local change, use new tree.
* ok 20: 21 - no local change, dirty cache.
* ok 21: DF vs DF/DF case setup.
* ok 22: DF vs DF/DF case test.
* passed all 22 test(s)
*** t1003-read-tree-prefix.sh ***
* ok 1: setup
* ok 2: read-tree --prefix
* passed all 2 test(s)
*** t1004-read-tree-m-u-wf.sh ***
* ok 1: two-way setup
* ok 2: two-way not clobbering
* ok 3: two-way with incorrect --exclude-per-directory (1)
* ok 4: two-way with incorrect --exclude-per-directory (2)
* ok 5: two-way clobbering a ignored file
* ok 6: three-way not complaining on an untracked path in both
* ok 7: three-way not clobbering a working tree file
* ok 8: three-way not complaining on an untracked file
* passed all 8 test(s)
*** t1020-subdirectory.sh ***
* ok 1: setup
* ok 2: update-index and ls-files
* ok 3: cat-file
* ok 4: diff-files
* ok 5: write-tree
* ok 6: checkout-index
* ok 7: read-tree
* ok 8: no file/rev ambiguity check inside .git
* ok 9: no file/rev ambiguity check inside a bare repo
* ok 10: detection should not be fooled by a symlink
* passed all 10 test(s)
*** t1100-commit-tree-options.sh ***
* ok 1: test preparation: write empty tree
* ok 2: construct commit
* ok 3: read commit
* ok 4: compare commit
* passed all 4 test(s)
*** t1200-tutorial.sh ***
* ok 1: blob
* ok 2: blob 557db03
* ok 3: git diff-files -p
* ok 4: git diff
* ok 5: tree
* ok 6: git diff-index -p HEAD
* ok 7: git diff HEAD
* ok 8: git whatchanged -p --root
* ok 9: git tag my-first-tag
M hello
Switched to a new branch "mybranch"
* ok 10: git checkout -b mybranch
* ok 11: git branch
M hello
Already on branch "mybranch"
Created commit c57bfd3: Some work.
1 files changed, 2 insertions(+), 0 deletions(-)
Switched to branch "master"
Created commit 9f9a775: Some fun.
2 files changed, 2 insertions(+), 0 deletions(-)
* ok 12: git resolve now fails
Created commit 481be04: Merged "mybranch" changes.
* passed all 12 test(s)
*** t1300-repo-config.sh ***
* ok 1: initial
* ok 2: mixed case
* ok 3: similar section
* ok 4: similar section
* ok 5: replace with non-match
* ok 6: replace with non-match (actually matching)
* ok 7: non-match result
* ok 8: multiple unset
* ok 9: multiple unset is correct
* ok 10: --replace-all
* ok 11: all replaced
* ok 12: really mean test
* ok 13: really really mean test
* ok 14: get value
* ok 15: unset
* ok 16: multivar
* ok 17: non-match
* ok 18: non-match value
* ok 19: ambiguous get
* ok 20: get multivar
* ok 21: multivar replace
* ok 22: ambiguous value
* ok 23: ambiguous unset
* ok 24: invalid unset
* ok 25: multivar unset
* ok 26: invalid key
* ok 27: correct key
* ok 28: hierarchical section
* ok 29: hierarchical section value
* ok 30: working --list
* ok 31: --get-regexp
* ok 32: --add
* ok 33: get variable with no value
* ok 34: get-regexp variable with no value
* ok 35: no arguments, but no crash
* ok 36: new section is partial match of another
* ok 37: new variable inserts into proper section
* ok 38: alternative GIT_CONFIG (non-existing file should fail)
* ok 39: alternative GIT_CONFIG
* ok 40: alternative GIT_CONFIG (--file)
* ok 41: --set in alternative GIT_CONFIG
* ok 42: rename section
* ok 43: rename succeeded
* ok 44: rename non-existing section
* ok 45: rename succeeded
* ok 46: rename another section
* ok 47: rename succeeded
* ok 48: remove section
* ok 49: section was removed properly
* ok 50: section ending
* ok 51: numbers
* ok 52: bool
* ok 53: invalid bool (--get)
* ok 54: invalid bool (set)
* ok 55: set --bool
* ok 56: set --int
* ok 57: quoting
* ok 58: key with newline
* ok 59: value with newline
* ok 60: value continued on next line
* ok 61: --null --list
* ok 62: --null --get-regexp
* ok 63: symlinked configuration
* passed all 63 test(s)
*** t1301-shared-repo.sh ***
* ok 1: shared=all
* ok 2: update-server-info honors core.sharedRepository
* passed all 2 test(s)
*** t1302-repo-version.sh ***
* ok 1: gitdir selection on normal repos
* ok 2: gitdir selection on unsupported repo
* ok 3: gitdir not required mode
* ok 4: gitdir required mode on normal repos
* ok 5: gitdir required mode on unsupported repo
* passed all 5 test(s)
*** t1400-update-ref.sh ***
* ok 1: create refs/heads/master
* ok 2: create refs/heads/master
* ok 3: fail to create refs/heads/gu/fixes
* ok 4: create refs/heads/master (by HEAD)
* ok 5: create refs/heads/master (by HEAD)
* ok 6: (not) create HEAD with old sha1
* ok 7: (not) prior created .git/refs/heads/master
* ok 8: create HEAD
* ok 9: (not) change HEAD with wrong SHA1
* ok 10: (not) changed .git/refs/heads/master
* ok 11: create refs/heads/master (logged by touch)
* ok 12: update refs/heads/master (logged by touch)
* ok 13: set refs/heads/master (logged by touch)
* ok 14: verifying refs/heads/master's log
* ok 15: enable core.logAllRefUpdates
* ok 16: create refs/heads/master (logged by config)
* ok 17: update refs/heads/master (logged by config)
* ok 18: set refs/heads/master (logged by config)
* ok 19: verifying refs/heads/master's log
* ok 20: Query "master@{May 25 2005}" (before history)
* ok 21: Query master@{2005-05-25} (before history)
* ok 22: Query "master@{May 26 2005 23:31:59}" (1 second before history)
* ok 23: Query "master@{May 26 2005 23:32:00}" (exactly history start)
* ok 24: Query "master@{2005-05-26 23:33:01}" (middle of history with gap)
* ok 25: Query "master@{2005-05-26 23:38:00}" (middle of history)
* ok 26: Query "master@{2005-05-26 23:43:00}" (exact end of history)
* ok 27: Query "master@{2005-05-28}" (past end of history)
* ok 28: creating initial files
* ok 29: git-commit logged updates
* ok 30: git cat-file blob master:F (expect OTHER)
* ok 31: git cat-file blob master@{2005-05-26 23:30}:F (expect TEST)
* ok 32: git cat-file blob master@{2005-05-26 23:42}:F (expect OTHER)
* passed all 32 test(s)
*** t1410-reflog.sh ***
* ok 1: setup
* ok 2: rewind
* ok 3: corrupt and check
* ok 4: reflog expire --dry-run should not touch reflog
* ok 5: reflog expire
* ok 6: prune and fsck
* ok 7: recover and check
* passed all 7 test(s)
*** t1420-lost-found.sh ***
* ok 1: setup
* ok 2: lost and found something
* passed all 2 test(s)
*** t1500-rev-parse.sh ***
* ok 1: toplevel: is-bare-repository
* ok 2: toplevel: is-inside-git-dir
* ok 3: toplevel: is-inside-work-tree
* ok 4: toplevel: prefix
* ok 5: .git/: is-bare-repository
* ok 6: .git/: is-inside-git-dir
* ok 7: .git/: is-inside-work-tree
* ok 8: .git/: prefix
* ok 9: .git/objects/: is-bare-repository
* ok 10: .git/objects/: is-inside-git-dir
* ok 11: .git/objects/: is-inside-work-tree
* ok 12: .git/objects/: prefix
* ok 13: subdirectory: is-bare-repository
* ok 14: subdirectory: is-inside-git-dir
* ok 15: subdirectory: is-inside-work-tree
* ok 16: subdirectory: prefix
* ok 17: core.bare = true: is-bare-repository
* ok 18: core.bare = true: is-inside-git-dir
* ok 19: core.bare = true: is-inside-work-tree
* ok 20: core.bare undefined: is-bare-repository
* ok 21: core.bare undefined: is-inside-git-dir
* ok 22: core.bare undefined: is-inside-work-tree
* ok 23: GIT_DIR=../.git, core.bare = false: is-bare-repository
* ok 24: GIT_DIR=../.git, core.bare = false: is-inside-git-dir
* ok 25: GIT_DIR=../.git, core.bare = false: is-inside-work-tree
* ok 26: GIT_DIR=../.git, core.bare = false: prefix
* ok 27: GIT_DIR=../.git, core.bare = true: is-bare-repository
* ok 28: GIT_DIR=../.git, core.bare = true: is-inside-git-dir
* ok 29: GIT_DIR=../.git, core.bare = true: is-inside-work-tree
* ok 30: GIT_DIR=../.git, core.bare = true: prefix
* ok 31: GIT_DIR=../.git, core.bare undefined: is-bare-repository
* ok 32: GIT_DIR=../.git, core.bare undefined: is-inside-git-dir
* ok 33: GIT_DIR=../.git, core.bare undefined: is-inside-work-tree
* ok 34: GIT_DIR=../.git, core.bare undefined: prefix
* ok 35: GIT_DIR=../repo.git, core.bare = false: is-bare-repository
* ok 36: GIT_DIR=../repo.git, core.bare = false: is-inside-git-dir
* ok 37: GIT_DIR=../repo.git, core.bare = false: is-inside-work-tree
* ok 38: GIT_DIR=../repo.git, core.bare = false: prefix
* ok 39: GIT_DIR=../repo.git, core.bare = true: is-bare-repository
* ok 40: GIT_DIR=../repo.git, core.bare = true: is-inside-git-dir
* ok 41: GIT_DIR=../repo.git, core.bare = true: is-inside-work-tree
* ok 42: GIT_DIR=../repo.git, core.bare = true: prefix
* ok 43: GIT_DIR=../repo.git, core.bare undefined: is-bare-repository
* ok 44: GIT_DIR=../repo.git, core.bare undefined: is-inside-git-dir
* ok 45: GIT_DIR=../repo.git, core.bare undefined: is-inside-work-tree
* ok 46: GIT_DIR=../repo.git, core.bare undefined: prefix
* passed all 46 test(s)
*** t1501-worktree.sh ***
* core.worktree = relative path
* ok 1: outside: is-bare-repository
* ok 2: outside: is-inside-git-dir
* ok 3: outside: is-inside-work-tree
* ok 4: inside: is-bare-repository
* ok 5: inside: is-inside-git-dir
* ok 6: inside: is-inside-work-tree
* ok 7: inside: prefix
* ok 8: subdirectory: is-bare-repository
* ok 9: subdirectory: is-inside-git-dir
* ok 10: subdirectory: is-inside-work-tree
* ok 11: subdirectory: prefix
* core.worktree = absolute path
* ok 12: outside: is-bare-repository
* ok 13: outside: is-inside-git-dir
* ok 14: outside: is-inside-work-tree
* ok 15: inside: is-bare-repository
* ok 16: inside: is-inside-git-dir
* ok 17: inside: is-inside-work-tree
* ok 18: inside: prefix
* ok 19: subdirectory: is-bare-repository
* ok 20: subdirectory: is-inside-git-dir
* ok 21: subdirectory: is-inside-work-tree
* ok 22: subdirectory: prefix
* GIT_WORK_TREE=relative path (override core.worktree)
* ok 23: outside: is-bare-repository
* ok 24: outside: is-inside-git-dir
* ok 25: outside: is-inside-work-tree
* ok 26: inside: is-bare-repository
* ok 27: inside: is-inside-git-dir
* ok 28: inside: is-inside-work-tree
* ok 29: inside: prefix
* ok 30: subdirectory: is-bare-repository
* ok 31: subdirectory: is-inside-git-dir
* ok 32: subdirectory: is-inside-work-tree
* ok 33: subdirectory: prefix
* GIT_WORK_TREE=absolute path, work tree below git dir
* ok 34: outside: is-bare-repository
* ok 35: outside: is-inside-git-dir
* ok 36: outside: is-inside-work-tree
* ok 37: in repo.git: is-bare-repository
* ok 38: in repo.git: is-inside-git-dir
* ok 39: in repo.git: is-inside-work-tree
* ok 40: in repo.git/objects: is-bare-repository
* ok 41: in repo.git/objects: is-inside-git-dir
* ok 42: in repo.git/objects: is-inside-work-tree
* ok 43: in repo.git/work: is-bare-repository
* ok 44: in repo.git/work: is-inside-git-dir
* ok 45: in repo.git/work: is-inside-work-tree
* ok 46: in repo.git/work: prefix
* ok 47: in repo.git/sub/dir: is-bare-repository
* ok 48: in repo.git/sub/dir: is-inside-git-dir
* ok 49: in repo.git/sub/dir: is-inside-work-tree
* ok 50: in repo.git/sub/dir: prefix
* ok 51: repo finds its work tree
* ok 52: repo finds its work tree from work tree, too
* ok 53: _gently() groks relative GIT_DIR & GIT_WORK_TREE
* passed all 53 test(s)
*** t2000-checkout-cache-clash.sh ***
* ok 1: git update-index --add various paths.
* ok 2: git checkout-index without -f should fail on conflicting work tree.
* ok 3: git checkout-index with -f should succeed.
* ok 4: git checkout-index conflicting paths.
* passed all 4 test(s)
*** t2001-checkout-cache-clash.sh ***
* ok 1: git update-index --add path0/file0
* ok 2: writing tree out with git write-tree
* ok 3: git update-index --add path1/file1
* ok 4: writing tree out with git write-tree
* ok 5: read previously written tree and checkout.
* ok 6: git update-index --add a symlink.
* ok 7: writing tree out with git write-tree
* ok 8: read previously written tree and checkout.
* ok 9: checking out conflicting path with -f
* passed all 9 test(s)
*** t2002-checkout-cache-u.sh ***
* ok 1: preparation
* ok 2: without -u, git checkout-index smudges stat information.
* ok 3: with -u, git checkout-index picks up stat information from new files.
* passed all 3 test(s)
*** t2003-checkout-cache-mkdir.sh ***
* 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 8: use --prefix=tmp- where tmp-path1 is a symlink
* passed all 8 test(s)
*** t2004-checkout-cache-temp.sh ***
* ok 1: preparation
* ok 2: checkout one stage 0 to temporary file
* ok 3: checkout all stage 0 to temporary files
* ok 4: prepare 3-way merge
* ok 5: checkout one stage 2 to temporary file
* 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 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 12: -- path1: all 3 stages
* ok 13: -- path2: no stage 1, have stage 2 and 3
* ok 14: -- path3: no stage 2, have stage 1 and 3
* ok 15: -- path4: no stage 3, have stage 1 and 3
* ok 16: -- asubdir/path5: no stage 2 and 3 have stage 1
* ok 17: checkout --temp within subdir
* ok 18: checkout --temp symlink
* passed all 18 test(s)
*** t2005-checkout-index-symlinks.sh ***
* ok 1: preparation
* 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)
*** t2007-checkout-symlink.sh ***
* ok 1: setup
* ok 2: switch from symlink to dir
Already on branch "master"
* ok 3: switch from dir to symlink
* passed all 3 test(s)
*** t2050-git-dir-relative.sh ***
* 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)
*** t2100-update-cache-badpath.sh ***
* ok 1: git update-index --add to add various paths.
* ok 2: git update-index to add conflicting path path0/file0 should fail.
* 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 5: git update-index to add conflicting path path3 should fail.
* passed all 5 test(s)
*** t2101-update-index-reupdate.sh ***
* ok 1: update-index --add
* ok 2: update-index --again
* ok 3: update-index --remove --again
* ok 4: first commit
* ok 5: update-index again
* ok 6: update-index --update from subdir
* ok 7: update-index --update with pathspec
* passed all 7 test(s)
*** 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
* passed all 3 test(s)
*** t2200-add-update.sh ***
* ok 1: setup
* 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 7: cache tree has not been corrupted
* ok 8: update from a subdirectory
* ok 9: change gets noticed
* ok 10: replace a file with a symlink
* ok 11: add everything changed
* ok 12: touch and then add -u
* ok 13: touch and then add explicitly
* passed all 13 test(s)
*** t3000-ls-files-others.sh ***
* ok 1: git ls-files --others to show output.
* ok 2: git ls-files --others should pick up symlinks.
* ok 3: git ls-files --others --directory to show output.
* ok 4: git ls-files --others --directory should not get confused.
* passed all 4 test(s)
*** t3001-ls-files-others-exclude.sh ***
* ok 1: git ls-files --others with various exclude options.
* ok 2: git ls-files --others with
line endings.
* ok 3: git-status honours core.excludesfile
* passed all 3 test(s)
*** t3002-ls-files-dashpath.sh ***
* ok 1: setup
* ok 2: git ls-files without path restriction.
* ok 3: git ls-files with path restriction.
* ok 4: git ls-files with path restriction with --.
* ok 5: git ls-files with path restriction with -- --.
* ok 6: git ls-files with no path restriction.
* passed all 6 test(s)
*** t3010-ls-files-killed-modified.sh ***
* ok 1: git update-index --add to add various paths.
* ok 2: git ls-files -k to show killed files.
* ok 3: validate git ls-files -k output.
* ok 4: git ls-files -m to show modified files.
* ok 5: validate git ls-files -m output.
* passed all 5 test(s)
*** t3020-ls-files-error-unmatch.sh ***
Created initial commit a96fad5: add foo bar
0 files changed, 0 insertions(+), 0 deletions(-)
create mode 100644 bar
create mode 100644 foo
* ok 1: git ls-files --error-unmatch should fail with unmatched path.
* ok 2: git ls-files --error-unmatch should succeed eith matched paths.
* passed all 2 test(s)
*** t3030-merge-recursive.sh ***
* ok 1: setup 1
* ok 2: setup 2
* ok 3: setup 3
* ok 4: setup 4
* ok 5: setup 5
* ok 6: setup 6
* ok 7: merge-recursive simple
* ok 8: merge-recursive result
* ok 9: merge-recursive remove conflict
* ok 10: merge-recursive remove conflict
* ok 11: merge-recursive d/f simple
* ok 12: merge-recursive result
* ok 13: merge-recursive d/f conflict
* ok 14: merge-recursive d/f conflict result
* ok 15: merge-recursive d/f conflict the other way
* ok 16: merge-recursive d/f conflict result the other way
* ok 17: merge-recursive d/f conflict
* ok 18: merge-recursive d/f conflict result
* ok 19: merge-recursive d/f conflict
* ok 20: merge-recursive d/f conflict result
* ok 21: reset and 3-way merge
* ok 22: reset and bind merge
* passed all 22 test(s)
*** t3040-subprojects-basic.sh ***
* ok 1: Super project creation
* ok 2: create subprojects
* ok 3: check if fsck ignores the subprojects
* 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 9: check if clone works
* ok 10: removing and adding subproject
* ok 11: checkout in superproject
* passed all 11 test(s)
*** t3050-subprojects-fetch.sh ***
* ok 1: setup
* ok 2: clone
* ok 3: advance
* ok 4: fetch
* passed all 4 test(s)
*** t3060-ls-files-with-tree.sh ***
* 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)
*** t3100-ls-tree-restrict.sh ***
* ok 1: setup
* ok 2: ls-tree plain
* ok 3: ls-tree recursive
* ok 4: ls-tree recursive with -t
* ok 5: ls-tree recursive with -d
* ok 6: ls-tree filtered with path
* ok 7: ls-tree filtered with path1 path0
* ok 8: ls-tree filtered with path0/
* ok 9: ls-tree filtered with path2
* ok 10: ls-tree filtered with path2/
* ok 11: ls-tree filtered with path2/baz
* ok 12: ls-tree filtered with path2/bak
* ok 13: ls-tree -t filtered with path2/bak
* passed all 13 test(s)
*** t3101-ls-tree-dirname.sh ***
* ok 1: setup
* ok 2: ls-tree plain
* ok 3: ls-tree recursive
* ok 4: ls-tree filter 1.txt
* ok 5: ls-tree filter path1/b/c/1.txt
* ok 6: ls-tree filter all 1.txt files
* ok 7: ls-tree filter directories
* ok 8: ls-tree filter odd names
* ok 9: ls-tree filter missing files and extra slashes
* passed all 9 test(s)
*** t3200-branch.sh ***
* ok 1: prepare a trivial repository
* ok 2: git branch --help should not have created a bogus branch
* ok 3: git branch abc should create a branch
* ok 4: git branch a/b/c should create a branch
* ok 5: git branch -l d/e/f should create a branch and a log
* ok 6: git branch -d d/e/f should delete a branch and a log
* ok 7: git branch j/k should work after branch j has been deleted
* ok 8: git branch l should work after branch l/m has been deleted
* ok 9: git branch -m m m/m should work
* ok 10: git branch -m n/n n should work
* ok 11: git branch -m o/o o should fail when o/p exists
* ok 12: git branch -m q r/q should fail when r exists
* ok 13: git branch -m q q2 without config should succeed
* ok 14: git branch -m s/s s should work when s/t is deleted
* ok 15: config information was renamed, too
* ok 16: git branch -m u v should fail when the reflog for u is a symlink
* ok 17: test tracking setup via --track
* ok 18: test tracking setup (non-wildcard, matching)
* ok 19: test tracking setup (non-wildcard, not matching)
* ok 20: test tracking setup via config
* ok 21: avoid ambiguous track
* ok 22: test overriding tracking setup via --no-track
* ok 23: no tracking without .fetch entries
* ok 24: test tracking setup via --track but deeper
* ok 25: test deleting branch deletes branch config
* ok 26: test deleting branch without config
* ok 27: git checkout -b g/h/i -l should create a branch and a log
* passed all 27 test(s)
*** t3210-pack-refs.sh ***
* ok 1: prepare a trivial repository
* ok 2: see if git show-ref works as expected
* 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 7: git branch g should work when git branch g/h has been deleted
* ok 8: git branch i/j/k should barf if branch i exists
* ok 9: test git branch k after branch k/l/m and k/lm have been deleted
* ok 10: test git branch n after some branch deletion and pruning
* ok 11: pack, prune and repack
* passed all 11 test(s)
*** t3300-funny-names.sh ***
* ok 1: git ls-files no-funny
* ok 2: git ls-files with-funny
* ok 3: git ls-files -z with-funny
* ok 4: git ls-tree with funny
* ok 5: git diff-index with-funny
* ok 6: git diff-tree with-funny
* ok 7: git diff-index -z with-funny
* ok 8: git diff-tree -z with-funny
* ok 9: git diff-tree -C with-funny
* ok 10: git diff-tree delete with-funny
* ok 11: git diff-tree delete with-funny
* ok 12: git diff-tree delete with-funny
* ok 13: git diff-tree rename with-funny applied
* ok 14: git diff-tree delete with-funny applied
* ok 15: git apply non-git diff
* passed all 15 test(s)
*** t3400-rebase.sh ***
* ok 1: prepare repository with topic branches
* ok 2: rebase against master
* ok 3: the rebase operation should not have destroyed author information
* ok 4: rebase after merge master
* ok 5: rebase of history with merges is linearized
* ok 6: rebase of history with merges after upstream merge is linearized
* ok 7: rebase a single mode change
* passed all 7 test(s)
*** t3401-rebase-partial.sh ***
* ok 1: prepare repository with topic branch
* ok 2: pick top patch from topic branch into master
* ok 3: rebase topic branch against new master and check git-am did not get halted
* ok 4: rebase --merge topic branch that was partially merged upstream
* passed all 4 test(s)
*** t3402-rebase-merge.sh ***
* ok 1: setup
* ok 2: reference merge
* ok 3: rebase
* ok 4: merge and rebase should match
* ok 5: rebase the other way
* ok 6: merge and rebase should match
* ok 7: picking rebase
* passed all 7 test(s)
*** t3403-rebase-skip.sh ***
* ok 1: setup
* ok 2: rebase with git am -3 (default)
* ok 3: rebase --skip with am -3
* ok 4: checkout skip-merge
* ok 5: rebase with --merge
* ok 6: rebase --skip with --merge
* ok 7: merge and reference trees equal
* passed all 7 test(s)
*** t3404-rebase-interactive.sh ***
* ok 1: setup
* ok 2: no changes are a nop
* ok 3: test the [branch] option
* ok 4: rebase on top of a non-conflicting commit
* ok 5: reflog for the branch shows state before rebase
* ok 6: exchange two commits
* ok 7: stop on conflicting pick
* ok 8: abort
* ok 9: retain authorship
* ok 10: squash
* ok 11: retain authorship when squashing
* ok 12: preserve merges with -p
* ok 13: --continue tries to commit
* ok 14: verbose flag is heeded, even after --continue
* ok 15: multi-squash only fires up editor once
* ok 16: squash works as expected
* ok 17: interrupted squash works as expected
* ok 18: interrupted squash works as expected (case 2)
* ok 19: ignore patch if in upstream
* passed all 19 test(s)
*** t3405-rebase-malformed.sh ***
* ok 1: setup
* ok 2: rebase
* passed all 2 test(s)
*** t3406-rebase-message.sh ***
* ok 1: setup
* ok 2: rebase -m
* passed all 2 test(s)
*** t3500-cherry.sh ***
* 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)
*** t3501-revert-cherry-pick.sh ***
* ok 1: setup
* ok 2: cherry-pick after renaming branch
* ok 3: revert after renaming branch
* passed all 3 test(s)
*** t3600-rm.sh ***
* ok 1: Initialize test directory
* ok 2: Determine rm behavior
* 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 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: Recursive test setup
* ok 27: Recursive without -r fails
* ok 28: Recursive with -r but dirty
* ok 29: Recursive with -r -f
* ok 30: Remove nonexistent file returns nonzero exit status
* passed all 30 test(s)
*** 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 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 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 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
* passed all 20 test(s)
*** t3800-mktag.sh ***
Created initial commit 3fb6ea8: Initial commit
1 files changed, 1 insertions(+), 0 deletions(-)
create mode 100644 A
* ok 1: Tag object length check
* ok 2: "object" line label check
* ok 3: "object" line SHA1 check
* ok 4: "type" line label check
* ok 5: "type" line eol check
* ok 6: "tag" line label check #1
* ok 7: "tag" line label check #2
* ok 8: "type" line type-name length check
* ok 9: verify object (SHA1/type) check
* ok 10: verify tag-name check
* ok 11: "tagger" line label check #1
* ok 12: "tagger" line label check #2
* ok 13: create valid tag
* ok 14: check mytag
* passed all 14 test(s)
*** t3900-i18n-commit.sh ***
* ok 1: setup
* ok 2: no encoding header for base case
* ok 3: ISO-8859-1 setup
* ok 4: EUCJP setup
* ok 5: ISO-2022-JP setup
* ok 6: check encoding header for ISO-8859-1
* ok 7: check encoding header for EUCJP
* ok 8: check encoding header for ISO-2022-JP
* ok 9: config to remove customization
* ok 10: ISO-8859-1 should be shown in UTF-8 now
* ok 11: EUCJP should be shown in UTF-8 now
* ok 12: ISO-2022-JP should be shown in UTF-8 now
* ok 13: config to add customization
* ok 14: ISO-8859-1 should be shown in itself now
* ok 15: EUCJP should be shown in itself now
* ok 16: ISO-2022-JP should be shown in itself now
* ok 17: config to tweak customization
* ok 18: ISO-8859-1 should be shown in UTF-8 now
* ok 19: EUCJP should be shown in UTF-8 now
* ok 20: ISO-2022-JP should be shown in UTF-8 now
* ok 21: EUCJP should be shown in EUCJP now
* ok 22: ISO-2022-JP should be shown in EUCJP now
* ok 23: EUCJP should be shown in ISO-2022-JP now
* ok 24: ISO-2022-JP should be shown in ISO-2022-JP now
* ok 25: No conversion with ISO-8859-1
* ok 26: No conversion with EUCJP
* ok 27: No conversion with ISO-2022-JP
* passed all 27 test(s)
*** t3901-i18n-patch.sh ***
* ok 1: setup
* ok 2: format-patch output (ISO-8859-1)
* ok 3: format-patch output (UTF-8)
* ok 4: rebase (U/U)
* ok 5: rebase (U/L)
* ok 6: rebase (L/L)
* ok 7: rebase (L/U)
* ok 8: cherry-pick(U/U)
* ok 9: cherry-pick(L/L)
* ok 10: cherry-pick(U/L)
* ok 11: cherry-pick(L/U)
* ok 12: rebase --merge (U/U)
* ok 13: rebase --merge (U/L)
* ok 14: rebase --merge (L/L)
* ok 15: rebase --merge (L/U)
* passed all 15 test(s)
*** t3902-quoted.sh ***
* ok 1: setup
* ok 2: check fully quoted output from ls-files
* ok 3: check fully quoted output from diff-files
* ok 4: check fully quoted output from diff-index
* ok 5: check fully quoted output from diff-tree
* ok 6: setting core.quotepath
* ok 7: check fully quoted output from ls-files
* ok 8: check fully quoted output from diff-files
* ok 9: check fully quoted output from diff-index
* ok 10: check fully quoted output from diff-tree
* passed all 10 test(s)
*** t3903-stash.sh ***
* ok 1: stash some dirty working directory
* ok 2: parents of stash
* ok 3: apply needs clean working directory
* ok 4: apply stashed changes
* ok 5: apply stashed changes (including index)
* ok 6: unstashing in a subdirectory
* passed all 6 test(s)
*** 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 3: validate git diff-files -p output.
* passed all 3 test(s)
*** t4001-diff-rename.sh ***
* 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 5: validate the output.
* ok 6: favour same basenames over different ones
* ok 7: favour same basenames even with minor differences
* passed all 7 test(s)
*** t4002-diff-basic.sh ***
* 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 4: adding test file DN and Z/DN
* 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 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 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 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 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 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-cache O with A in cache
* ok 52: diff-cache O with B in cache
* ok 53: diff-cache A with B in cache
* ok 54: diff-files with O in cache and A checked out
* ok 55: diff-files with O in cache and B checked out
* ok 56: diff-files with A in cache and B checked out
* ok 57: diff-tree O A == diff-tree -R A O
* ok 58: diff-tree -r O A == diff-tree -r -R A O
* ok 59: diff-tree B A == diff-tree -R A B
* ok 60: diff-tree -r B A == diff-tree -r -R A B
* passed all 60 test(s)
*** t4003-diff-rename-1.sh ***
* ok 1: prepare reference tree
* ok 2: prepare work tree
* ok 3: validate output from rename/copy detection (#1)
* ok 4: prepare work tree again
* 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)
*** t4004-diff-rename-symlink.sh ***
* ok 1: prepare reference tree
* ok 2: prepare work tree
* ok 3: validate diff output
* passed all 3 test(s)
*** t4005-diff-rename-2.sh ***
* ok 1: prepare reference tree
* ok 2: prepare work tree
* ok 3: validate output from rename/copy detection (#1)
* ok 4: prepare work tree again
* 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)
*** t4006-diff-mode.sh ***
* ok 1: setup
* ok 2: chmod
* ok 3: verify
* passed all 3 test(s)
*** t4007-rename-3.sh ***
* ok 1: prepare reference tree
* ok 2: prepare work tree
* ok 3: validate the result (#1)
* ok 4: validate the result (#2)
* ok 5: tweak work tree
* ok 6: validate the result (#3)
* ok 7: validate the result (#4)
* passed all 7 test(s)
*** t4008-diff-break-rewrite.sh ***
* ok 1: setup
* ok 2: change file1 with copy-edit of file0 and remove file0
* ok 3: run diff with -B
* ok 4: validate result of -B (#1)
* ok 5: run diff with -B and -M
* ok 6: validate result of -B -M (#2)
* ok 7: swap file0 and file1
* ok 8: run diff with -B
* ok 9: validate result of -B (#3)
* ok 10: run diff with -B and -M
* ok 11: validate result of -B -M (#4)
* ok 12: make file0 into something completely different
* ok 13: run diff with -B
* ok 14: validate result of -B (#5)
* ok 15: run diff with -B -M
* ok 16: validate result of -B -M (#6)
* ok 17: run diff with -M
* ok 18: validate result of -M (#7)
* ok 19: file1 edited to look like file0 and file0 rename-edited to file2
* ok 20: run diff with -B
* ok 21: validate result of -B (#8)
* ok 22: run diff with -B -M
* ok 23: validate result of -B -M (#9)
* passed all 23 test(s)
*** t4009-diff-rename-4.sh ***
* ok 1: prepare reference tree
* ok 2: prepare work tree
* ok 3: validate output from rename/copy detection (#1)
* ok 4: prepare work tree again
* 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)
*** t4010-diff-pathspec.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 5: limit to file0 should show file0
* ok 6: limit to file0/ should emit nothing.
* passed all 6 test(s)
*** t4011-diff-symlink.sh ***
* ok 1: diff new symlink
* ok 2: diff unchanged symlink
* ok 3: diff removed symlink
* ok 4: diff identical, but newly created symlink
* ok 5: diff different symlink
* passed all 5 test(s)
*** t4012-diff-binary.sh ***
* ok 1: prepare repository
* ok 2: diff without --binary
* ok 3: diff with --binary
* ok 4: apply detecting corrupt patch correctly
* ok 5: apply detecting corrupt patch correctly
* ok 6: initial commit
* ok 7: diff-index with --binary
* ok 8: apply binary patch
* passed all 8 test(s)
*** t4013-diff-various.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 8: git diff-tree --root -r initial
* 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 16: git diff-tree --root --patch-with-raw initial
* ok 17: git diff-tree --pretty initial
* 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 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 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 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 44: git diff-tree -p master
* ok 45: git diff-tree -p -m master
* ok 46: git diff-tree -c master
* ok 47: git diff-tree -c --abbrev master
* 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 52: git diff-tree --cc --stat --summary master
* ok 53: git diff-tree -c --stat --summary side
* ok 54: git diff-tree --cc --stat --summary side
* ok 55: git diff-tree --cc --patch-with-stat master
* ok 56: git diff-tree --cc --patch-with-stat --summary master
* ok 57: git diff-tree --cc --patch-with-stat --summary side
* ok 58: git log master
* ok 59: git log -p master
* ok 60: git log --root master
* ok 61: git log --root -p master
* ok 62: git log --patch-with-stat master
* ok 63: git log --root --patch-with-stat master
* ok 64: git log --root --patch-with-stat --summary master
* ok 65: git log --root -c --patch-with-stat --summary master
* ok 66: git log --root --cc --patch-with-stat --summary master
* ok 67: git log -SF master
* ok 68: git log -SF -p master
* ok 69: git whatchanged master
* ok 70: git whatchanged -p master
* ok 71: git whatchanged --root master
* ok 72: git whatchanged --root -p master
* ok 73: git whatchanged --patch-with-stat master
* ok 74: git whatchanged --root --patch-with-stat master
* ok 75: git whatchanged --root --patch-with-stat --summary master
* ok 76: git whatchanged --root -c --patch-with-stat --summary master
* ok 77: git whatchanged --root --cc --patch-with-stat --summary master
* ok 78: git whatchanged -SF master
* ok 79: git whatchanged -SF -p master
* ok 80: git log --patch-with-stat master -- dir/
* ok 81: git whatchanged --patch-with-stat master -- dir/
* ok 82: git log --patch-with-stat --summary master -- dir/
* ok 83: git whatchanged --patch-with-stat --summary master -- dir/
* ok 84: git show initial
* ok 85: git show --root initial
* ok 86: git show side
* ok 87: git show master
* ok 88: git show --stat side
* ok 89: git show --stat --summary side
* ok 90: git show --patch-with-stat side
* ok 91: git show --patch-with-raw side
* ok 92: git show --patch-with-stat --summary side
* ok 93: git format-patch --stdout initial..side
* ok 94: git format-patch --stdout initial..master^
* ok 95: git format-patch --stdout initial..master
* ok 96: git format-patch --attach --stdout initial..side
* ok 97: git format-patch --attach --stdout initial..master^
* ok 98: git format-patch --attach --stdout initial..master
* ok 99: git format-patch --inline --stdout initial..side
* ok 100: git format-patch --inline --stdout initial..master^
* ok 101: git format-patch --inline --stdout initial..master
* ok 102: git format-patch --inline --stdout --subject-prefix=TESTCASE initial..master
* ok 103: git config format.subjectprefix DIFFERENT_PREFIX
* ok 104: git format-patch --inline --stdout initial..master^^
* ok 105: git diff --abbrev initial..side
* ok 106: git diff -r initial..side
* ok 107: git diff --stat initial..side
* ok 108: git diff -r --stat initial..side
* ok 109: git diff initial..side
* ok 110: git diff --patch-with-stat initial..side
* ok 111: git diff --patch-with-raw initial..side
* ok 112: git diff --patch-with-stat -r initial..side
* ok 113: git diff --patch-with-raw -r initial..side
* ok 114: git diff --name-status dir2 dir
* passed all 114 test(s)
*** t4014-format-patch.sh ***
* ok 1: setup
* ok 2: format-patch --ignore-if-in-upstream
* ok 3: format-patch --ignore-if-in-upstream
* ok 4: format-patch result applies
* ok 5: format-patch --ignore-if-in-upstream result applies
* ok 6: commit did not screw up the log message
* ok 7: format-patch did not screw up the log message
* ok 8: replay did not screw up the log message
* passed all 8 test(s)
*** t4015-diff-whitespace.sh ***
* ok 1: Ray's example without options
* ok 2: Ray's example with -w
* ok 3: Ray's example with -b
* ok 4: another test, without options
* ok 5: another test, with -w
* ok 6: another test, with -b
* passed all 6 test(s)
*** t4016-diff-quote.sh ***
* ok 1: setup
* ok 2: git diff --summary -M HEAD
* ok 3: git diff --stat -M HEAD
* passed all 3 test(s)
*** t4017-diff-retval.sh ***
* ok 1: setup
* ok 2: git diff-tree HEAD^ HEAD
* ok 3: git diff-tree HEAD^ HEAD -- a
* ok 4: git diff-tree HEAD^ HEAD -- b
* ok 5: echo HEAD | git diff-tree --stdin
* ok 6: git diff-tree HEAD HEAD
* ok 7: git diff-files
* ok 8: git diff-index --cached HEAD
* ok 9: git diff-index --cached HEAD^
* ok 10: git diff-index --cached HEAD^
* ok 11: git diff-tree -Stext HEAD^ HEAD -- b
* ok 12: git diff-tree -Snot-found HEAD^ HEAD -- b
* ok 13: git diff-files
* ok 14: git diff-index --cached HEAD
* passed all 14 test(s)
*** t4017-quiet.sh ***
* ok 1: setup
* ok 2: git diff-tree HEAD^ HEAD
* ok 3: git diff-tree HEAD^ HEAD -- a
* ok 4: git diff-tree HEAD^ HEAD -- b
* ok 5: echo HEAD | git diff-tree --stdin
* ok 6: git diff-tree HEAD HEAD
* ok 7: git diff-files
* ok 8: git diff-index --cached HEAD
* ok 9: git diff-index --cached HEAD^
* ok 10: git diff-index --cached HEAD^
* ok 11: git diff-tree -Stext HEAD^ HEAD -- b
* ok 12: git diff-tree -Snot-found HEAD^ HEAD -- b
* ok 13: git diff-files
* ok 14: git diff-index --cached HEAD
* passed all 14 test(s)
*** t4018-diff-funcname.sh ***
* ok 1: default behaviour
* ok 2: preset java pattern
* ok 3: custom pattern
* ok 4: last regexp must not be negated
* passed all 4 test(s)
*** t4020-diff-external.sh ***
* ok 1: setup
* ok 2: GIT_EXTERNAL_DIFF environment
* ok 3: GIT_EXTERNAL_DIFF environment should apply only to diff
* ok 4: diff attribute
* ok 5: diff attribute should apply only to diff
* ok 6: diff attribute
* ok 7: diff attribute should apply only to diff
* ok 8: no diff with -diff
* ok 9: force diff with "diff"
* passed all 9 test(s)
*** t4021-format-patch-signer-mime.sh ***
* ok 1: setup
* ok 2: format normally
* ok 3: format with signoff without funny signer name
* ok 4: format with non ASCII signer name
* passed all 4 test(s)
*** t4100-apply-stat.sh ***
* ok 1: rename
* ok 2: copy
* ok 3: rewrite
* ok 4: mode
* ok 5: non git
* ok 6: non git
* ok 7: non git
* passed all 7 test(s)
*** t4101-apply-nonl.sh ***
* ok 1: apply diff between 0 and 1
* ok 2: apply diff between 0 and 2
* ok 3: apply diff between 0 and 3
* ok 4: apply diff between 1 and 0
* ok 5: apply diff between 1 and 2
* ok 6: apply diff between 1 and 3
* ok 7: apply diff between 2 and 0
* ok 8: apply diff between 2 and 1
* ok 9: apply diff between 2 and 3
* ok 10: apply diff between 3 and 0
* ok 11: apply diff between 3 and 1
* ok 12: apply diff between 3 and 2
* passed all 12 test(s)
*** t4102-apply-rename.sh ***
* ok 1: setup
* ok 2: apply
* ok 3: validate
* ok 4: apply reverse
* ok 5: apply copy
* passed all 5 test(s)
*** t4103-apply-binary.sh ***
Created initial commit b357dea: Initial Version
3 files changed, 15 insertions(+), 0 deletions(-)
create mode 100644 file1
create mode 100644 file2
create mode 100644 file4
Switched to a new branch "binary"
Created commit b079a7b: Second Version
4 files changed, 2 insertions(+), 7 deletions(-)
delete mode 100644 file2
create mode 100644 file3
* ok 1: stat binary diff -- should not fail.
* ok 2: stat binary diff (copy) -- should not fail.
* ok 3: check binary diff -- should fail.
* ok 4: check binary diff (copy) -- should fail.
* ok 5: check incomplete binary diff with replacement -- should fail.
* ok 6: check incomplete binary diff with replacement (copy) -- should fail.
* ok 7: check binary diff with replacement.
* ok 8: check binary diff with replacement (copy).
* ok 9: apply binary diff -- should fail.
* ok 10: apply binary diff -- should fail.
* ok 11: apply binary diff (copy) -- should fail.
* ok 12: apply binary diff (copy) -- should fail.
* ok 13: apply binary diff without replacement.
* ok 14: apply binary diff without replacement (copy).
* ok 15: apply binary diff.
* ok 16: apply binary diff (copy).
* passed all 16 test(s)
*** t4104-apply-boundary.sh ***
* ok 1: setup
* ok 2: apply add-a-patch with context
* ok 3: apply add-z-patch with context
* ok 4: apply mod-a-patch with context
* ok 5: apply mod-z-patch with context
* ok 6: apply del-a-patch with context
* ok 7: apply del-z-patch with context
* ok 8: apply add-a-patch without context
* ok 9: apply add-z-patch without context
* ok 10: apply mod-a-patch without context
* ok 11: apply mod-z-patch without context
* ok 12: apply del-a-patch without context
* ok 13: apply del-z-patch without context
* ok 14: apply non-git add-a-patch without context
* ok 15: apply non-git add-z-patch without context
* ok 16: apply non-git mod-a-patch without context
* ok 17: apply non-git mod-z-patch without context
* ok 18: apply non-git del-a-patch without context
* ok 19: apply non-git del-z-patch without context
* passed all 19 test(s)
*** t4109-apply-multifrag.sh ***
* ok 1: S = git apply (1)
* ok 2: S = patch (1)
* ok 3: S = cmp (1)
* ok 4: S = git apply (2)
* ok 5: S = patch (2)
* ok 6: S = cmp (2)
* ok 7: S = git apply (3)
* ok 8: S = patch (3)
* ok 9: S = cmp (3)
* passed all 9 test(s)
*** t4110-apply-scan.sh ***
* ok 1: S = git apply scan
* ok 2: S = patch scan
* ok 3: S = cmp
* passed all 3 test(s)
*** t4112-apply-renames.sh ***
* ok 1: check rename/copy patch
* ok 2: apply rename/copy patch
* passed all 2 test(s)
*** t4113-apply-ending.sh ***
* ok 1: setup
* ok 2: apply at the end
* ok 3: apply at the beginning
* passed all 3 test(s)
*** t4114-apply-typechange.sh ***
* 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 5: file becomes directory
* ok 6: file becomes symlink
* ok 7: symlink becomes file
* ok 8: symlink becomes directory
* ok 9: directory becomes symlink
* passed all 9 test(s)
*** t4115-apply-symlink.sh ***
* ok 1: setup
* ok 2: apply symlink patch
* ok 3: apply --index symlink patch
* passed all 3 test(s)
*** t4116-apply-reverse.sh ***
* ok 1: setup
* ok 2: apply in forward
* ok 3: apply in reverse
* ok 4: setup separate repository lacking postimage
* ok 5: apply in forward without postimage
* ok 6: apply in reverse without postimage
* ok 7: reversing a whitespace introduction
* passed all 7 test(s)
*** t4117-apply-reject.sh ***
* ok 1: setup
* ok 2: apply without --reject should fail
* ok 3: apply without --reject should fail
* ok 4: apply with --reject should fail but update the file
* ok 5: apply with --reject should fail but update the file
* ok 6: the same test with --verbose
* ok 7: apply cleanly with --verbose
* passed all 7 test(s)
*** t4118-apply-empty-context.sh ***
* ok 1: setup
* ok 2: apply --numstat
* ok 3: apply --apply
* passed all 3 test(s)
*** t4119-apply-config.sh ***
* ok 1: setup
* ok 2: apply --whitespace=strip
* ok 3: apply --whitespace=strip from config
* ok 4: apply --whitespace=strip in subdir
* ok 5: apply --whitespace=strip from config in subdir
* ok 6: same in subdir but with traditional patch input
* ok 7: same but with traditional patch input of depth 1
* ok 8: same but with traditional patch input of depth 2
* ok 9: same but with traditional patch input of depth 1
* ok 10: same but with traditional patch input of depth 2
* passed all 10 test(s)
*** t4120-apply-popt.sh ***
* ok 1: setup
* ok 2: apply git diff with -p2
* passed all 2 test(s)
*** t4121-apply-diffs.sh ***
* ok 1: setup
* ok 2: check if contextually independent diffs for the same file apply
* passed all 2 test(s)
*** t4122-apply-symlink-inside.sh ***
* ok 1: setup
* ok 2: apply
* ok 3: check result
* passed all 3 test(s)
*** t4123-apply-shrink.sh ***
* ok 1: setup
* ok 2: apply should fail gracefully
* passed all 2 test(s)
*** t4200-rerere.sh ***
Switched to a new branch "first"
Switched to a new branch "second"
* ok 1: nothing recorded without rerere
* ok 2: conflicting merge
* ok 3: recorded preimage
* ok 4: rerere.enabled works, too
* ok 5: no postimage or thisimage yet
* ok 6: preimage has right number of lines
* ok 7: rerere diff
* ok 8: rerere status
* ok 9: commit succeeds
* ok 10: recorded postimage
* ok 11: another conflicting merge
* ok 12: rerere kicked in
* ok 13: rerere prefers first change
* ok 14: rerere clear
* ok 15: clear removed the directory
* ok 16: garbage collection (part1)
* ok 17: young records still live
* ok 18: garbage collection (part2)
* ok 19: old records rest in peace
* ok 20: file2 added differently in two branches
* ok 21: resolution was recorded properly
* passed all 21 test(s)
*** t4201-shortlog.sh ***
* ok 1: shortlog wrapping
* passed all 1 test(s)
*** t5000-tar-tree.sh ***
* ok 1: populate workdir
* ok 2: add files to repository
* ok 3: git archive
* ok 4: git tar-tree
* ok 5: git archive vs. git tar-tree
* ok 6: validate file modification time
* ok 7: git get-tar-commit-id
* ok 8: extract tar archive
* ok 9: validate filenames
* ok 10: validate file contents
* ok 11: git tar-tree with prefix
* ok 12: extract tar archive with prefix
* ok 13: validate filenames with prefix
* ok 14: validate file contents with prefix
* ok 15: git archive --format=zip
* ok 16: extract ZIP archive
* ok 17: validate filenames
* ok 18: validate file contents
* ok 19: git archive --format=zip with prefix
* ok 20: extract ZIP archive with prefix
* ok 21: validate filenames with prefix
* ok 22: validate file contents with prefix
* ok 23: git archive --list outside of a git repo
* passed all 23 test(s)
*** t5100-mailinfo.sh ***
* ok 1: split sample box
* ok 2: mailinfo 0001
* ok 3: mailinfo 0002
* ok 4: mailinfo 0003
* ok 5: mailinfo 0004
* ok 6: mailinfo 0005
* ok 7: mailinfo 0006
* ok 8: mailinfo 0007
* ok 9: mailinfo 0008
* passed all 9 test(s)
*** t5300-pack-object.sh ***
* ok 1: setup
* ok 2: pack without delta
* ok 3: unpack without delta
* ok 4: check unpack without delta
* ok 5: pack with REF_DELTA
* ok 6: unpack with REF_DELTA
* ok 7: check unpack with REF_DELTA
* ok 8: pack with OFS_DELTA
* ok 9: unpack with OFS_DELTA
* ok 10: check unpack with OFS_DELTA
* ok 11: compare delta flavors
* ok 12: use packed objects
* ok 13: use packed deltified (REF_DELTA) objects
* ok 14: use packed deltified (OFS_DELTA) objects
* ok 15: verify pack
* ok 16: corrupt a pack and see if verify catches
* ok 17: build pack index for an existing pack
* ok 18: fake a SHA1 hash collision
* ok 19: make sure index-pack detects the SHA1 collision
* passed all 19 test(s)
*** t5301-sliding-window.sh ***
* ok 1: setup
* ok 2: verify-pack -v, defaults
* 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)
*** t5302-pack-index.sh ***
* ok 1: setup
* ok 2: pack-objects with index version 1
* ok 3: pack-objects with index version 2
* ok 4: both packs should be identical
* ok 5: index v1 and index v2 should be different
* 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 v2: force some 64-bit offsets with pack-objects
* ok 10: 64-bit offsets: should be different from previous index v2 results
* ok 11: index v2: force some 64-bit offsets with index-pack
* ok 12: 64-bit offsets: index-pack result should match pack-objects one
* ok 13: [index v1] 1) stream pack to repository
* ok 14: [index v1] 2) create a stealth corruption in a delta base reference
* ok 15: [index v1] 3) corrupted delta happily returned wrong data
* ok 16: [index v1] 4) confirm that the pack is actually corrupted
* ok 17: [index v1] 5) pack-objects happily reuses corrupted data
* ok 18: [index v1] 6) newly created pack is BAD !
* ok 19: [index v2] 1) stream pack to repository
* ok 20: [index v2] 2) create a stealth corruption in a delta base reference
* ok 21: [index v2] 3) corrupted delta happily returned wrong data
* ok 22: [index v2] 4) confirm that the pack is actually corrupted
* ok 23: [index v2] 5) pack-objects refuses to reuse corrupted data
* passed all 23 test(s)
*** t5400-send-pack.sh ***
* ok 1: setup
* ok 2: pack the source repository
* ok 3: pack the destination repository
* ok 4: pushing rewound head should not barf but require --force
* ok 5: push can be used to delete a ref
* ok 6: pushing with --force should be denied with denyNonFastforwards
* ok 7: pushing does not include non-head refs
* ok 8: pushing explicit refspecs respects forcing
* ok 9: pushing wildcard refspecs respects forcing
* passed all 9 test(s)
*** t5401-update-hooks.sh ***
* 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)
*** t5500-fetch-pack.sh ***
Initialized empty Git repository in .git/
* ok 1: 1st pull
* ok 2: fsck
* ok 3: check downloaded results
* ok 4: new object count after 1st pull
* ok 5: minimal count
* ok 6: 2nd pull
* ok 7: fsck
* ok 8: check downloaded results
* ok 9: new object count after 2nd pull
* ok 10: minimal count
* ok 11: 3rd pull
* ok 12: fsck
* ok 13: check downloaded results
* ok 14: new object count after 3rd pull
* ok 15: minimal count
* ok 16: clone shallow
* ok 17: clone shallow object count
* ok 18: clone shallow object count (part 2)
* ok 19: fsck in shallow repo
* ok 20: pull in shallow repo
* ok 21: clone shallow object count
* ok 22: deepening pull in shallow repo
* ok 23: clone shallow object count
* ok 24: deepening fetch in shallow repo
* ok 25: clone shallow object count
* ok 26: pull in shallow repo with missing merge base
* passed all 26 test(s)
*** t5502-quickfetch.sh ***
* ok 1: setup
* ok 2: clone without alternate
* ok 3: further commits in the original
* ok 4: copy commit and tree but not blob by hand
* ok 5: quickfetch should not leave a corrupted repository
* passed all 5 test(s)
*** t5510-fetch.sh ***
* ok 1: setup
* ok 2: clone and setup child repos
* ok 3: fetch test
* ok 4: fetch test for-merge
* ok 5: fetch following tags
* ok 6: create bundle 1
* ok 7: header of bundle looks right
* ok 8: create bundle 2
* ok 9: unbundle 1
* ok 10: bundle 1 has only 3 files
* ok 11: unbundle 2
* ok 12: bundle does not prerequisite objects
* ok 13: bundle should be able to create a full history
* ok 14: bundle should record HEAD correctly
* passed all 14 test(s)
*** t5515-fetch-merge-logic.sh ***
* ok 1: setup
* ok 2: br-config-explicit
* ok 3: br-config-explicit config-explicit
* ok 4: br-config-explicit-merge
* ok 5: br-config-explicit-merge config-explicit
* ok 6: br-config-explicit-octopus
* ok 7: br-config-explicit-octopus config-explicit
* ok 8: br-config-glob
* ok 9: br-config-glob config-glob
* ok 10: br-config-glob-merge
* ok 11: br-config-glob-merge config-glob
* ok 12: br-config-glob-octopus
* ok 13: br-config-glob-octopus config-glob
* ok 14: br-remote-explicit
* ok 15: br-remote-explicit remote-explicit
* ok 16: br-remote-explicit-merge
* ok 17: br-remote-explicit-merge remote-explicit
* ok 18: br-remote-explicit-octopus
* ok 19: br-remote-explicit-octopus remote-explicit
* ok 20: br-remote-glob
* ok 21: br-remote-glob remote-glob
* ok 22: br-remote-glob-merge
* ok 23: br-remote-glob-merge remote-glob
* ok 24: br-remote-glob-octopus
* ok 25: br-remote-glob-octopus remote-glob
* ok 26: br-branches-default
* ok 27: br-branches-default branches-default
* ok 28: br-branches-default-merge
* ok 29: br-branches-default-merge branches-default
* ok 30: br-branches-default-octopus
* ok 31: br-branches-default-octopus branches-default
* ok 32: br-branches-one
* ok 33: br-branches-one branches-one
* ok 34: br-branches-one-merge
* ok 35: br-branches-one-merge branches-one
* ok 36: br-branches-one-octopus
* ok 37: br-branches-one-octopus branches-one
* ok 38: master
* ok 39: master config-explicit
* ok 40: master config-glob
* ok 41: master remote-explicit
* ok 42: master remote-glob
* ok 43: master branches-default
* ok 44: master branches-one
* ok 45: br-unconfig
* ok 46: br-unconfig config-explicit
* ok 47: br-unconfig config-glob
* ok 48: br-unconfig remote-explicit
* ok 49: br-unconfig remote-glob
* ok 50: br-unconfig branches-default
* ok 51: br-unconfig branches-one
* ok 52: master ../.git
* ok 53: master ../.git one
* ok 54: master ../.git one two
* ok 55: master --tags ../.git
* ok 56: master ../.git tag tag-one tag tag-three
* ok 57: master ../.git tag tag-one-tree tag tag-three-file
* ok 58: master ../.git one tag tag-one tag tag-three-file
* ok 59: br-unconfig ../.git
* ok 60: br-unconfig ../.git one
* ok 61: br-unconfig ../.git one two
* ok 62: br-unconfig --tags ../.git
* ok 63: br-unconfig ../.git tag tag-one tag tag-three
* ok 64: br-unconfig ../.git tag tag-one-tree tag tag-three-file
* ok 65: br-unconfig ../.git one tag tag-one tag tag-three-file
* passed all 65 test(s)
*** t5516-fetch-push.sh ***
* ok 1: setup
* ok 2: fetch without wildcard
* ok 3: fetch with wildcard
* ok 4: push without wildcard
* ok 5: push with wildcard
* ok 6: push with matching heads
* ok 7: push with no ambiguity (1)
* ok 8: push with no ambiguity (2)
* ok 9: push with weak ambiguity (1)
* ok 10: push with weak ambiguity (2)
* ok 11: push with ambiguity (1)
* ok 12: push with ambiguity (2)
* ok 13: push with colon-less refspec (1)
* ok 14: push with colon-less refspec (2)
* ok 15: push with colon-less refspec (3)
* ok 16: push with colon-less refspec (4)
* passed all 16 test(s)
*** t5520-pull.sh ***
* ok 1: setup
* ok 2: pulling into void
* ok 3: checking the results
* ok 4: test . as a remote
* ok 5: the default remote . should not break explicit pull
* passed all 5 test(s)
*** 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 4: clone should work now that source exists
* ok 5: successful clone must leave the directory
* passed all 5 test(s)
*** t5700-clone-reference.sh ***
* ok 1: preparing first repository
* ok 2: preparing second repository
* ok 3: cloning with reference (-l -s)
* ok 4: existence of info/alternates
* ok 5: pulling from reference
* ok 6: that reference gets used
* ok 7: cloning with reference (no -l -s)
* ok 8: existence of info/alternates
* ok 9: pulling from reference
* ok 10: that reference gets used
* ok 11: updating origin
* ok 12: pulling changes from origin
* ok 13: that alternate to origin gets used
* ok 14: pulling changes from origin
* ok 15: check objects expected to exist locally
* passed all 15 test(s)
*** t5701-clone-local.sh ***
* ok 1: preparing origin repository
* ok 2: local clone without .git suffix
* ok 3: local clone with .git suffix
* ok 4: local clone from x
* ok 5: local clone from x.git that does not exist
* ok 6: With -no-hardlinks, local will make a copy
* ok 7: Even without -l, local will make a hardlink
* passed all 7 test(s)
*** t5710-info-alternate.sh ***
* ok 1: preparing first repository
* ok 2: preparing second repository
* ok 3: preparing third repository
* ok 4: creating too deep nesting
* ok 5: validity of third repository
* ok 6: validity of fourth repository
* ok 7: breaking of loops
* ok 8: that info/alternates is necessary
* ok 9: that relative alternate is possible for current dir
* ok 10: that relative alternate is only possible for current dir
* passed all 10 test(s)
*** t6001-rev-list-graft.sh ***
* ok 1: setup
* ok 2: without grafts
* 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 9: with grafts, with pathlimit
* ok 10: without grafts
* ok 11: with grafts
* ok 12: without grafts, with pathlimit
* ok 13: with grafts, with pathlimit
* passed all 13 test(s)
*** t6002-rev-list-bisect.sh ***
* ok 1: bisection diff --bisect l0 ^root <= 0
* ok 2: bisection diff --bisect l1 ^root <= 0
* ok 3: bisection diff --bisect l2 ^root <= 0
* ok 4: bisection diff --bisect a0 ^root <= 0
* ok 5: bisection diff --bisect a1 ^root <= 0
* ok 6: bisection diff --bisect a2 ^root <= 0
* ok 7: bisection diff --bisect a3 ^root <= 0
* ok 8: bisection diff --bisect b1 ^root <= 0
* ok 9: bisection diff --bisect b2 ^root <= 0
* ok 10: bisection diff --bisect b3 ^root <= 0
* ok 11: bisection diff --bisect c1 ^root <= 0
* ok 12: bisection diff --bisect c2 ^root <= 0
* ok 13: bisection diff --bisect c3 ^root <= 0
* ok 14: bisection diff --bisect E ^F <= 0
* ok 15: bisection diff --bisect e1 ^F <= 0
* ok 16: bisection diff --bisect e2 ^F <= 0
* ok 17: bisection diff --bisect e3 ^F <= 0
* ok 18: bisection diff --bisect e4 ^F <= 0
* ok 19: bisection diff --bisect e5 ^F <= 0
* ok 20: bisection diff --bisect e6 ^F <= 0
* ok 21: bisection diff --bisect e7 ^F <= 0
* ok 22: bisection diff --bisect f1 ^F <= 0
* ok 23: bisection diff --bisect f2 ^F <= 0
* ok 24: bisection diff --bisect f3 ^F <= 0
* ok 25: bisection diff --bisect f4 ^F <= 0
* ok 26: bisection diff --bisect E ^F <= 0
* ok 27: bisection diff --bisect V ^U <= 1
* ok 28: bisection diff --bisect V ^U ^u1 ^u2 ^u3 <= 0
* ok 29: bisection diff --bisect u1 ^U <= 0
* ok 30: bisection diff --bisect u2 ^U <= 0
* ok 31: bisection diff --bisect u3 ^U <= 0
* ok 32: bisection diff --bisect u4 ^U <= 0
* ok 33: bisection diff --bisect u5 ^U <= 0
* ok 34: --bisect l5 ^root
* ok 35: --bisect l5 ^root ^c3
* ok 36: --bisect l5 ^root ^c3 ^b4
* ok 37: --bisect l3 ^root ^c3 ^b4
* ok 38: --bisect l5 ^b3 ^a3 ^b4 ^a4
* ok 39: --bisect l4 ^a2 ^a3 ^b ^a4
* ok 40: --bisect l3 ^a2 ^a3 ^b ^a4
* ok 41: --bisect a4 ^a2 ^a3 ^b4
* ok 42: --bisect a4 ^a2 ^a3 ^b4 ^c2
* ok 43: --bisect a4 ^a2 ^a3 ^b4 ^c2 ^c3
* ok 44: --bisect a4 ^a2 ^a3 ^b4
* ok 45: --bisect c3 ^a2 ^a3 ^b4 ^c2
* passed all 45 test(s)
*** t6003-rev-list-topo-order.sh ***
* ok 1: rev-list has correct number of entries
* ok 2: simple topo order
* ok 3: two diamonds topo order (g6)
* ok 4: multiple heads
* ok 5: multiple heads, prune at a1
* ok 6: multiple heads, prune at l1
* ok 7: cross-epoch, head at l5, prune at l1
* ok 8: duplicated head arguments
* ok 9: prune near topo
* ok 10: head has no parent
* ok 11: two nodes - one head, one base
* ok 12: three nodes one head, one internal, one base
* ok 13: linear prune l2 ^root
* ok 14: linear prune l2 ^l0
* ok 15: linear prune l2 ^l1
* ok 16: linear prune l5 ^a4
* ok 17: linear prune l5 ^l3
* ok 18: linear prune l5 ^l4
* ok 19: max-count 10 - topo order
* ok 20: max-count 10 - non topo order
* ok 21: --max-age=c3, no --topo-order
* ok 22: one specified head reachable from another a4, c3, --topo-order
* ok 23: one specified head reachable from another c3, a4, --topo-order
* ok 24: one specified head reachable from another a4, c3, no --topo-order
* ok 25: one specified head reachable from another c3, a4, no --topo-order
* ok 26: graph with c3 and a4 parents of head
* ok 27: graph with a4 and c3 parents of head
* ok 28: head ^head --topo-order
* ok 29: head ^head no --topo-order
* ok 30: simple topo order (l5r1)
* ok 31: simple topo order (r1l5)
* ok 32: don't print things unreachable from one branch
* ok 33: --topo-order a4 l3
* passed all 33 test(s)
*** t6004-rev-list-path-optim.sh ***
* ok 1: setup
* ok 2: path-optimization
* ok 3: further setup
* ok 4: path optimization 2
* passed all 4 test(s)
*** t6005-rev-list-count.sh ***
* ok 1: setup
* ok 2: no options
* ok 3: --max-count
* ok 4: --max-count all forms
* ok 5: --skip
* ok 6: --skip --max-count
* passed all 6 test(s)
*** t6006-rev-list-format.sh ***
* ok 1: setup
* ok 2: format hash
* ok 3: format tree
* ok 4: format parents
* ok 5: format author
* ok 6: format committer
* ok 7: format encoding
* ok 8: format subject
* ok 9: format body
* ok 10: format colors
* ok 11: setup complex body
* ok 12: format complex-encoding
* ok 13: format complex-subject
* ok 14: format complex-body
* passed all 14 test(s)
*** t6007-rev-list-cherry-pick-file.sh ***
* ok 1: setup
* ok 2: --cherry-pick foo comes up empty
* ok 3: --cherry-pick bar does not come up empty
* ok 4: --cherry-pick with independent, but identical branches
* passed all 4 test(s)
*** t6008-rev-list-submodule.sh ***
* ok 1: setup
* ok 2: Ilari's test
* passed all 2 test(s)
*** t6010-merge-base.sh ***
* ok 1: compute merge-base (single)
* ok 2: compute merge-base (all)
* ok 3: compute merge-base with show-branch
* ok 4: compute merge-base (single)
* ok 5: compute merge-base (all)
* passed all 5 test(s)
*** t6020-merge-df.sh ***
* ok 1: prepare repository
* ok 2: Merge with d/f conflicts
* passed all 2 test(s)
*** t6021-merge-criss-cross.sh ***
* ok 1: prepare repository
* ok 2: Criss-cross merge
* ok 3: Criss-cross merge result
* passed all 3 test(s)
*** t6022-merge-rename.sh ***
* ok 1: setup
* ok 2: pull renaming branch into unrenaming one
* ok 3: pull renaming branch into another renaming one
* ok 4: pull unrenaming branch into renaming one
* ok 5: pull conflicting renames
* ok 6: interference with untracked working tree file
* ok 7: interference with untracked working tree file
* ok 8: interference with untracked working tree file
* ok 9: updated working tree file should prevent the merge
* ok 10: updated working tree file should prevent the merge
* ok 11: interference with untracked working tree file
* ok 12: merge of identical changes in a renamed file
* passed all 12 test(s)
*** t6023-merge-file.sh ***
* ok 1: merge without conflict
* ok 2: merge without conflict (missing LF at EOF)
* ok 3: merge result added missing LF
* ok 4: merge with conflicts
* ok 5: expected conflict markers
* ok 6: merge with conflicts, using -L
* ok 7: expected conflict markers, with -L
* ok 8: conflict in removed tail
* ok 9: expected conflict markers
* ok 10: binary files cannot be merged
* passed all 10 test(s)
*** t6023-merge-rename-nocruft.sh ***
* ok 1: setup
* ok 2: merge white into red (A->B,M->N)
* ok 3: merge blue into white (A->B, mod A, A untracked)
* passed all 3 test(s)
*** t6024-recursive-merge.sh ***
* ok 1: setup tests
* ok 2: combined merge conflicts
* ok 3: result contains a conflict
* ok 4: virtual trees were processed
HEAD is now at 71b2f3d... F
* ok 5: refuse to merge binary files
* passed all 5 test(s)
*** t6025-merge-symlinks.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 6: merge b-file, which has a file instead of a symbolic link, into master
* ok 7: the merge result must be a file
* passed all 7 test(s)
*** t6026-merge-attr.sh ***
* ok 1: setup
* ok 2: merge
* ok 3: check merge result in index
* ok 4: check merge result in working tree
* ok 5: custom merge backend
* ok 6: custom merge backend
* passed all 6 test(s)
*** t6027-merge-binary.sh ***
* ok 1: setup
* ok 2: resolve
* ok 3: recursive
* passed all 3 test(s)
*** t6028-merge-up-to-date.sh ***
* ok 1: setup
* ok 2: merge -s recursive up-to-date
* ok 3: merge -s recursive fast-forward
* ok 4: merge -s ours up-to-date
* ok 5: merge -s ours fast-forward
* ok 6: merge -s subtree up-to-date
* passed all 6 test(s)
*** t6030-bisect-porcelain.sh ***
* ok 1: set up basic repo with 1 file (hello) and 4 commits
* ok 2: bisect starts with only one bad
* ok 3: bisect does not start with only one good
* ok 4: bisect start with one bad and good
* ok 5: "git bisect run" simple case
* ok 6: "git bisect run" with more complex "git bisect start"
* passed all 6 test(s)
*** t6101-rev-parse-parents.sh ***
* ok 1: start is valid
* ok 2: start^0
* ok 3: start^1 not valid
* ok 4: second^1 = second^
* ok 5: final^1^1^1
* ok 6: final^1^1^1 = final^^^
* ok 7: final^1^2
* ok 8: final^1^2 != final^1^1
* ok 9: final^1^3 not valid
* ok 10: --verify start2^1
* ok 11: --verify start2^0
* ok 12: repack for next test
* ok 13: short SHA-1 works
* passed all 13 test(s)
*** t6120-describe.sh ***
* ok 1: setup
* ok 2: describe HEAD
* ok 3: describe HEAD^
* ok 4: describe HEAD^^
* ok 5: describe HEAD^^2
* ok 6: describe HEAD^^2^
* ok 7: describe --tags HEAD
* ok 8: describe --tags HEAD^
* ok 9: describe --tags HEAD^^
* ok 10: describe --tags HEAD^^2
* ok 11: describe --tags HEAD^^2^
* passed all 11 test(s)
*** t6200-fmt-merge-msg.sh ***
* ok 1: setup
* ok 2: merge-msg test #1
* ok 3: merge-msg test #2
* ok 4: merge-msg test #3
* ok 5: merge-msg test #4
* ok 6: merge-msg test #5
* passed all 6 test(s)
*** t7001-mv.sh ***
* ok 1: prepare reference tree
* ok 2: moving the file out of subdirectory
* ok 3: commiting the change
* ok 4: checking the commit
* ok 5: moving the file back into subdirectory
* ok 6: commiting the change
* ok 7: checking the commit
* ok 8: adding another file
* ok 9: moving whole subdirectory
* ok 10: commiting the change
* ok 11: checking the commit
* ok 12: succeed when source is a prefix of destination
* ok 13: moving whole subdirectory into subdirectory
* ok 14: commiting the change
* ok 15: checking the commit
* ok 16: do not move directory over existing directory
* ok 17: move into "."
* ok 18: Michael Cassar's test case
* ok 19: Sergey Vlasov's test case
* passed all 19 test(s)
*** t7002-grep.sh ***
* ok 1: setup
* ok 2: grep -w HEAD
* ok 3: grep -w HEAD (x)
* ok 4: grep -w HEAD (y-1)
* ok 5: grep -w HEAD (y-2)
* ok 6: grep -w HEAD (z)
* ok 7: grep HEAD (t-1)
* ok 8: grep HEAD (t-2)
* ok 9: grep HEAD (t-3)
* ok 10: grep -c HEAD (no /dev/null)
* ok 11: grep -w in working tree
* ok 12: grep -w in working tree (x)
* ok 13: grep -w in working tree (y-1)
* ok 14: grep -w in working tree (y-2)
* ok 15: grep -w in working tree (z)
* ok 16: grep in working tree (t-1)
* ok 17: grep in working tree (t-2)
* ok 18: grep in working tree (t-3)
* ok 19: grep -c in working tree (no /dev/null)
* passed all 19 test(s)
*** t7003-filter-branch.sh ***
* ok 1: setup
* ok 2: rewrite identically
* ok 3: result is really identical
* ok 4: rewrite, renaming a specific file
* ok 5: test that the file was renamed
* ok 6: rewrite one branch, keeping a side branch
* ok 7: common ancestor is still common (unchanged)
* ok 8: filter subdirectory only
* ok 9: subdirectory filter result looks okay
* ok 10: setup and filter history that requires --full-history
* ok 11: subdirectory filter result looks okay
* ok 12: use index-filter to move into a subdirectory
* ok 13: stops when msg filter fails
* ok 14: author information is preserved
* ok 15: remove a certain author's commits
* ok 16: barf on invalid name
* ok 17: "map" works in commit filter
* passed all 17 test(s)
*** 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 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 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: trying to delete an unknown tag should fail
* ok 18: trying to delete tags without params should succeed and do nothing
* ok 19: deleting two existing tags in one command should succeed
* ok 20: creating a tag with the name of another deleted one should succeed
* ok 21: trying to delete two tags, existing and not, should fail in the 2nd
* ok 22: trying to delete an already deleted tag should fail
* ok 23: listing all tags should print them ordered
* ok 24: listing tags with substring as pattern must print those matching
* ok 25: listing tags with a suffix as pattern must print those matching
* ok 26: listing tags with a prefix as pattern must print those matching
* ok 27: listing tags using a name as pattern must print that one matching
* ok 28: listing tags using a name as pattern must print that one matching
* ok 29: listing tags with ? in the pattern should print those matching
* ok 30: listing tags using v.* should print nothing because none have v.
* ok 31: listing tags using v* should print only those having v
* ok 32: a non-annotated tag created without parameters should point to HEAD
* ok 33: trying to verify an unknown tag should fail
* ok 34: trying to verify a non-annotated and non-signed tag should fail
* ok 35: trying to verify many non-annotated or unknown tags, should fail
* ok 36: creating an annotated tag with -m message should succeed
* ok 37: creating an annotated tag with -F messagefile should succeed
* ok 38: creating an annotated tag with -F - should succeed
* ok 39: trying to create a tag with a non-existing -F file should fail
* ok 40: trying to create tags giving many -m or -F options should fail
* ok 41: creating a tag with an empty -m message should succeed
* ok 42: creating a tag with an empty -F messagefile should succeed
* ok 43: extra blanks in the message for an annotated tag should be removed
* ok 44: creating a tag with blank -m message with spaces should succeed
* ok 45: creating a tag with blank -F messagefile with spaces should succeed
* ok 46: creating a tag with -F file of spaces and no newline should succeed
* ok 47: creating a tag using a -F messagefile with #comments should succeed
* ok 48: creating a tag with a #comment in the -m message should succeed
* ok 49: creating a tag with #comments in the -F messagefile should succeed
* ok 50: creating a tag with a file of #comment and no newline should succeed
* ok 51: listing the one-line message of a non-signed tag should succeed
* ok 52: listing the zero-lines message of a non-signed tag should succeed
* ok 53: listing many message lines of a non-signed tag should succeed
* ok 54: trying to verify an annotated non-signed tag should fail
* ok 55: trying to verify a file-annotated non-signed tag should fail
* ok 56: trying to verify two annotated non-signed tags should fail
t7004-tag.sh: 613: gpg: not found
Skipping signed tags tests, because gpg was not found
* passed all 56 test(s)
*** t7005-editor.sh ***
* ok 1: setup
* ok 2: dumb should error out when falling back on editor
* ok 3: Using editor
* ok 4: Using EDITOR
* ok 5: Using VISUAL
* ok 6: Using core_editor
* ok 7: Using GIT_EDITOR
* ok 8: Using editor (override)
* ok 9: Using EDITOR (override)
* ok 10: Using VISUAL (override)
* ok 11: Using core_editor (override)
* ok 12: Using GIT_EDITOR (override)
* passed all 12 test(s)
*** t7101-reset.sh ***
* ok 1: creating initial files
* ok 2: creating second files
* ok 3: resetting tree HEAD^
* ok 4: checking initial files exist after rewind
* ok 5: checking lack of path1/path2/COPYING
* ok 6: checking lack of path1/COPYING
* ok 7: checking lack of COPYING
* ok 8: checking checking lack of path1/COPYING-TOO
* ok 9: checking lack of path1/path2
* ok 10: checking lack of path1
* passed all 10 test(s)
*** t7201-co.sh ***
* ok 1: setup
* ok 2: checkout from non-existing branch
* ok 3: checkout with dirty tree without -m
* ok 4: checkout -m with dirty tree
* ok 5: checkout -m with dirty tree, renamed
* ok 6: checkout -m with merge conflict
* ok 7: checkout to detach HEAD
* ok 8: checkout to detach HEAD with branchname^
* ok 9: checkout to detach HEAD with HEAD^0
* ok 10: checkout with ambiguous tag/branch names
* ok 11: checkout with ambiguous tag/branch names
* passed all 11 test(s)
*** t7300-clean.sh ***
* ok 1: setup
* ok 2: git-clean
* ok 3: git-clean -n
* ok 4: git-clean -d
* ok 5: git-clean -x
* ok 6: git-clean -d -x
* ok 7: git-clean -X
* ok 8: git-clean -d -X
* ok 9: clean.requireForce
* ok 10: clean.requireForce and -n
* ok 11: clean.requireForce and -f
* ok 12: core.excludesfile
* passed all 12 test(s)
*** t7400-submodule-basic.sh ***
* ok 1: Prepare submodule testing
* ok 2: status should fail for unmapped paths
* ok 3: status should only print one line
* ok 4: status should initially be "missing"
* ok 5: init should register submodule url in .git/config
* ok 6: update should fail when path is used by a file
* ok 7: update should fail when path is used by a nonempty directory
* ok 8: update should work when path is an empty dir
* ok 9: status should be "up-to-date" after update
* ok 10: status should be "modified" after submodule commit
* ok 11: the --cached sha1 should be rev1
* ok 12: git diff should report the SHA1 of the new submodule commit
* ok 13: update should checkout rev1
* ok 14: status should be "up-to-date" after update
* ok 15: checkout superproject with subproject already present
* ok 16: apply submodule diff
* passed all 16 test(s)
*** t7500-commit.sh ***
* ok 1: a basic commit in an empty tree should succeed
* ok 2: nonexistent template file should return error
* 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 8: adding real content to a template should commit
* ok 9: -t option should be short for --template
* 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: using alternate GIT_INDEX_FILE (1)
* ok 14: using alternate GIT_INDEX_FILE (2)
* passed all 14 test(s)
*** t7501-commit.sh ***
* ok 1: initial status
* ok 2: fail initial amend
* ok 3: initial commit
* ok 4: invalid options 1
* ok 5: invalid options 2
* ok 6: using paths with -a
* ok 7: using paths with --interactive
* ok 8: using invalid commit with -C
* ok 9: testing nothing to commit
* ok 10: next commit
* ok 11: commit message from non-existing file
* ok 12: empty commit message
* ok 13: commit message from file
* ok 14: amend commit
* ok 15: passing -m and -F
* ok 16: using message from other commit
* ok 17: editing message from other commit
* ok 18: message from stdin
* ok 19: overriding author from command line
* ok 20: interactive add
* ok 21: showing committed revisions
* ok 22: validate git-rev-list output.
* ok 23: partial commit that involves removal (1)
* ok 24: partial commit that involves removal (2)
* ok 25: partial commit that involves removal (3)
* passed all 25 test(s)
*** t8001-annotate.sh ***
* ok 1: prepare reference tree
* ok 2: check all lines blamed on A
* ok 3: Setup new lines blamed on B
* ok 4: Two lines blamed on A, two on B
* ok 5: merge-setup part 1
* ok 6: Two lines blamed on A, two on B, two on B1
* ok 7: merge-setup part 2
* ok 8: Two lines blamed on A, one on B, one on B2
* ok 9: merge-setup part 3
* ok 10: Two lines blamed on A, one on B, two on B1, one on B2
* ok 11: Annotating an old revision works
* ok 12: Annotating an old revision works
* ok 13: merge-setup part 4
* ok 14: Two lines blamed on A, one on B, two on B1, one on B2, one on A U Thor
* ok 15: an incomplete line added
* ok 16: With incomplete lines.
* ok 17: some edit
* ok 18: some edit
* ok 19: Annotating an old revision works
* passed all 19 test(s)
*** t8002-blame.sh ***
* ok 1: prepare reference tree
* ok 2: check all lines blamed on A
* ok 3: Setup new lines blamed on B
* ok 4: Two lines blamed on A, two on B
* ok 5: merge-setup part 1
* ok 6: Two lines blamed on A, two on B, two on B1
* ok 7: merge-setup part 2
* ok 8: Two lines blamed on A, one on B, one on B2
* ok 9: merge-setup part 3
* ok 10: Two lines blamed on A, one on B, two on B1, one on B2
* ok 11: Annotating an old revision works
* ok 12: Annotating an old revision works
* ok 13: merge-setup part 4
* ok 14: Two lines blamed on A, one on B, two on B1, one on B2, one on A U Thor
* ok 15: an incomplete line added
* ok 16: With incomplete lines.
* ok 17: some edit
* ok 18: some edit
* passed all 18 test(s)
*** t8003-blame.sh ***
* ok 1: setup
* ok 2: straight copy without -C
* 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 7: straight move with -C -C
* ok 8: append without -C
* ok 9: append with -C
* ok 10: append with -C -C
* ok 11: append with -C -C -C
* ok 12: blame wholesale copy
* ok 13: blame wholesale copy and more
* passed all 13 test(s)
*** t8004-blame.sh ***
* ok 1: setup first case
* ok 2: blame runs on unconflicted file while other file has conflicts
* ok 3: blame runs on conflicted file in stages 1,3
* passed all 3 test(s)
*** t9001-send-email.sh ***
* ok 1: prepare reference tree
* ok 2: Setup helper tool
* ok 3: Extract patches
* ok 4: Send patches
* ok 5: Verify commandline
* passed all 5 test(s)
*** t9100-git-svn-basic.sh ***
define NO_SVN_TESTS to skip git-svn tests
* ok 1: initialize git-svn
* ok 2: import an SVN revision into git
* ok 3: checkout from svn
* ok 4: try a deep --rmdir with a commit
* ok 5: detect node change from file to directory #1
* ok 6: detect node change from directory to file #1
* ok 7: detect node change from file to directory #2
* ok 8: detect node change from directory to file #2
* ok 9: remove executable bit from a file
* ok 10: add executable bit back file
* ok 11: executable file becomes a symlink to bar/zzz (file)
* ok 12: new symlink is added to a file that was also just made executable
* ok 13: modify a symlink to become a file
UTF-8 locale not set, test skipped ()
* ok 14: test fetch functionality (svn => git) with alternate GIT_SVN_ID
* ok 15: check imported tree checksums expected tree checksums
* ok 16: exit if remote refs are ambigious
* ok 17: exit if init-ing a would clobber a URL
* ok 18: init allows us to connect to another directory in the same repo
* ok 19: able to dcommit to a subdirectory
* ok 20: able to set-tree to a subdirectory
* passed all 20 test(s)
*** t9101-git-svn-props.sh ***
* ok 1: checkout working copy from svn
* ok 2: setup some commits to svn
* ok 3: initialize git-svn
* ok 4: fetch revisions from svn
* ok 5: test svn:keywords ignoring
* ok 6: raw $Id$ found in kw.c
* ok 7: propset CR on crlf files
* 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 19: Set CRLF on cr files
* ok 20: fetch and pull latest from svn
* ok 21: CRLF + $Id$
* ok 22: CRLF + $Id$ (no newline)
* FAIL 23: test show-ignore
cd test_wc &&
mkdir -p deeply/nested/directory &&
svn add deeply &&
svn propset -R svn:ignore 'no-such-file*' .
svn commit -m 'propset svn:ignore'
cd .. &&
git-svn show-ignore > show-ignore.got &&
cmp show-ignore.expect show-ignore.got
* failed 1 among 23 test(s)
make[2]: *** [t9101-git-svn-props.sh] Error 1
make[2]: Leaving directory `/build/buildd/git-core-1.5.3.8/t'
make[1]: *** [test] Error 2
make[1]: Leaving directory `/build/buildd/git-core-1.5.3.8'
make: *** [build-arch-stamp] Error 2
dpkg-buildpackage: failure: debian/rules build gave error exit status 2
******************************************************************************
Build finished at 20080217-1339
FAILED [dpkg-buildpackage died]
Purging chroot-hardy-autotest/build/buildd/git-core-1.5.3.8
------------------------------------------------------------------------------
/usr/bin/sudo dpkg --root=/srv/royal.buildd/home/buildd/build-hardy-autotest/chroot-hardy-autotest --purge libgnutlsxx13 libneon27 libglib2.0-0 unzip mime-support readline-common libsasl2-2 zlib1g-dev python2.5 libtasn1-3 libldap2-dev libgcrypt11-dev sgml-data libxml2-utils comerr-dev libgpg-error-dev libpaper1 libopencdk10 libkrb5-dev libxml2 liblzo2-2 libapr1 libcurl3-gnutls pkg-config libpaper-utils libssl0.9.8 libpq5 libkadm55 libsvn-perl libexpat1-dev libldap-2.4-2 xml-core libtasn1-3-dev subversion ucf libaprutil1 libgpg-error0 libgcrypt11 libopencdk10-dev libcurl4-gnutls-dev xmlto libidn11 libkeyutils1 sgml-base python docbook-xml libxslt1.1 libreadline5 libsvn1 libgnutls-dev libgnutls13 libsasl2-modules libexpat1 libsqlite3-0 libidn11-dev liblzo2-dev asciidoc libpcre3 xsltproc tcl8.4 docbook-xsl libkrb53 libncursesw5
(Reading database ... 12750 files and directories currently installed.)
Removing unzip ...
Removing libsvn-perl ...
Purging configuration files for libsvn-perl ...
Removing libexpat1-dev ...
Removing subversion ...
Purging configuration files for subversion ...
Removing libcurl4-gnutls-dev ...
Removing xmlto ...
Removing docbook-xml ...
Purging configuration files for docbook-xml ...
Removing libsvn1 ...
Purging configuration files for libsvn1 ...
Removing libgnutls-dev ...
Removing libidn11-dev ...
Removing liblzo2-dev ...
Removing asciidoc ...
Purging configuration files for asciidoc ...
Removing xsltproc ...
Removing tcl8.4 ...
Purging configuration files for tcl8.4 ...
Removing docbook-xsl ...
Purging configuration files for docbook-xsl ...
Removing libgnutlsxx13 ...
Purging configuration files for libgnutlsxx13 ...
Removing libneon27 ...
Purging configuration files for libneon27 ...
Removing zlib1g-dev ...
Removing libldap2-dev ...
Removing sgml-data ...
Purging configuration files for sgml-data ...
Removing libxml2-utils ...
Removing libkrb5-dev ...
Removing libcurl3-gnutls ...
Purging configuration files for libcurl3-gnutls ...
Removing pkg-config ...
Removing libpaper-utils ...
Removing libkadm55 ...
Purging configuration files for libkadm55 ...
Removing xml-core ...
Purging configuration files for xml-core ...
dpkg - warning: while removing xml-core, directory `/etc/sgml' not empty so not removed.
Removing libtasn1-3-dev ...
Removing libaprutil1 ...
Purging configuration files for libaprutil1 ...
Removing libopencdk10-dev ...
Removing libidn11 ...
Purging configuration files for libidn11 ...
Removing sgml-base ...
Purging configuration files for sgml-base ...
Removing python ...
Purging configuration files for python ...
Removing libxslt1.1 ...
Purging configuration files for libxslt1.1 ...
Removing libexpat1 ...
Purging configuration files for libexpat1 ...
Removing libglib2.0-0 ...
Purging configuration files for libglib2.0-0 ...
Removing python2.5 ...
Purging configuration files for python2.5 ...
dpkg - warning: while removing python2.5, directory `/usr/share/applications' not empty so not removed.
Removing libgcrypt11-dev ...
Removing comerr-dev ...
Removing libgpg-error-dev ...
Removing libpaper1 ...
Purging configuration files for libpaper1 ...
Removing libxml2 ...
Purging configuration files for libxml2 ...
Removing libapr1 ...
Purging configuration files for libapr1 ...
Removing libpq5 ...
Purging configuration files for libpq5 ...
Removing libldap-2.4-2 ...
Purging configuration files for libldap-2.4-2 ...
Removing ucf ...
Purging configuration files for ucf ...
Removing libreadline5 ...
Purging configuration files for libreadline5 ...
Removing libgnutls13 ...
Purging configuration files for libgnutls13 ...
Removing libsqlite3-0 ...
Purging configuration files for libsqlite3-0 ...
Removing libpcre3 ...
Purging configuration files for libpcre3 ...
Removing libkrb53 ...
Purging configuration files for libkrb53 ...
Removing libncursesw5 ...
Purging configuration files for libncursesw5 ...
Removing mime-support ...
Purging configuration files for mime-support ...
Removing readline-common ...
Purging configuration files for readline-common ...
Removing libtasn1-3 ...
Purging configuration files for libtasn1-3 ...
Removing libopencdk10 ...
Purging configuration files for libopencdk10 ...
Removing liblzo2-2 ...
Purging configuration files for liblzo2-2 ...
Removing libgcrypt11 ...
Purging configuration files for libgcrypt11 ...
Removing libkeyutils1 ...
Purging configuration files for libkeyutils1 ...
Removing libgpg-error0 ...
Purging configuration files for libgpg-error0 ...
Removing libsasl2-2 ...
Purging configuration files for libsasl2-2 ...
Removing libsasl2-modules ...
Removing libssl0.9.8 ...
Purging configuration files for libssl0.9.8 ...
******************************************************************************
Finished at 20080217-1339
Build needed 00:04:06, 45728k disk space
More information about the ubuntu-autotest
mailing list