Log for failed build of git-core_1:1.6.3.3-2 (dist=karmic-autotest)
Build Daemon user
noreply at buildd.ubuntu.com
Wed Oct 7 14:32:37 BST 2009
Automatic build of git-core_1:1.6.3.3-2 on weddell by sbuild/ia64 1.170.5
Build started at 20091007-1357
******************************************************************************
Checking available source versions...
Fetching source files...
Reading package lists...
Building dependency tree...
Reading state information...
NOTICE: 'git-core' packaging is maintained in the 'Git' version control system at:
http://smarden.org/git/git.git/
Need to get 2812kB of source archives.
Get:1 http://archive.internal karmic-autotest/main git-core 1:1.6.3.3-2 (dsc) [1303B]
Get:2 http://archive.internal karmic-autotest/main git-core 1:1.6.3.3-2 (tar) [2517kB]
Get:3 http://archive.internal karmic-autotest/main git-core 1:1.6.3.3-2 (diff) [293kB]
Fetched 2812kB in 0s (12.5MB/s)
Download complete and in download only mode
** Using build dependencies supplied by package:
Build-Depends: libz-dev, libcurl4-gnutls-dev | libcurl3-gnutls-dev, asciidoc (>> 8.0.0), xmlto, docbook-xsl (>> 1.72), libexpat1-dev, subversion, libsvn-perl | libsvn-core-perl, unzip, tcl8.5, gettext, cvs, cvsps, libdbd-sqlite3-perl
Checking for already installed source dependencies...
libz-dev: missing
libcurl4-gnutls-dev: missing
libcurl3-gnutls-dev: missing
asciidoc: missing
xmlto: missing
docbook-xsl: missing
libexpat1-dev: missing
subversion: missing
libsvn-perl: missing
libsvn-core-perl: missing
unzip: missing
tcl8.5: missing
gettext: missing
cvs: missing
cvsps: missing
libdbd-sqlite3-perl: missing
Checking for source dependency conflicts...
/usr/bin/sudo /usr/bin/apt-get --purge $CHROOT_OPTIONS -q -y install libz-dev libcurl4-gnutls-dev asciidoc xmlto docbook-xsl libexpat1-dev subversion libsvn-perl unzip tcl8.5 gettext cvs cvsps libdbd-sqlite3-perl
Reading package lists...
Building dependency tree...
Reading state information...
Note, selecting zlib1g-dev instead of libz-dev
The following extra packages will be installed:
comerr-dev docbook-xml gettext-base libapr1 libaprutil1 libcroco3
libdbi-perl libexpat1 libgcrypt11-dev libglib2.0-0 libgnutls-dev
libgpg-error-dev libgssrpc4 libidn11-dev libkadm5srv6 libkdb5-4 libkrb5-dev
libldap2-dev libncursesw5 libneon27-gnutls libnet-daemon-perl libpcre3
libplrpc-perl libsqlite3-0 libsvn1 libtasn1-3-dev libxml2 libxml2-utils
libxslt1.1 mime-support pkg-config python python2.6 sgml-base sgml-data
update-inetd xml-core xsltproc zlib1g-dev
Suggested packages:
source-highlight vim-addon-manager doc-base docbook docbook-dsssl
docbook-defguide libsaxon-java libxalan2-java docbook-xsl-saxon fop xalan
gettext-doc libcurl3-dbg dbishell libgcrypt11-doc gnutls-doc gnutls-bin
guile-gnutls krb5-doc krb5-user python-doc python-tk python-profiler
python2.6-doc python2.6-profiler sgml-base-doc perlsgml doc-html-w3 opensp
subversion-tools db4.7-util tclreadline debhelper xmltex w3m lynx-cur links
Recommended packages:
docbook-utils dblatex info info-browser docbook-xsl-doc-html
docbook-xsl-doc-pdf docbook-xsl-doc-text docbook-xsl-doc ruby zip curl wget
lynx libglib2.0-data shared-mime-info libgpm2 file libpaper-utils
The following NEW packages will be installed:
asciidoc comerr-dev cvs cvsps docbook-xml docbook-xsl gettext gettext-base
libapr1 libaprutil1 libcroco3 libcurl4-gnutls-dev libdbd-sqlite3-perl
libdbi-perl libexpat1 libexpat1-dev libgcrypt11-dev libglib2.0-0
libgnutls-dev libgpg-error-dev libgssrpc4 libidn11-dev libkadm5srv6
libkdb5-4 libkrb5-dev libldap2-dev libncursesw5 libneon27-gnutls
libnet-daemon-perl libpcre3 libplrpc-perl libsqlite3-0 libsvn-perl libsvn1
libtasn1-3-dev libxml2 libxml2-utils libxslt1.1 mime-support pkg-config
python python2.6 sgml-base sgml-data subversion tcl8.5 unzip update-inetd
xml-core xmlto xsltproc zlib1g-dev
0 upgraded, 52 newly installed, 0 to remove and 1 not upgraded.
Need to get 6555kB/27.7MB of archives.
After this operation, 107MB of additional disk space will be used.
WARNING: The following packages cannot be authenticated!
sgml-base xml-core sgml-data docbook-xml libpcre3 libglib2.0-0 libncursesw5
libsqlite3-0 libxml2 mime-support python2.6 python gettext-base libexpat1
asciidoc update-inetd cvs cvsps docbook-xsl libcroco3 gettext libapr1
libaprutil1 libgpg-error-dev libgcrypt11-dev zlib1g-dev libtasn1-3-dev
libgnutls-dev pkg-config libidn11-dev libgssrpc4 libkdb5-4 libkadm5srv6
comerr-dev libkrb5-dev libldap2-dev libcurl4-gnutls-dev libnet-daemon-perl
libplrpc-perl libdbi-perl libdbd-sqlite3-perl libexpat1-dev libneon27-gnutls
libsvn1 libsvn-perl libxml2-utils libxslt1.1 subversion tcl8.5 unzip
xsltproc xmlto
Authentication warning overridden.
Get:1 http://archive.internal karmic-autotest/main cvsps 2.1-5 [65.8kB]
Get:2 http://ftpmaster.internal karmic/main asciidoc 8.4.4-1ubuntu1 [1478kB]
Get:3 http://ftpmaster.internal karmic/main libnet-daemon-perl 0.43-1 [46.9kB]
Get:4 http://ftpmaster.internal karmic/main libplrpc-perl 0.2020-2 [36.0kB]
Get:5 http://ftpmaster.internal karmic/main libdbi-perl 1.609-1 [830kB]
Get:6 http://ftpmaster.internal karmic/main libdbd-sqlite3-perl 1.25-2 [525kB]
Get:7 http://ftpmaster.internal karmic/main libneon27-gnutls 0.28.6-1 [154kB]
Get:8 http://ftpmaster.internal karmic/main libsvn1 1.6.5dfsg-1ubuntu1 [1172kB]
Get:9 http://ftpmaster.internal karmic/main libsvn-perl 1.6.5dfsg-1ubuntu1 [1540kB]
Get:10 http://ftpmaster.internal karmic/main subversion 1.6.5dfsg-1ubuntu1 [446kB]
Get:11 http://ftpmaster.internal karmic/main unzip 6.0-1 [261kB]
debconf: unable to initialize frontend: Dialog
debconf: (Dialog frontend will not work on a dumb terminal, an emacs shell buffer, or without a controlling terminal.)
debconf: falling back to frontend: Readline
debconf: unable to initialize frontend: Readline
debconf: (This frontend requires a controlling tty.)
debconf: falling back to frontend: Teletype
dpkg-preconfigure: unable to re-open stdin:
Fetched 6555kB in 0s (8107kB/s)
Selecting previously deselected package sgml-base.
(Reading database ... 10622 files and directories currently installed.)
Unpacking sgml-base (from .../sgml-base_1.26_all.deb) ...
Selecting previously deselected package xml-core.
Unpacking xml-core (from .../archives/xml-core_0.12_all.deb) ...
Selecting previously deselected package sgml-data.
Unpacking sgml-data (from .../sgml-data_2.0.3_all.deb) ...
Setting up sgml-base (1.26) ...
Setting up xml-core (0.12) ...
Selecting previously deselected package docbook-xml.
(Reading database ... 10860 files and directories currently installed.)
Unpacking docbook-xml (from .../docbook-xml_4.5-6_all.deb) ...
Selecting previously deselected package libpcre3.
Unpacking libpcre3 (from .../libpcre3_7.8-2ubuntu1_ia64.deb) ...
Selecting previously deselected package libglib2.0-0.
Unpacking libglib2.0-0 (from .../libglib2.0-0_2.22.0-1ubuntu1_ia64.deb) ...
Selecting previously deselected package libncursesw5.
Unpacking libncursesw5 (from .../libncursesw5_5.7+20090803-2ubuntu1_ia64.deb) ...
Selecting previously deselected package libsqlite3-0.
Unpacking libsqlite3-0 (from .../libsqlite3-0_3.6.16-1ubuntu1_ia64.deb) ...
Selecting previously deselected package libxml2.
Unpacking libxml2 (from .../libxml2_2.7.3.dfsg-1ubuntu2_ia64.deb) ...
Selecting previously deselected package mime-support.
Unpacking mime-support (from .../mime-support_3.46-1ubuntu1_all.deb) ...
Selecting previously deselected package python2.6.
Unpacking python2.6 (from .../python2.6_2.6.3-0ubuntu2_ia64.deb) ...
Selecting previously deselected package python.
Unpacking python (from .../python_2.6.3-0ubuntu1_all.deb) ...
Selecting previously deselected package gettext-base.
Unpacking gettext-base (from .../gettext-base_0.17-8ubuntu1_ia64.deb) ...
Selecting previously deselected package libexpat1.
Unpacking libexpat1 (from .../libexpat1_2.0.1-4ubuntu1_ia64.deb) ...
Selecting previously deselected package asciidoc.
Unpacking asciidoc (from .../asciidoc_8.4.4-1ubuntu1_all.deb) ...
Selecting previously deselected package update-inetd.
Unpacking update-inetd (from .../update-inetd_4.31_all.deb) ...
Selecting previously deselected package cvs.
Unpacking cvs (from .../cvs_1%3a1.12.13-12ubuntu1_ia64.deb) ...
Selecting previously deselected package cvsps.
Unpacking cvsps (from .../archives/cvsps_2.1-5_ia64.deb) ...
Selecting previously deselected package docbook-xsl.
Unpacking docbook-xsl (from .../docbook-xsl_1.75.1+dfsg-1_all.deb) ...
Selecting previously deselected package libcroco3.
Unpacking libcroco3 (from .../libcroco3_0.6.1-2_ia64.deb) ...
Selecting previously deselected package gettext.
Unpacking gettext (from .../gettext_0.17-8ubuntu1_ia64.deb) ...
Selecting previously deselected package libapr1.
Unpacking libapr1 (from .../libapr1_1.3.8-1_ia64.deb) ...
Selecting previously deselected package libaprutil1.
Unpacking libaprutil1 (from .../libaprutil1_1.3.9+dfsg-1ubuntu1_ia64.deb) ...
Selecting previously deselected package libgpg-error-dev.
Unpacking libgpg-error-dev (from .../libgpg-error-dev_1.6-1ubuntu1_ia64.deb) ...
Selecting previously deselected package libgcrypt11-dev.
Unpacking libgcrypt11-dev (from .../libgcrypt11-dev_1.4.4-2ubuntu2_ia64.deb) ...
Selecting previously deselected package zlib1g-dev.
Unpacking zlib1g-dev (from .../zlib1g-dev_1%3a1.2.3.3.dfsg-13ubuntu3_ia64.deb) ...
Selecting previously deselected package libtasn1-3-dev.
Unpacking libtasn1-3-dev (from .../libtasn1-3-dev_2.2-1_ia64.deb) ...
Selecting previously deselected package libgnutls-dev.
Unpacking libgnutls-dev (from .../libgnutls-dev_2.8.3-2_ia64.deb) ...
Selecting previously deselected package pkg-config.
Unpacking pkg-config (from .../pkg-config_0.22-1build1_ia64.deb) ...
Selecting previously deselected package libidn11-dev.
Unpacking libidn11-dev (from .../libidn11-dev_1.15-1_ia64.deb) ...
Selecting previously deselected package libgssrpc4.
Unpacking libgssrpc4 (from .../libgssrpc4_1.7dfsg~beta3-1_ia64.deb) ...
Selecting previously deselected package libkdb5-4.
Unpacking libkdb5-4 (from .../libkdb5-4_1.7dfsg~beta3-1_ia64.deb) ...
Selecting previously deselected package libkadm5srv6.
Unpacking libkadm5srv6 (from .../libkadm5srv6_1.7dfsg~beta3-1_ia64.deb) ...
Selecting previously deselected package comerr-dev.
Unpacking comerr-dev (from .../comerr-dev_2.1-1.41.9-1ubuntu1_ia64.deb) ...
Selecting previously deselected package libkrb5-dev.
Unpacking libkrb5-dev (from .../libkrb5-dev_1.7dfsg~beta3-1_ia64.deb) ...
Selecting previously deselected package libldap2-dev.
Unpacking libldap2-dev (from .../libldap2-dev_2.4.18-0ubuntu1_ia64.deb) ...
Selecting previously deselected package libcurl4-gnutls-dev.
Unpacking libcurl4-gnutls-dev (from .../libcurl4-gnutls-dev_7.19.5-1ubuntu2_ia64.deb) ...
Selecting previously deselected package libnet-daemon-perl.
Unpacking libnet-daemon-perl (from .../libnet-daemon-perl_0.43-1_all.deb) ...
Selecting previously deselected package libplrpc-perl.
Unpacking libplrpc-perl (from .../libplrpc-perl_0.2020-2_all.deb) ...
Selecting previously deselected package libdbi-perl.
Unpacking libdbi-perl (from .../libdbi-perl_1.609-1_ia64.deb) ...
Selecting previously deselected package libdbd-sqlite3-perl.
Unpacking libdbd-sqlite3-perl (from .../libdbd-sqlite3-perl_1.25-2_ia64.deb) ...
Selecting previously deselected package libexpat1-dev.
Unpacking libexpat1-dev (from .../libexpat1-dev_2.0.1-4ubuntu1_ia64.deb) ...
Selecting previously deselected package libneon27-gnutls.
Unpacking libneon27-gnutls (from .../libneon27-gnutls_0.28.6-1_ia64.deb) ...
Selecting previously deselected package libsvn1.
Unpacking libsvn1 (from .../libsvn1_1.6.5dfsg-1ubuntu1_ia64.deb) ...
Selecting previously deselected package libsvn-perl.
Unpacking libsvn-perl (from .../libsvn-perl_1.6.5dfsg-1ubuntu1_ia64.deb) ...
Selecting previously deselected package libxml2-utils.
Unpacking libxml2-utils (from .../libxml2-utils_2.7.3.dfsg-1ubuntu2_ia64.deb) ...
Selecting previously deselected package libxslt1.1.
Unpacking libxslt1.1 (from .../libxslt1.1_1.1.24-2ubuntu2_ia64.deb) ...
Selecting previously deselected package subversion.
Unpacking subversion (from .../subversion_1.6.5dfsg-1ubuntu1_ia64.deb) ...
Selecting previously deselected package tcl8.5.
Unpacking tcl8.5 (from .../tcl8.5_8.5.7-1_ia64.deb) ...
Selecting previously deselected package unzip.
Unpacking unzip (from .../archives/unzip_6.0-1_ia64.deb) ...
Selecting previously deselected package xsltproc.
Unpacking xsltproc (from .../xsltproc_1.1.24-2ubuntu2_ia64.deb) ...
Selecting previously deselected package xmlto.
Unpacking xmlto (from .../xmlto_0.0.22-1_ia64.deb) ...
Setting up sgml-data (2.0.3) ...
Setting up docbook-xml (4.5-6) ...
Setting up libpcre3 (7.8-2ubuntu1) ...
Setting up libglib2.0-0 (2.22.0-1ubuntu1) ...
Setting up libncursesw5 (5.7+20090803-2ubuntu1) ...
Setting up libsqlite3-0 (3.6.16-1ubuntu1) ...
Setting up libxml2 (2.7.3.dfsg-1ubuntu2) ...
Setting up mime-support (3.46-1ubuntu1) ...
update-alternatives: using /usr/bin/see to provide /usr/bin/view (view) in auto mode.
Setting up python2.6 (2.6.3-0ubuntu2) ...
Setting up python (2.6.3-0ubuntu1) ...
Setting up gettext-base (0.17-8ubuntu1) ...
Setting up libexpat1 (2.0.1-4ubuntu1) ...
Setting up asciidoc (8.4.4-1ubuntu1) ...
Setting up update-inetd (4.31) ...
Setting up cvs (1:1.12.13-12ubuntu1) ...
Setting up cvsps (2.1-5) ...
Setting up docbook-xsl (1.75.1+dfsg-1) ...
Setting up libcroco3 (0.6.1-2) ...
Setting up gettext (0.17-8ubuntu1) ...
Setting up libapr1 (1.3.8-1) ...
Setting up libaprutil1 (1.3.9+dfsg-1ubuntu1) ...
Setting up libgpg-error-dev (1.6-1ubuntu1) ...
Setting up libgcrypt11-dev (1.4.4-2ubuntu2) ...
Setting up zlib1g-dev (1:1.2.3.3.dfsg-13ubuntu3) ...
Setting up libtasn1-3-dev (2.2-1) ...
Setting up libgnutls-dev (2.8.3-2) ...
Setting up pkg-config (0.22-1build1) ...
Setting up libidn11-dev (1.15-1) ...
install-info: warning: maintainer scripts should not call install-info anymore,
install-info: warning: this is handled now by a dpkg trigger provided by the
install-info: warning: install-info package; package libidn11-dev should be updated.
Setting up libgssrpc4 (1.7dfsg~beta3-1) ...
Setting up libkdb5-4 (1.7dfsg~beta3-1) ...
Setting up libkadm5srv6 (1.7dfsg~beta3-1) ...
Setting up comerr-dev (2.1-1.41.9-1ubuntu1) ...
Setting up libkrb5-dev (1.7dfsg~beta3-1) ...
Setting up libldap2-dev (2.4.18-0ubuntu1) ...
Setting up libcurl4-gnutls-dev (7.19.5-1ubuntu2) ...
Setting up libnet-daemon-perl (0.43-1) ...
Setting up libplrpc-perl (0.2020-2) ...
Setting up libdbi-perl (1.609-1) ...
Setting up libdbd-sqlite3-perl (1.25-2) ...
Setting up libexpat1-dev (2.0.1-4ubuntu1) ...
Setting up libneon27-gnutls (0.28.6-1) ...
Setting up libsvn1 (1.6.5dfsg-1ubuntu1) ...
Setting up libsvn-perl (1.6.5dfsg-1ubuntu1) ...
Setting up libxml2-utils (2.7.3.dfsg-1ubuntu2) ...
Setting up libxslt1.1 (1.1.24-2ubuntu2) ...
Setting up subversion (1.6.5dfsg-1ubuntu1) ...
Setting up tcl8.5 (8.5.7-1) ...
update-alternatives: using /usr/bin/tclsh8.5 to provide /usr/bin/tclsh (tclsh) in auto mode.
Setting up unzip (6.0-1) ...
Setting up xsltproc (1.1.24-2ubuntu2) ...
Setting up xmlto (0.0.22-1) ...
Processing triggers for libc-bin ...
ldconfig deferred processing now taking place
Checking correctness of source dependencies...
Toolchain package versions: libc6.1-dev_2.10.1-0ubuntu13 make_3.81-6 dpkg-dev_1.15.4ubuntu2 linux-libc-dev_2.6.31-12.39 g++-4.4_4.4.1-4ubuntu7 gcc-4.4_4.4.1-4ubuntu7 binutils_2.19.91.20091006-0ubuntu1 libstdc++6_4.4.1-4ubuntu7 libstdc++6-4.4-dev_4.4.1-4ubuntu7
------------------------------------------------------------------------------
sh: gcc: not found
dpkg-source: warning: Couldn't determine gcc system type, falling back to default (native compilation)
gpg: Signature made Tue Jun 30 04:25:37 2009 BST using DSA key ID BC70A6FF
gpg: Can't check signature: public key not found
dpkg-source: extracting git-core in git-core-1.6.3.3
dpkg-source: unpacking git-core_1.6.3.3.orig.tar.gz
dpkg-source: applying /srv/weddell.ubuntu.com/home/buildd/build-karmic-autotest/git-core_1.6.3.3-2.diff.gz
dpkg-buildpackage: set CFLAGS to default value: -g -O2
dpkg-buildpackage: set CPPFLAGS to default value:
dpkg-buildpackage: set LDFLAGS to default value: -Wl,-Bsymbolic-functions
dpkg-buildpackage: set FFLAGS to default value: -g -O2
dpkg-buildpackage: set CXXFLAGS to default value: -g -O2
dpkg-buildpackage: source package git-core
dpkg-buildpackage: source version 1:1.6.3.3-2
dpkg-buildpackage: host architecture ia64
/usr/bin/fakeroot debian/rules clean
/usr/bin/make clean NO_OPENSSL=1 prefix=/usr gitexecdir=/usr/lib/git-core mandir=/usr/share/man INSTALLDIRS=vendor WITH_P4IMPORT=1 PYTHON_PATH=/usr/bin/python TCLTK_PATH=/usr/bin/wish THREADED_DELTA_SEARCH=1 NO_CROSS_DIRECTORY_HARDLINKS=1
make[1]: Entering directory `/build/buildd/git-core-1.6.3.3'
GIT_VERSION = 1.6.3.3
make[1]: Leaving directory `/build/buildd/git-core-1.6.3.3'
make[1]: Entering directory `/build/buildd/git-core-1.6.3.3'
rm -f *.o mozilla-sha1/*.o arm/*.o ppc/*.o compat/*.o xdiff/*.o \
libgit.a xdiff/lib.a
rm -f git-fast-import git-fetch-pack git-hash-object git-index-pack git-merge-index git-merge-tree git-mktag git-mktree git-pack-redundant git-patch-id git-send-pack git-shell git-show-index git-unpack-file git-update-server-info git-upload-pack git-var git-http-push git-daemon git-imap-send git-am git-bisect git-difftool--helper git-filter-branch git-lost-found git-merge-octopus git-merge-one-file git-merge-resolve git-mergetool git-mergetool--lib git-parse-remote git-pull git-quiltimport git-rebase--interactive git-rebase git-repack git-request-pull git-sh-setup git-stash git-submodule git-web--browse git-add--interactive git-difftool git-archimport git-cvsexportcommit git-cvsimport git-cvsserver git-relink git-send-email git-svn git-instaweb git-add git-annotate git-apply git-archive git-bisect--helper git-blame git-branch git-bundle git-cat-file git-check-attr git-check-ref-format git-checkout-index git-checkout git-clean git-clone git-commit-tree git-commit git-config
git-count-objects git-describe git-diff-files git-diff-index git-diff-tree git-diff git-fast-export git-fetch--tool git-fetch-pack git-fetch git-fmt-merge-msg git-for-each-ref git-fsck git-gc git-grep git-help git-init-db git-log git-ls-files git-ls-remote git-ls-tree git-mailinfo git-mailsplit git-merge git-merge-base git-merge-file git-merge-ours git-merge-recursive git-mv git-name-rev git-pack-objects git-pack-refs git-prune-packed git-prune git-push git-read-tree git-receive-pack git-reflog git-remote git-rerere git-reset git-rev-list git-rev-parse git-revert git-rm git-send-pack git-shortlog git-show-branch git-show-ref git-stripspace git-symbolic-ref git-tag git-tar-tree git-unpack-objects git-update-index git-update-ref git-upload-archive git-verify-pack git-verify-tag git-write-tree git-http-fetch git-cherry git-cherry-pick git-format-patch git-fsck-objects git-get-tar-commit-id git-init git-merge-subtree git-peek-remote git-repo-config git-show git-stage git-status
git-whatchanged git
rm -f test-chmtime test-ctype test-date test-delta test-dump-cache-tree test-genrandom test-match-trees test-parse-options test-path-utils test-sha1 test-sigchain
rm -f *.spec *.pyc *.pyo */*.pyc */*.pyo common-cmds.h TAGS tags cscope*
rm -f -r autom4te.cache
rm -f config.log config.mak.autogen config.mak.append config.status config.cache
rm -f -r git-1.6.3.3 .doc-tmp-dir
rm -f git-1.6.3.3.tar.gz git-core_1.6.3.3-*.tar.gz
rm -f git-htmldocs-1.6.3.3.tar.gz git-manpages-1.6.3.3.tar.gz
/usr/bin/make -C Documentation/ clean
make[2]: Entering directory `/build/buildd/git-core-1.6.3.3/Documentation'
GEN doc.dep
make[3]: Entering directory `/build/buildd/git-core-1.6.3.3'
make[3]: `GIT-VERSION-FILE' is up to date.
make[3]: Leaving directory `/build/buildd/git-core-1.6.3.3'
make[2]: Leaving directory `/build/buildd/git-core-1.6.3.3/Documentation'
make[2]: Entering directory `/build/buildd/git-core-1.6.3.3/Documentation'
make[3]: Entering directory `/build/buildd/git-core-1.6.3.3'
make[3]: `GIT-VERSION-FILE' is up to date.
make[3]: Leaving directory `/build/buildd/git-core-1.6.3.3'
rm -f *.xml *.xml+ *.html *.html+ *.1 *.5 *.7
rm -f *.texi *.texi+ *.texi++ git.info gitman.info
rm -f howto-index.txt howto/*.html doc.dep
rm -f technical/api-*.html technical/api-index.txt
rm -f cmds-ancillaryinterrogators.txt cmds-ancillarymanipulators.txt cmds-mainporcelain.txt cmds-plumbinginterrogators.txt cmds-plumbingmanipulators.txt cmds-synchingrepositories.txt cmds-synchelpers.txt cmds-purehelpers.txt cmds-foreignscminterface.txt *.made
make[2]: Leaving directory `/build/buildd/git-core-1.6.3.3/Documentation'
rm -f gitweb/gitweb.cgi
/usr/bin/make -C perl clean
make[2]: Entering directory `/build/buildd/git-core-1.6.3.3/perl'
rm -f ppport.h
rm -f perl.mak
rm -f perl.mak.old
make[2]: Leaving directory `/build/buildd/git-core-1.6.3.3/perl'
/usr/bin/make -C templates/ clean
make[2]: Entering directory `/build/buildd/git-core-1.6.3.3/templates'
rm -f -r blt boilerplates.made
make[2]: Leaving directory `/build/buildd/git-core-1.6.3.3/templates'
/usr/bin/make -C t/ clean
make[2]: Entering directory `/build/buildd/git-core-1.6.3.3/t'
rm -f -r 'trash directory'.* test-results
make[2]: Leaving directory `/build/buildd/git-core-1.6.3.3/t'
/usr/bin/make -C gitk-git clean
make[2]: Entering directory `/build/buildd/git-core-1.6.3.3/gitk-git'
rm -f gitk-wish po/*.msg
make[2]: Leaving directory `/build/buildd/git-core-1.6.3.3/gitk-git'
/usr/bin/make -C git-gui clean
make[2]: Entering directory `/build/buildd/git-core-1.6.3.3/git-gui'
GITGUI_VERSION = 0.12.0.23.ga91be
make[2]: Leaving directory `/build/buildd/git-core-1.6.3.3/git-gui'
make[2]: Entering directory `/build/buildd/git-core-1.6.3.3/git-gui'
rm -rf git-gui lib/tclIndex po/*.msg
rm -rf GIT-VERSION-FILE GIT-GUI-VARS
make[2]: Leaving directory `/build/buildd/git-core-1.6.3.3/git-gui'
rm -f GIT-VERSION-FILE GIT-CFLAGS GIT-GUI-VARS GIT-BUILD-OPTIONS
make[1]: Leaving directory `/build/buildd/git-core-1.6.3.3'
! 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.6.3.3/tmp'
rm -f patch-stamp build-arch-stamp build-indep-stamp
rm -rf '/build/buildd/git-core-1.6.3.3/debian/git'-core '/build/buildd/git-core-1.6.3.3/debian/git'-doc '/build/buildd/git-core-1.6.3.3/debian/git'-arch '/build/buildd/git-core-1.6.3.3/debian/git'-cvs \
'/build/buildd/git-core-1.6.3.3/debian/git'-svn '/build/buildd/git-core-1.6.3.3/debian/git'-email '/build/buildd/git-core-1.6.3.3/debian/git'-daemon-run '/build/buildd/git-core-1.6.3.3/debian/git'-gui \
'/build/buildd/git-core-1.6.3.3/debian/git'k '/build/buildd/git-core-1.6.3.3/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 contrib/fast-import/git-p4
patching file editor.c
patching file git-add--interactive.perl
patching file git-sh-setup.sh
patching file git-svn.perl
patching file t/t7005-editor.sh
patching file ident.c
patching file git-svn.perl
patching file contrib/hooks/post-receive-email
touch patch-stamp
/usr/bin/make -CDocumentation man html ASCIIDOC8=YesPlease ASCIIDOC_NO_ROFF=Yes
make[1]: Entering directory `/build/buildd/git-core-1.6.3.3/Documentation'
GEN doc.dep
make[2]: Entering directory `/build/buildd/git-core-1.6.3.3'
GIT_VERSION = 1.6.3.3
make[2]: Leaving directory `/build/buildd/git-core-1.6.3.3'
make[2]: Entering directory `/build/buildd/git-core-1.6.3.3'
make[2]: `GIT-VERSION-FILE' is up to date.
make[2]: Leaving directory `/build/buildd/git-core-1.6.3.3'
make[1]: Leaving directory `/build/buildd/git-core-1.6.3.3/Documentation'
make[1]: Entering directory `/build/buildd/git-core-1.6.3.3/Documentation'
make[2]: Entering directory `/build/buildd/git-core-1.6.3.3'
make[2]: `GIT-VERSION-FILE' is up to date.
make[2]: Leaving directory `/build/buildd/git-core-1.6.3.3'
ASCIIDOC git-add.xml
XMLTO git-add.1
ASCIIDOC git-am.xml
XMLTO git-am.1
ASCIIDOC git-annotate.xml
XMLTO git-annotate.1
ASCIIDOC git-apply.xml
XMLTO git-apply.1
ASCIIDOC git-archimport.xml
XMLTO git-archimport.1
ASCIIDOC git-archive.xml
XMLTO git-archive.1
ASCIIDOC git-bisect.xml
XMLTO git-bisect.1
ASCIIDOC git-blame.xml
XMLTO git-blame.1
ASCIIDOC git-branch.xml
XMLTO git-branch.1
ASCIIDOC git-bundle.xml
XMLTO git-bundle.1
ASCIIDOC git-cat-file.xml
XMLTO git-cat-file.1
ASCIIDOC git-check-attr.xml
XMLTO git-check-attr.1
ASCIIDOC git-check-ref-format.xml
XMLTO git-check-ref-format.1
ASCIIDOC git-checkout-index.xml
XMLTO git-checkout-index.1
ASCIIDOC git-checkout.xml
XMLTO git-checkout.1
ASCIIDOC git-cherry-pick.xml
XMLTO git-cherry-pick.1
ASCIIDOC git-cherry.xml
XMLTO git-cherry.1
ASCIIDOC git-citool.xml
XMLTO git-citool.1
ASCIIDOC git-clean.xml
XMLTO git-clean.1
ASCIIDOC git-clone.xml
XMLTO git-clone.1
ASCIIDOC git-commit-tree.xml
XMLTO git-commit-tree.1
ASCIIDOC git-commit.xml
XMLTO git-commit.1
ASCIIDOC git-config.xml
XMLTO git-config.1
ASCIIDOC git-count-objects.xml
XMLTO git-count-objects.1
ASCIIDOC git-cvsexportcommit.xml
XMLTO git-cvsexportcommit.1
ASCIIDOC git-cvsimport.xml
XMLTO git-cvsimport.1
ASCIIDOC git-cvsserver.xml
XMLTO git-cvsserver.1
ASCIIDOC git-daemon.xml
XMLTO git-daemon.1
ASCIIDOC git-describe.xml
XMLTO git-describe.1
ASCIIDOC git-diff-files.xml
XMLTO git-diff-files.1
ASCIIDOC git-diff-index.xml
XMLTO git-diff-index.1
ASCIIDOC git-diff-tree.xml
XMLTO git-diff-tree.1
ASCIIDOC git-diff.xml
XMLTO git-diff.1
ASCIIDOC git-difftool.xml
XMLTO git-difftool.1
ASCIIDOC git-fast-export.xml
XMLTO git-fast-export.1
ASCIIDOC git-fast-import.xml
XMLTO git-fast-import.1
ASCIIDOC git-fetch-pack.xml
XMLTO git-fetch-pack.1
ASCIIDOC git-fetch.xml
XMLTO git-fetch.1
ASCIIDOC git-filter-branch.xml
WARNING: git-filter-branch.txt: line 369: nested inline passthrough
XMLTO git-filter-branch.1
ASCIIDOC git-fmt-merge-msg.xml
XMLTO git-fmt-merge-msg.1
ASCIIDOC git-for-each-ref.xml
XMLTO git-for-each-ref.1
ASCIIDOC git-format-patch.xml
XMLTO git-format-patch.1
ASCIIDOC git-fsck-objects.xml
XMLTO git-fsck-objects.1
ASCIIDOC git-fsck.xml
XMLTO git-fsck.1
ASCIIDOC git-gc.xml
XMLTO git-gc.1
ASCIIDOC git-get-tar-commit-id.xml
XMLTO git-get-tar-commit-id.1
ASCIIDOC git-grep.xml
XMLTO git-grep.1
ASCIIDOC git-gui.xml
XMLTO git-gui.1
ASCIIDOC git-hash-object.xml
XMLTO git-hash-object.1
ASCIIDOC git-help.xml
XMLTO git-help.1
ASCIIDOC git-http-fetch.xml
XMLTO git-http-fetch.1
ASCIIDOC git-http-push.xml
XMLTO git-http-push.1
ASCIIDOC git-imap-send.xml
XMLTO git-imap-send.1
ASCIIDOC git-index-pack.xml
XMLTO git-index-pack.1
ASCIIDOC git-init-db.xml
XMLTO git-init-db.1
ASCIIDOC git-init.xml
XMLTO git-init.1
ASCIIDOC git-instaweb.xml
XMLTO git-instaweb.1
ASCIIDOC git-log.xml
XMLTO git-log.1
ASCIIDOC git-lost-found.xml
XMLTO git-lost-found.1
ASCIIDOC git-ls-files.xml
XMLTO git-ls-files.1
ASCIIDOC git-ls-remote.xml
XMLTO git-ls-remote.1
ASCIIDOC git-ls-tree.xml
XMLTO git-ls-tree.1
ASCIIDOC git-mailinfo.xml
XMLTO git-mailinfo.1
ASCIIDOC git-mailsplit.xml
XMLTO git-mailsplit.1
ASCIIDOC git-merge-base.xml
XMLTO git-merge-base.1
ASCIIDOC git-merge-file.xml
XMLTO git-merge-file.1
ASCIIDOC git-merge-index.xml
XMLTO git-merge-index.1
ASCIIDOC git-merge-one-file.xml
XMLTO git-merge-one-file.1
ASCIIDOC git-merge-tree.xml
XMLTO git-merge-tree.1
ASCIIDOC git-merge.xml
XMLTO git-merge.1
ASCIIDOC git-mergetool--lib.xml
XMLTO git-mergetool--lib.1
ASCIIDOC git-mergetool.xml
XMLTO git-mergetool.1
ASCIIDOC git-mktag.xml
XMLTO git-mktag.1
ASCIIDOC git-mktree.xml
XMLTO git-mktree.1
ASCIIDOC git-mv.xml
XMLTO git-mv.1
ASCIIDOC git-name-rev.xml
XMLTO git-name-rev.1
ASCIIDOC git-pack-objects.xml
XMLTO git-pack-objects.1
ASCIIDOC git-pack-redundant.xml
XMLTO git-pack-redundant.1
ASCIIDOC git-pack-refs.xml
XMLTO git-pack-refs.1
ASCIIDOC git-parse-remote.xml
XMLTO git-parse-remote.1
ASCIIDOC git-patch-id.xml
XMLTO git-patch-id.1
ASCIIDOC git-peek-remote.xml
XMLTO git-peek-remote.1
ASCIIDOC git-prune-packed.xml
XMLTO git-prune-packed.1
ASCIIDOC git-prune.xml
XMLTO git-prune.1
ASCIIDOC git-pull.xml
XMLTO git-pull.1
ASCIIDOC git-push.xml
XMLTO git-push.1
ASCIIDOC git-quiltimport.xml
XMLTO git-quiltimport.1
ASCIIDOC git-read-tree.xml
XMLTO git-read-tree.1
ASCIIDOC git-rebase.xml
XMLTO git-rebase.1
ASCIIDOC git-receive-pack.xml
XMLTO git-receive-pack.1
ASCIIDOC git-reflog.xml
XMLTO git-reflog.1
ASCIIDOC git-relink.xml
XMLTO git-relink.1
ASCIIDOC git-remote.xml
XMLTO git-remote.1
ASCIIDOC git-repack.xml
XMLTO git-repack.1
ASCIIDOC git-repo-config.xml
XMLTO git-repo-config.1
ASCIIDOC git-request-pull.xml
XMLTO git-request-pull.1
ASCIIDOC git-rerere.xml
XMLTO git-rerere.1
ASCIIDOC git-reset.xml
XMLTO git-reset.1
ASCIIDOC git-rev-list.xml
XMLTO git-rev-list.1
ASCIIDOC git-rev-parse.xml
XMLTO git-rev-parse.1
ASCIIDOC git-revert.xml
XMLTO git-revert.1
ASCIIDOC git-rm.xml
XMLTO git-rm.1
ASCIIDOC git-send-email.xml
XMLTO git-send-email.1
ASCIIDOC git-send-pack.xml
XMLTO git-send-pack.1
ASCIIDOC git-sh-setup.xml
XMLTO git-sh-setup.1
ASCIIDOC git-shell.xml
XMLTO git-shell.1
ASCIIDOC git-shortlog.xml
XMLTO git-shortlog.1
ASCIIDOC git-show-branch.xml
XMLTO git-show-branch.1
ASCIIDOC git-show-index.xml
XMLTO git-show-index.1
ASCIIDOC git-show-ref.xml
XMLTO git-show-ref.1
ASCIIDOC git-show.xml
XMLTO git-show.1
ASCIIDOC git-stage.xml
XMLTO git-stage.1
ASCIIDOC git-stash.xml
XMLTO git-stash.1
ASCIIDOC git-status.xml
XMLTO git-status.1
ASCIIDOC git-stripspace.xml
XMLTO git-stripspace.1
ASCIIDOC git-submodule.xml
XMLTO git-submodule.1
ASCIIDOC git-svn.xml
XMLTO git-svn.1
ASCIIDOC git-symbolic-ref.xml
XMLTO git-symbolic-ref.1
ASCIIDOC git-tag.xml
XMLTO git-tag.1
ASCIIDOC git-tar-tree.xml
XMLTO git-tar-tree.1
ASCIIDOC git-unpack-file.xml
XMLTO git-unpack-file.1
ASCIIDOC git-unpack-objects.xml
XMLTO git-unpack-objects.1
ASCIIDOC git-update-index.xml
XMLTO git-update-index.1
ASCIIDOC git-update-ref.xml
XMLTO git-update-ref.1
ASCIIDOC git-update-server-info.xml
XMLTO git-update-server-info.1
ASCIIDOC git-upload-archive.xml
XMLTO git-upload-archive.1
ASCIIDOC git-upload-pack.xml
XMLTO git-upload-pack.1
ASCIIDOC git-var.xml
XMLTO git-var.1
ASCIIDOC git-verify-pack.xml
XMLTO git-verify-pack.1
ASCIIDOC git-verify-tag.xml
XMLTO git-verify-tag.1
ASCIIDOC git-web--browse.xml
XMLTO git-web--browse.1
ASCIIDOC git-whatchanged.xml
XMLTO git-whatchanged.1
ASCIIDOC git-write-tree.xml
XMLTO git-write-tree.1
ASCIIDOC gitk.xml
XMLTO gitk.1
GEN cmd-list.made
ASCIIDOC git.xml
XMLTO git.1
ASCIIDOC gitattributes.xml
XMLTO gitattributes.5
ASCIIDOC gitignore.xml
XMLTO gitignore.5
ASCIIDOC gitmodules.xml
XMLTO gitmodules.5
ASCIIDOC githooks.xml
XMLTO githooks.5
ASCIIDOC gitrepository-layout.xml
XMLTO gitrepository-layout.5
ASCIIDOC gitcli.xml
XMLTO gitcli.7
ASCIIDOC gittutorial.xml
XMLTO gittutorial.7
ASCIIDOC gittutorial-2.xml
XMLTO gittutorial-2.7
ASCIIDOC gitcvs-migration.xml
XMLTO gitcvs-migration.7
ASCIIDOC gitcore-tutorial.xml
XMLTO gitcore-tutorial.7
ASCIIDOC gitglossary.xml
XMLTO gitglossary.7
ASCIIDOC gitdiffcore.xml
XMLTO gitdiffcore.7
ASCIIDOC gitworkflows.xml
XMLTO gitworkflows.7
ASCIIDOC git-add.html
ASCIIDOC git-am.html
ASCIIDOC git-annotate.html
ASCIIDOC git-apply.html
ASCIIDOC git-archimport.html
ASCIIDOC git-archive.html
ASCIIDOC git-bisect.html
ASCIIDOC git-blame.html
ASCIIDOC git-branch.html
ASCIIDOC git-bundle.html
ASCIIDOC git-cat-file.html
ASCIIDOC git-check-attr.html
ASCIIDOC git-check-ref-format.html
ASCIIDOC git-checkout-index.html
ASCIIDOC git-checkout.html
ASCIIDOC git-cherry-pick.html
ASCIIDOC git-cherry.html
ASCIIDOC git-citool.html
ASCIIDOC git-clean.html
ASCIIDOC git-clone.html
ASCIIDOC git-commit-tree.html
ASCIIDOC git-commit.html
ASCIIDOC git-config.html
ASCIIDOC git-count-objects.html
ASCIIDOC git-cvsexportcommit.html
ASCIIDOC git-cvsimport.html
ASCIIDOC git-cvsserver.html
ASCIIDOC git-daemon.html
ASCIIDOC git-describe.html
ASCIIDOC git-diff-files.html
ASCIIDOC git-diff-index.html
ASCIIDOC git-diff-tree.html
ASCIIDOC git-diff.html
ASCIIDOC git-difftool.html
ASCIIDOC git-fast-export.html
ASCIIDOC git-fast-import.html
ASCIIDOC git-fetch-pack.html
ASCIIDOC git-fetch.html
ASCIIDOC git-filter-branch.html
WARNING: git-filter-branch.txt: line 369: nested inline passthrough
ASCIIDOC git-fmt-merge-msg.html
ASCIIDOC git-for-each-ref.html
ASCIIDOC git-format-patch.html
ASCIIDOC git-fsck-objects.html
ASCIIDOC git-fsck.html
ASCIIDOC git-gc.html
ASCIIDOC git-get-tar-commit-id.html
ASCIIDOC git-grep.html
ASCIIDOC git-gui.html
ASCIIDOC git-hash-object.html
ASCIIDOC git-help.html
ASCIIDOC git-http-fetch.html
ASCIIDOC git-http-push.html
ASCIIDOC git-imap-send.html
ASCIIDOC git-index-pack.html
ASCIIDOC git-init-db.html
ASCIIDOC git-init.html
ASCIIDOC git-instaweb.html
ASCIIDOC git-log.html
ASCIIDOC git-lost-found.html
ASCIIDOC git-ls-files.html
ASCIIDOC git-ls-remote.html
ASCIIDOC git-ls-tree.html
ASCIIDOC git-mailinfo.html
ASCIIDOC git-mailsplit.html
ASCIIDOC git-merge-base.html
ASCIIDOC git-merge-file.html
ASCIIDOC git-merge-index.html
ASCIIDOC git-merge-one-file.html
ASCIIDOC git-merge-tree.html
ASCIIDOC git-merge.html
ASCIIDOC git-mergetool--lib.html
ASCIIDOC git-mergetool.html
ASCIIDOC git-mktag.html
ASCIIDOC git-mktree.html
ASCIIDOC git-mv.html
ASCIIDOC git-name-rev.html
ASCIIDOC git-pack-objects.html
ASCIIDOC git-pack-redundant.html
ASCIIDOC git-pack-refs.html
ASCIIDOC git-parse-remote.html
ASCIIDOC git-patch-id.html
ASCIIDOC git-peek-remote.html
ASCIIDOC git-prune-packed.html
ASCIIDOC git-prune.html
ASCIIDOC git-pull.html
ASCIIDOC git-push.html
ASCIIDOC git-quiltimport.html
ASCIIDOC git-read-tree.html
ASCIIDOC git-rebase.html
ASCIIDOC git-receive-pack.html
ASCIIDOC git-reflog.html
ASCIIDOC git-relink.html
ASCIIDOC git-remote.html
ASCIIDOC git-repack.html
ASCIIDOC git-repo-config.html
ASCIIDOC git-request-pull.html
ASCIIDOC git-rerere.html
ASCIIDOC git-reset.html
ASCIIDOC git-rev-list.html
ASCIIDOC git-rev-parse.html
ASCIIDOC git-revert.html
ASCIIDOC git-rm.html
ASCIIDOC git-send-email.html
ASCIIDOC git-send-pack.html
ASCIIDOC git-sh-setup.html
ASCIIDOC git-shell.html
ASCIIDOC git-shortlog.html
ASCIIDOC git-show-branch.html
ASCIIDOC git-show-index.html
ASCIIDOC git-show-ref.html
ASCIIDOC git-show.html
ASCIIDOC git-stage.html
ASCIIDOC git-stash.html
ASCIIDOC git-status.html
ASCIIDOC git-stripspace.html
ASCIIDOC git-submodule.html
ASCIIDOC git-svn.html
ASCIIDOC git-symbolic-ref.html
ASCIIDOC git-tag.html
ASCIIDOC git-tar-tree.html
ASCIIDOC git-unpack-file.html
ASCIIDOC git-unpack-objects.html
ASCIIDOC git-update-index.html
ASCIIDOC git-update-ref.html
ASCIIDOC git-update-server-info.html
ASCIIDOC git-upload-archive.html
ASCIIDOC git-upload-pack.html
ASCIIDOC git-var.html
ASCIIDOC git-verify-pack.html
ASCIIDOC git-verify-tag.html
ASCIIDOC git-web--browse.html
ASCIIDOC git-whatchanged.html
ASCIIDOC git-write-tree.html
ASCIIDOC gitk.html
ASCIIDOC git.html
ASCIIDOC gitattributes.html
ASCIIDOC gitignore.html
ASCIIDOC gitmodules.html
ASCIIDOC githooks.html
ASCIIDOC gitrepository-layout.html
ASCIIDOC gitcli.html
ASCIIDOC gittutorial.html
ASCIIDOC gittutorial-2.html
ASCIIDOC gitcvs-migration.html
ASCIIDOC gitcore-tutorial.html
ASCIIDOC gitglossary.html
ASCIIDOC gitdiffcore.html
ASCIIDOC gitworkflows.html
GEN howto-index.txt
ASCIIDOC howto-index.html
ASCIIDOC everyday.html
ASCIIDOC git-tools.html
ASCIIDOC howto/revert-branch-rebase.html
ASCIIDOC howto/using-merge-subtree.html
ASCIIDOC user-manual.xml
XSLTPROC user-manual.html
ASCIIDOC technical/api-allocation-growing.html
ASCIIDOC technical/api-builtin.html
ASCIIDOC technical/api-decorate.html
ASCIIDOC technical/api-diff.html
ASCIIDOC technical/api-directory-listing.html
ASCIIDOC technical/api-gitattributes.html
ASCIIDOC technical/api-grep.html
ASCIIDOC technical/api-hash.html
ASCIIDOC technical/api-history-graph.html
ASCIIDOC technical/api-in-core-index.html
ASCIIDOC technical/api-lockfile.html
ASCIIDOC technical/api-object-access.html
ASCIIDOC technical/api-parse-options.html
ASCIIDOC technical/api-quote.html
ASCIIDOC technical/api-remote.html
ASCIIDOC technical/api-revision-walking.html
ASCIIDOC technical/api-run-command.html
ASCIIDOC technical/api-setup.html
ASCIIDOC technical/api-strbuf.html
ASCIIDOC technical/api-string-list.html
ASCIIDOC technical/api-tree-walking.html
ASCIIDOC technical/api-xdiff-interface.html
GEN technical/api-index.txt
ASCIIDOC technical/api-index.html
make[1]: Leaving directory `/build/buildd/git-core-1.6.3.3/Documentation'
touch build-indep-stamp
gcc -v
Using built-in specs.
Target: ia64-linux-gnu
Configured with: ../src/configure -v --with-pkgversion='Ubuntu 4.4.1-4ubuntu7' --with-bugurl=file:///usr/share/doc/gcc-4.4/README.Bugs --enable-languages=c,c++,fortran,objc,obj-c++ --prefix=/usr --enable-shared --enable-multiarch --enable-linker-build-id --with-system-zlib --libexecdir=/usr/lib --without-included-gettext --enable-threads=posix --with-gxx-include-dir=/usr/include/c++/4.4 --program-suffix=-4.4 --enable-nls --enable-clocale=gnu --enable-libstdcxx-debug --disable-libssp --enable-mpfr --enable-objc-gc --disable-werror --with-system-libunwind --enable-checking=release --build=ia64-linux-gnu --host=ia64-linux-gnu --target=ia64-linux-gnu
Thread model: posix
gcc version 4.4.1 (Ubuntu 4.4.1-4ubuntu7)
DESTDIR='/build/buildd/git-core-1.6.3.3/debian/git'-core /usr/bin/make all \
CC='gcc' CFLAGS='-g -Wall -O2' NO_OPENSSL=1 prefix=/usr gitexecdir=/usr/lib/git-core mandir=/usr/share/man INSTALLDIRS=vendor WITH_P4IMPORT=1 PYTHON_PATH=/usr/bin/python TCLTK_PATH=/usr/bin/wish THREADED_DELTA_SEARCH=1 NO_CROSS_DIRECTORY_HARDLINKS=1
make[1]: Entering directory `/build/buildd/git-core-1.6.3.3'
* new build flags or prefix
CC fast-import.o
fast-import.c: In function 'validate_raw_date':
fast-import.c:1750: warning: ignoring return value of 'strtoul', declared with attribute warn_unused_result
fast-import.c:1758: warning: ignoring return value of 'strtoul', declared with attribute warn_unused_result
CC abspath.o
CC alias.o
CC alloc.o
CC archive.o
CC archive-tar.o
CC archive-zip.o
CC attr.o
CC base85.o
CC bisect.o
CC blob.o
CC branch.o
CC bundle.o
CC cache-tree.o
CC color.o
CC combine-diff.o
CC commit.o
CC config.o
CC connect.o
CC convert.o
CC copy.o
CC csum-file.o
CC ctype.o
CC date.o
CC decorate.o
CC diffcore-break.o
CC diffcore-delta.o
CC diffcore-order.o
CC diffcore-pickaxe.o
CC diffcore-rename.o
CC diff-delta.o
CC diff-lib.o
CC diff-no-index.o
CC diff.o
CC dir.o
CC editor.o
CC entry.o
CC environment.o
CC exec_cmd.o
CC fsck.o
CC graph.o
CC grep.o
CC hash.o
CC help.o
CC ident.o
CC levenshtein.o
CC list-objects.o
CC ll-merge.o
CC lockfile.o
CC log-tree.o
CC mailmap.o
CC match-trees.o
CC merge-file.o
CC merge-recursive.o
CC name-hash.o
CC object.o
CC pack-check.o
CC pack-refs.o
CC pack-revindex.o
CC pack-write.o
CC pager.o
CC parse-options.o
CC patch-delta.o
CC patch-ids.o
CC path.o
CC pkt-line.o
CC preload-index.o
CC pretty.o
CC progress.o
CC quote.o
CC reachable.o
CC read-cache.o
CC reflog-walk.o
CC refs.o
CC remote.o
CC rerere.o
CC revision.o
CC run-command.o
CC server-info.o
CC setup.o
CC sha1-lookup.o
CC sha1_file.o
CC sha1_name.o
CC shallow.o
CC sideband.o
CC sigchain.o
CC strbuf.o
CC string-list.o
CC symlinks.o
CC tag.o
CC trace.o
CC transport.o
CC tree-diff.o
CC tree.o
CC tree-walk.o
CC unpack-trees.o
CC usage.o
CC userdiff.o
CC utf8.o
CC walker.o
CC wrapper.o
CC write_or_die.o
CC ws.o
CC wt-status.o
CC xdiff-interface.o
CC http.o
CC http-walker.o
http-walker.c: In function 'start_object_request':
http-walker.c:191: warning: ignoring return value of 'ftruncate', declared with attribute warn_unused_result
CC mozilla-sha1/sha1.o
CC thread-utils.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
CC xdiff/xpatience.o
AR xdiff/lib.a
LINK git-fast-import
GEN common-cmds.h
CC git.o
CC builtin-add.o
CC builtin-annotate.o
CC builtin-apply.o
CC builtin-archive.o
CC builtin-bisect--helper.o
CC builtin-blame.o
CC builtin-branch.o
CC builtin-bundle.o
CC builtin-cat-file.o
CC builtin-check-attr.o
CC builtin-check-ref-format.o
CC builtin-checkout-index.o
CC builtin-checkout.o
CC builtin-clean.o
CC builtin-clone.o
CC builtin-commit-tree.o
CC builtin-commit.o
CC builtin-config.o
CC builtin-count-objects.o
CC builtin-describe.o
CC builtin-diff-files.o
CC builtin-diff-index.o
CC builtin-diff-tree.o
CC builtin-diff.o
CC builtin-fast-export.o
CC builtin-fetch--tool.o
CC builtin-fetch-pack.o
CC builtin-fetch.o
CC builtin-fmt-merge-msg.o
CC builtin-for-each-ref.o
CC builtin-fsck.o
CC builtin-gc.o
CC builtin-grep.o
CC builtin-help.o
CC builtin-init-db.o
CC builtin-log.o
CC builtin-ls-files.o
CC builtin-ls-remote.o
CC builtin-ls-tree.o
CC builtin-mailinfo.o
CC builtin-mailsplit.o
CC builtin-merge.o
CC builtin-merge-base.o
CC builtin-merge-file.o
CC builtin-merge-ours.o
CC builtin-merge-recursive.o
CC builtin-mv.o
CC builtin-name-rev.o
CC builtin-pack-objects.o
CC builtin-pack-refs.o
CC builtin-prune-packed.o
CC builtin-prune.o
CC builtin-push.o
CC builtin-read-tree.o
CC builtin-receive-pack.o
CC builtin-reflog.o
CC builtin-remote.o
CC builtin-rerere.o
CC builtin-reset.o
CC builtin-rev-list.o
CC builtin-rev-parse.o
CC builtin-revert.o
CC builtin-rm.o
CC builtin-send-pack.o
CC builtin-shortlog.o
CC builtin-show-branch.o
CC builtin-show-ref.o
CC builtin-stripspace.o
CC builtin-symbolic-ref.o
CC builtin-tag.o
CC builtin-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-http-fetch.o
LINK git
BUILTIN git-fetch-pack
CC hash-object.o
LINK git-hash-object
CC index-pack.o
LINK git-index-pack
CC merge-index.o
LINK git-merge-index
CC merge-tree.o
LINK git-merge-tree
CC mktag.o
LINK git-mktag
CC mktree.o
LINK git-mktree
CC pack-redundant.o
LINK git-pack-redundant
CC patch-id.o
LINK git-patch-id
BUILTIN git-send-pack
CC shell.o
LINK git-shell
CC show-index.o
LINK git-show-index
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 var.o
LINK git-var
CC http-push.o
http-push.c: In function 'start_fetch_loose':
http-push.c:386: warning: ignoring return value of 'ftruncate', declared with attribute warn_unused_result
LINK git-http-push
CC daemon.o
LINK git-daemon
CC imap-send.o
LINK git-imap-send
GEN git-am
GEN git-bisect
GEN git-difftool--helper
GEN git-filter-branch
GEN git-lost-found
GEN git-merge-octopus
GEN git-merge-one-file
GEN git-merge-resolve
GEN git-mergetool
GEN git-mergetool--lib
GEN git-parse-remote
GEN git-pull
GEN git-quiltimport
GEN git-rebase--interactive
GEN git-rebase
GEN git-repack
GEN git-request-pull
GEN git-sh-setup
GEN git-stash
GEN git-submodule
GEN git-web--browse
make[2]: Entering directory `/build/buildd/git-core-1.6.3.3/perl'
/usr/bin/perl Makefile.PL PREFIX='/usr'
Writing perl.mak for Git
make[2]: Leaving directory `/build/buildd/git-core-1.6.3.3/perl'
GEN git-add--interactive
GEN git-difftool
GEN git-archimport
GEN git-cvsexportcommit
GEN git-cvsimport
GEN git-cvsserver
GEN git-relink
GEN git-send-email
GEN git-svn
GEN gitweb/gitweb.cgi
GEN git-instaweb
BUILTIN git-add
BUILTIN git-annotate
BUILTIN git-apply
BUILTIN git-archive
BUILTIN git-bisect--helper
BUILTIN git-blame
BUILTIN git-branch
BUILTIN git-bundle
BUILTIN git-cat-file
BUILTIN git-check-attr
BUILTIN git-check-ref-format
BUILTIN git-checkout-index
BUILTIN git-checkout
BUILTIN git-clean
BUILTIN git-clone
BUILTIN git-commit-tree
BUILTIN git-commit
BUILTIN git-config
BUILTIN git-count-objects
BUILTIN git-describe
BUILTIN git-diff-files
BUILTIN git-diff-index
BUILTIN git-diff-tree
BUILTIN git-diff
BUILTIN git-fast-export
BUILTIN git-fetch--tool
BUILTIN git-fetch
BUILTIN git-fmt-merge-msg
BUILTIN git-for-each-ref
BUILTIN git-fsck
BUILTIN git-gc
BUILTIN git-grep
BUILTIN git-help
BUILTIN git-init-db
BUILTIN git-log
BUILTIN git-ls-files
BUILTIN git-ls-remote
BUILTIN git-ls-tree
BUILTIN git-mailinfo
BUILTIN git-mailsplit
BUILTIN git-merge
BUILTIN git-merge-base
BUILTIN git-merge-file
BUILTIN git-merge-ours
BUILTIN git-merge-recursive
BUILTIN git-mv
BUILTIN git-name-rev
BUILTIN git-pack-objects
BUILTIN git-pack-refs
BUILTIN git-prune-packed
BUILTIN git-prune
BUILTIN git-push
BUILTIN git-read-tree
BUILTIN git-receive-pack
BUILTIN git-reflog
BUILTIN git-remote
BUILTIN git-rerere
BUILTIN git-reset
BUILTIN git-rev-list
BUILTIN git-rev-parse
BUILTIN git-revert
BUILTIN git-rm
BUILTIN git-shortlog
BUILTIN git-show-branch
BUILTIN git-show-ref
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-http-fetch
BUILTIN git-cherry
BUILTIN git-cherry-pick
BUILTIN git-format-patch
BUILTIN git-fsck-objects
BUILTIN git-get-tar-commit-id
BUILTIN git-init
BUILTIN git-merge-subtree
BUILTIN git-peek-remote
BUILTIN git-repo-config
BUILTIN git-show
BUILTIN git-stage
BUILTIN git-status
BUILTIN git-whatchanged
make[2]: Entering directory `/build/buildd/git-core-1.6.3.3/git-gui'
GITGUI_VERSION = 0.12.0.23.ga91be
make[2]: Leaving directory `/build/buildd/git-core-1.6.3.3/git-gui'
make[2]: Entering directory `/build/buildd/git-core-1.6.3.3/git-gui'
* new locations or Tcl/Tk interpreter
GEN git-gui
INDEX lib/
MSGFMT po/de.msg 514 translated.
MSGFMT po/fr.msg 513 translated.
MSGFMT po/hu.msg 514 translated.
MSGFMT po/it.msg 513 translated, 1 untranslated.
MSGFMT po/ja.msg 514 translated.
MSGFMT po/nb.msg 474 translated, 39 untranslated.
MSGFMT po/ru.msg 512 translated, 2 untranslated.
MSGFMT po/sv.msg 514 translated.
MSGFMT po/zh_cn.msg 366 translated, 7 fuzzy, 17 untranslated.
make[2]: Leaving directory `/build/buildd/git-core-1.6.3.3/git-gui'
make[2]: Entering directory `/build/buildd/git-core-1.6.3.3/gitk-git'
GEN gitk-wish
Generating catalog po/de.msg
msgfmt --statistics --tcl po/de.po -l de -d po/
245 translated messages.
Generating catalog po/es.msg
msgfmt --statistics --tcl po/es.po -l es -d po/
200 translated messages, 7 untranslated messages.
Generating catalog po/it.msg
msgfmt --statistics --tcl po/it.po -l it -d po/
197 translated messages, 11 untranslated messages.
Generating catalog po/ru.msg
msgfmt --statistics --tcl po/ru.po -l ru -d po/
245 translated messages.
Generating catalog po/sv.msg
msgfmt --statistics --tcl po/sv.po -l sv -d po/
208 translated messages, 2 untranslated messages.
make[2]: Leaving directory `/build/buildd/git-core-1.6.3.3/gitk-git'
make[2]: Entering directory `/build/buildd/git-core-1.6.3.3/perl'
make[3]: Entering directory `/build/buildd/git-core-1.6.3.3/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.6.3.3/perl'
make[2]: Leaving directory `/build/buildd/git-core-1.6.3.3/perl'
make[2]: Entering directory `/build/buildd/git-core-1.6.3.3/templates'
make[2]: Leaving directory `/build/buildd/git-core-1.6.3.3/templates'
CC test-chmtime.o
LINK test-chmtime
CC test-ctype.o
LINK test-ctype
CC test-date.o
LINK test-date
CC test-delta.o
LINK test-delta
CC test-dump-cache-tree.o
LINK test-dump-cache-tree
CC test-genrandom.o
LINK test-genrandom
CC test-match-trees.o
LINK test-match-trees
CC test-parse-options.o
LINK test-parse-options
CC test-path-utils.o
LINK test-path-utils
CC test-sha1.o
LINK test-sha1
CC test-sigchain.o
LINK test-sigchain
make[1]: Leaving directory `/build/buildd/git-core-1.6.3.3'
test -z 'test' || \
DESTDIR='/build/buildd/git-core-1.6.3.3/debian/git'-core /usr/bin/make test \
CC='gcc' CFLAGS='-g -Wall -O2' NO_OPENSSL=1 prefix=/usr gitexecdir=/usr/lib/git-core mandir=/usr/share/man INSTALLDIRS=vendor WITH_P4IMPORT=1 PYTHON_PATH=/usr/bin/python TCLTK_PATH=/usr/bin/wish THREADED_DELTA_SEARCH=1 NO_CROSS_DIRECTORY_HARDLINKS=1 || \
GIT_TEST_OPTS=--verbose DESTDIR='/build/buildd/git-core-1.6.3.3/debian/git'-core /usr/bin/make test \
CC='gcc' CFLAGS='-g -Wall -O2' NO_OPENSSL=1 prefix=/usr gitexecdir=/usr/lib/git-core mandir=/usr/share/man INSTALLDIRS=vendor WITH_P4IMPORT=1 PYTHON_PATH=/usr/bin/python TCLTK_PATH=/usr/bin/wish THREADED_DELTA_SEARCH=1 NO_CROSS_DIRECTORY_HARDLINKS=1
make[1]: Entering directory `/build/buildd/git-core-1.6.3.3'
make[2]: Entering directory `/build/buildd/git-core-1.6.3.3/git-gui'
make[2]: Leaving directory `/build/buildd/git-core-1.6.3.3/git-gui'
make[2]: Entering directory `/build/buildd/git-core-1.6.3.3/gitk-git'
make[2]: Nothing to be done for `all'.
make[2]: Leaving directory `/build/buildd/git-core-1.6.3.3/gitk-git'
make[2]: Entering directory `/build/buildd/git-core-1.6.3.3/perl'
make[3]: Entering directory `/build/buildd/git-core-1.6.3.3/perl'
make[3]: Leaving directory `/build/buildd/git-core-1.6.3.3/perl'
make[2]: Leaving directory `/build/buildd/git-core-1.6.3.3/perl'
make[2]: Entering directory `/build/buildd/git-core-1.6.3.3/templates'
make[2]: Leaving directory `/build/buildd/git-core-1.6.3.3/templates'
/usr/bin/make -C t/ all
make[2]: Entering directory `/build/buildd/git-core-1.6.3.3/t'
rm -f -r test-results
/usr/bin/make aggregate-results-and-cleanup
make[3]: Entering directory `/build/buildd/git-core-1.6.3.3/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: success is reported like this
* still broken 4: pretend we have a known breakage
* FIXED 5: pretend we have fixed a known breakage
* ok 6: test runs if prerequisite is satisfied
* skip 7: unmet prerequisite causes test to be skipped
* ok 8: git update-index without --add should fail adding.
* ok 9: git update-index with --add should succeed.
* ok 10: writing tree out with git write-tree
* ok 11: validate object ID of a known tree.
* ok 12: git update-index without --remove should fail removing.
* ok 13: git update-index with --remove should be able to remove.
* ok 14: git write-tree should be able to write an empty tree.
* ok 15: validate object ID of a known tree.
* ok 16: adding various types of objects with git update-index --add.
* ok 17: showing stage with git ls-files --stage
* ok 18: validate git ls-files output for a known tree.
* ok 19: writing tree out with git write-tree.
* ok 20: validate object ID for a known tree.
* ok 21: showing tree with git ls-tree
* ok 22: git ls-tree output for a known tree.
* ok 23: showing tree with git ls-tree -r
* ok 24: git ls-tree -r output for a known tree.
* ok 25: showing tree with git ls-tree -r -t
* ok 26: git ls-tree -r output for a known tree.
* ok 27: writing partial tree out with git write-tree --prefix.
* ok 28: validate object ID for a known tree.
* ok 29: writing partial tree out with git write-tree --prefix.
* ok 30: validate object ID for a known tree.
* ok 31: put invalid objects into the index.
* ok 32: writing this tree without --missing-ok.
* ok 33: writing this tree with --missing-ok.
* ok 34: git read-tree followed by write-tree should be idempotent.
* ok 35: validate git diff-files output for a know cache/work tree state.
* ok 36: git update-index --refresh should succeed.
* ok 37: no diff after checkout and git update-index --refresh.
* ok 38: git commit-tree records the correct tree in a commit.
* ok 39: git commit-tree records the correct parent in a commit.
* ok 40: git commit-tree omits duplicated parent in a commit.
* ok 41: update-index D/F conflict
* ok 42: absolute path works as expected
* ok 43: very long name in the index handled sanely
* fixed 1 known breakage(s)
* still have 1 known breakage(s)
* passed all remaining 42 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: init --bare
* ok 7: GIT_DIR non-bare
* ok 8: GIT_DIR & GIT_WORK_TREE (1)
* ok 9: GIT_DIR & GIT_WORK_TREE (2)
* ok 10: reinit
* ok 11: init with --template
* ok 12: init with --template (blank)
* ok 13: init --bare/--shared overrides system/global config
* ok 14: init honors global core.sharedRepository
* ok 15: init rejects insanely long --template
* passed all 15 test(s)
*** t0002-gitfile.sh ***
* ok 1: initial setup
* ok 2: bad setup: invalid .git file format
* ok 3: bad setup: invalid .git file path
* ok 4: final setup + check rev-parse --git-dir
* ok 5: check hash-object
* ok 6: check cat-file
* ok 7: check update-index
* ok 8: check write-tree
* ok 9: check commit-tree
* ok 10: check rev-list
* passed all 10 test(s)
*** t0003-attributes.sh ***
* ok 1: setup
* ok 2: attribute test
* ok 3: attribute test: read paths from stdin
* ok 4: root subdir attribute test
* ok 5: setup bare
* ok 6: bare repository: check that .gitattribute is ignored
* ok 7: bare repository: test info/attributes
* passed all 7 test(s)
*** t0004-unwritable.sh ***
* ok 1: setup
* ok 2: write-tree should notice unwritable repository
* ok 3: commit should notice unwritable repository
* ok 4: update-index should notice unwritable repository
* ok 5: add should notice unwritable repository
* passed all 5 test(s)
*** t0005-signals.sh ***
* ok 1: sigchain works
* passed all 1 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: safecrlf: autocrlf=input, all CRLF
* ok 3: safecrlf: autocrlf=input, mixed LF/CRLF
* ok 4: safecrlf: autocrlf=true, all LF
* ok 5: safecrlf: autocrlf=true mixed LF/CRLF
* ok 6: safecrlf: print warning only once
* ok 7: switch off autocrlf, safecrlf, reset HEAD
* ok 8: update with autocrlf=input
* ok 9: update with autocrlf=true
* ok 10: checkout with autocrlf=true
* ok 11: checkout with autocrlf=input
* ok 12: apply patch (autocrlf=input)
* ok 13: apply patch --cached (autocrlf=input)
* ok 14: apply patch --index (autocrlf=input)
* ok 15: apply patch (autocrlf=true)
* ok 16: apply patch --cached (autocrlf=true)
* ok 17: apply patch --index (autocrlf=true)
* ok 18: .gitattributes says two is binary
* ok 19: .gitattributes says two is input
* ok 20: .gitattributes says two and three are text
* ok 21: in-tree .gitattributes (1)
* ok 22: in-tree .gitattributes (2)
* ok 23: in-tree .gitattributes (3)
* ok 24: in-tree .gitattributes (4)
* ok 25: checkout with existing .gitattributes
* ok 26: checkout when deleting .gitattributes
* ok 27: invalid .gitattributes (must not crash)
* passed all 27 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)
*** t0024-crlf-archive.sh ***
* ok 1: setup
* ok 2: tar archive
* ok 3: zip archive
* passed all 3 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)
*** t0040-parse-options.sh ***
* ok 1: test help
* ok 2: short options
* ok 3: long options
* ok 4: missing required value
* ok 5: intermingled arguments
* ok 6: unambiguously abbreviated option
* ok 7: unambiguously abbreviated option with "="
* ok 8: ambiguously abbreviated option
* ok 9: non ambiguous option (after two options it abbreviates)
* ok 10: detect possible typos
* ok 11: keep some options as arguments
* ok 12: OPT_DATE() and OPT_SET_PTR() work
* ok 13: OPT_CALLBACK() and OPT_BIT() work
* ok 14: OPT_CALLBACK() and callback errors work
* ok 15: OPT_BIT() and OPT_SET_INT() work
* passed all 15 test(s)
*** t0050-filesystem.sh ***
* ok 1: see what we expect
* ok 2: detection of case insensitive filesystem during repo init
* ok 3: detection of filesystem w/o symlink support during repo init
* ok 4: setup case tests
* ok 5: rename (case change)
* ok 6: merge (case change)
* ok 7: add (with different case)
* ok 8: setup unicode normalization tests
* ok 9: rename (silent unicode normalization)
* ok 10: merge (silent unicode normalization)
* passed all 10 test(s)
*** t0055-beyond-symlinks.sh ***
* ok 1: setup
* ok 2: update-index --add beyond symlinks
* ok 3: add beyond symlinks
* passed all 3 test(s)
*** t0060-path-utils.sh ***
* ok 1: normalize path: =>
* ok 2: normalize path: . =>
* ok 3: normalize path: ./ =>
* ok 4: normalize path: ./. =>
* ok 5: normalize path: ./.. => ++failed++
* ok 6: normalize path: ../. => ++failed++
* ok 7: normalize path: ./../.// => ++failed++
* ok 8: normalize path: dir/.. =>
* ok 9: normalize path: dir/sub/../.. =>
* ok 10: normalize path: dir/sub/../../.. => ++failed++
* ok 11: normalize path: dir => dir
* ok 12: normalize path: dir// => dir/
* ok 13: normalize path: ./dir => dir
* ok 14: normalize path: dir/. => dir/
* ok 15: normalize path: dir///./ => dir/
* ok 16: normalize path: dir//sub/.. => dir/
* ok 17: normalize path: dir/sub/../ => dir/
* ok 18: normalize path: dir/sub/../. => dir/
* ok 19: normalize path: dir/s1/../s2/ => dir/s2/
* ok 20: normalize path: d1/s1///s2/..//../s3/ => d1/s3/
* ok 21: normalize path: d1/s1//../s2/../../d2 => d2
* ok 22: normalize path: d1/.../d2 => d1/.../d2
* ok 23: normalize path: d1/..././../d2 => d1/d2
* ok 24: normalize path: / => /
* ok 25: normalize path: // => /
* ok 26: normalize path: /// => /
* ok 27: normalize path: /. => /
* ok 28: normalize path: /./ => /
* ok 29: normalize path: /./.. => ++failed++
* ok 30: normalize path: /../. => ++failed++
* ok 31: normalize path: /./../.// => ++failed++
* ok 32: normalize path: /dir/.. => /
* ok 33: normalize path: /dir/sub/../.. => /
* ok 34: normalize path: /dir/sub/../../.. => ++failed++
* ok 35: normalize path: /dir => /dir
* ok 36: normalize path: /dir// => /dir/
* ok 37: normalize path: /./dir => /dir
* ok 38: normalize path: /dir/. => /dir/
* ok 39: normalize path: /dir///./ => /dir/
* ok 40: normalize path: /dir//sub/.. => /dir/
* ok 41: normalize path: /dir/sub/../ => /dir/
* ok 42: normalize path: //dir/sub/../. => /dir/
* ok 43: normalize path: /dir/s1/../s2/ => /dir/s2/
* ok 44: normalize path: /d1/s1///s2/..//../s3/ => /d1/s3/
* ok 45: normalize path: /d1/s1//../s2/../../d2 => /d2
* ok 46: normalize path: /d1/.../d2 => /d1/.../d2
* ok 47: normalize path: /d1/..././../d2 => /d1/d2
* ok 48: longest ancestor: / => -1
* ok 49: longest ancestor: / / => -1
* ok 50: longest ancestor: /foo => -1
* ok 51: longest ancestor: /foo : => -1
* ok 52: longest ancestor: /foo ::. => -1
* ok 53: longest ancestor: /foo ::..:: => -1
* ok 54: longest ancestor: /foo / => 0
* ok 55: longest ancestor: /foo /fo => -1
* ok 56: longest ancestor: /foo /foo => -1
* ok 57: longest ancestor: /foo /foo/ => -1
* ok 58: longest ancestor: /foo /bar => -1
* ok 59: longest ancestor: /foo /bar/ => -1
* ok 60: longest ancestor: /foo /foo/bar => -1
* ok 61: longest ancestor: /foo /foo:/bar/ => -1
* ok 62: longest ancestor: /foo /foo/:/bar/ => -1
* ok 63: longest ancestor: /foo /foo::/bar/ => -1
* ok 64: longest ancestor: /foo /:/foo:/bar/ => 0
* ok 65: longest ancestor: /foo /foo:/:/bar/ => 0
* ok 66: longest ancestor: /foo /:/bar/:/foo => 0
* ok 67: longest ancestor: /foo/bar => -1
* ok 68: longest ancestor: /foo/bar / => 0
* ok 69: longest ancestor: /foo/bar /fo => -1
* ok 70: longest ancestor: /foo/bar foo => -1
* ok 71: longest ancestor: /foo/bar /foo => 4
* ok 72: longest ancestor: /foo/bar /foo/ => 4
* ok 73: longest ancestor: /foo/bar /foo/ba => -1
* ok 74: longest ancestor: /foo/bar /:/fo => 0
* ok 75: longest ancestor: /foo/bar /foo:/foo/ba => 4
* ok 76: longest ancestor: /foo/bar /bar => -1
* ok 77: longest ancestor: /foo/bar /bar/ => -1
* ok 78: longest ancestor: /foo/bar /fo: => -1
* ok 79: longest ancestor: /foo/bar :/fo => -1
* ok 80: longest ancestor: /foo/bar /foo:/bar/ => 4
* ok 81: longest ancestor: /foo/bar /:/foo:/bar/ => 4
* ok 82: longest ancestor: /foo/bar /foo:/:/bar/ => 4
* ok 83: longest ancestor: /foo/bar /:/bar/:/fo => 0
* ok 84: longest ancestor: /foo/bar /:/bar/ => 0
* ok 85: longest ancestor: /foo/bar .:/foo/. => 4
* ok 86: longest ancestor: /foo/bar .:/foo/.:.: => 4
* ok 87: longest ancestor: /foo/bar /foo/./:.:/bar => 4
* ok 88: longest ancestor: /foo/bar .:/bar => -1
* ok 89: strip_path_suffix
* passed all 89 test(s)
*** t0070-fundamental.sh ***
* ok 1: character classes (isspace, isalpha etc.)
* passed all 1 test(s)
*** t0100-previous.sh ***
* ok 1: branch -d @{-1}
* ok 2: branch -d @{-12} when there is not enough switches yet
* ok 3: merge @{-1}
* ok 4: merge @{-1} when there is not enough switches yet
* passed all 4 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
* FAIL 3: 4 - carry forward local addition.
rm -f .git/index &&
git read-tree $treeH &&
git checkout-index -u -f -q -a &&
git update-index --add yomin &&
read_tree_twoway $treeH $treeM &&
git ls-files --stage >4.out || return 1
git diff --no-index M.out 4.out >4diff.out
compare_change 4diff.out expected &&
check_cache_at yomin clean
* FAIL 4: 5 - carry forward local addition.
rm -f .git/index &&
git read-tree $treeH &&
git checkout-index -u -f -q -a &&
echo yomin >yomin &&
git update-index --add yomin &&
echo yomin yomin >yomin &&
read_tree_twoway $treeH $treeM &&
git ls-files --stage >5.out || return 1
git diff --no-index M.out 5.out >5diff.out
compare_change 5diff.out expected &&
check_cache_at yomin dirty
* 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.
* ok 24: a/b (untracked) vs a case setup.
* ok 25: a/b (untracked) vs a, plus c/d case test.
* ok 26: a/b vs a, plus c/d case setup.
* ok 27: a/b vs a, plus c/d case test.
* failed 2 among 27 test(s)
make[3]: *** [t1001-read-tree-m-2way.sh] Error 1
make[3]: Leaving directory `/build/buildd/git-core-1.6.3.3/t'
make[2]: *** [all] Error 2
make[2]: Leaving directory `/build/buildd/git-core-1.6.3.3/t'
make[1]: *** [test] Error 2
make[1]: Leaving directory `/build/buildd/git-core-1.6.3.3'
make[1]: Entering directory `/build/buildd/git-core-1.6.3.3'
make[2]: Entering directory `/build/buildd/git-core-1.6.3.3/git-gui'
make[2]: Leaving directory `/build/buildd/git-core-1.6.3.3/git-gui'
make[2]: Entering directory `/build/buildd/git-core-1.6.3.3/gitk-git'
make[2]: Nothing to be done for `all'.
make[2]: Leaving directory `/build/buildd/git-core-1.6.3.3/gitk-git'
make[2]: Entering directory `/build/buildd/git-core-1.6.3.3/perl'
make[3]: Entering directory `/build/buildd/git-core-1.6.3.3/perl'
make[3]: Leaving directory `/build/buildd/git-core-1.6.3.3/perl'
make[2]: Leaving directory `/build/buildd/git-core-1.6.3.3/perl'
make[2]: Entering directory `/build/buildd/git-core-1.6.3.3/templates'
make[2]: Leaving directory `/build/buildd/git-core-1.6.3.3/templates'
/usr/bin/make -C t/ all
make[2]: Entering directory `/build/buildd/git-core-1.6.3.3/t'
rm -f -r test-results
/usr/bin/make aggregate-results-and-cleanup
make[3]: Entering directory `/build/buildd/git-core-1.6.3.3/t'
*** t0000-basic.sh ***
Initialized empty Git repository in /build/buildd/git-core-1.6.3.3/t/trash directory.t0000-basic/.git/
* expecting success: cmp -s /dev/null should-be-empty
* ok 1: .git/objects should be empty after git init in an empty repo.
* expecting success: test $(wc -l < full-of-directories) = 3
* ok 2: .git/objects should have 3 subdirectories.
* expecting success:
:
* ok 3: success is reported like this
* checking known breakage:
false
* still broken 4: pretend we have a known breakage
* checking known breakage:
:
* FIXED 5: pretend we have fixed a known breakage
* expecting success:
test_have_prereq HAVEIT &&
haveit=yes
* ok 6: test runs if prerequisite is satisfied
* skipping test: unmet prerequisite causes test to be skipped
donthaveit=no
* skip 7: unmet prerequisite causes test to be skipped
* expecting success:
test_must_fail git update-index should-be-empty
error: should-be-empty: cannot add to the index - missing --add option?
fatal: Unable to process path should-be-empty
* ok 8: git update-index without --add should fail adding.
* expecting success: git update-index --add should-be-empty
* ok 9: git update-index with --add should succeed.
* expecting success: tree=$(git write-tree)
* ok 10: writing tree out with git write-tree
* expecting success: test "$tree" = 7bb943559a305bdd6bdee2cef6e5df2413c3d30a
* ok 11: validate object ID of a known tree.
* expecting success:
test_must_fail git update-index should-be-empty
error: should-be-empty: does not exist and --remove not passed
fatal: Unable to process path should-be-empty
* ok 12: git update-index without --remove should fail removing.
* expecting success: git update-index --remove should-be-empty
* ok 13: git update-index with --remove should be able to remove.
* expecting success: tree=$(git write-tree)
* ok 14: git write-tree should be able to write an empty tree.
* expecting success: test "$tree" = 4b825dc642cb6eb9a060e54bf8d69288fbee4904
* ok 15: validate object ID of a known tree.
* expecting success: find path* ! -type d -print | xargs git update-index --add
* ok 16: adding various types of objects with git update-index --add.
* expecting success: git ls-files --stage >current
* ok 17: showing stage with git ls-files --stage
* expecting success: test_cmp expected current
* ok 18: validate git ls-files output for a known tree.
* expecting success: tree=$(git write-tree)
* ok 19: writing tree out with git write-tree.
* expecting success: test "$tree" = "$expectedtree"
* ok 20: validate object ID for a known tree.
* expecting success: git ls-tree $tree >current
* ok 21: showing tree with git ls-tree
* expecting success: test_cmp expected current
* ok 22: git ls-tree output for a known tree.
* expecting success: git ls-tree -r $tree >current
* ok 23: showing tree with git ls-tree -r
* expecting success: test_cmp expected current
* ok 24: git ls-tree -r output for a known tree.
* expecting success: git ls-tree -r -t $tree >current
* ok 25: showing tree with git ls-tree -r -t
* expecting success: test_cmp expected current
* ok 26: git ls-tree -r output for a known tree.
* expecting success: ptree=$(git write-tree --prefix=path3)
* ok 27: writing partial tree out with git write-tree --prefix.
* expecting success: test "$ptree" = "$expectedptree1"
* ok 28: validate object ID for a known tree.
* expecting success: ptree=$(git write-tree --prefix=path3/subp3)
* ok 29: writing partial tree out with git write-tree --prefix.
* expecting success: test "$ptree" = "$expectedptree2"
* ok 30: validate object ID for a known tree.
* expecting success: git update-index --index-info < badobjects
* ok 31: put invalid objects into the index.
* expecting success:
test_must_fail git write-tree
error: invalid object 1000000000000000000000000000000000000000
fatal: git-write-tree: error building trees
* ok 32: writing this tree without --missing-ok.
* expecting success: git write-tree --missing-ok
851a367613bb6e1f0b2b518323eafed530b5b4c4
* ok 33: writing this tree with --missing-ok.
* expecting success: git read-tree $tree &&
test -f .git/index &&
newtree=$(git write-tree) &&
test "$newtree" = "$tree"
* ok 34: git read-tree followed by write-tree should be idempotent.
* expecting success: git diff-files >current && diff >/dev/null -b current expected
* ok 35: validate git diff-files output for a know cache/work tree state.
* expecting success: git update-index --refresh
* ok 36: git update-index --refresh should succeed.
* expecting success: git diff-files >current && cmp -s current /dev/null
* ok 37: no diff after checkout and git update-index --refresh.
* expecting success: commit0=$(echo NO | git commit-tree $P) &&
tree=$(git show --pretty=raw $commit0 |
sed -n -e "s/^tree //p" -e "/^author /q") &&
test "z$tree" = "z$P"
* ok 38: git commit-tree records the correct tree in a commit.
* expecting success: commit1=$(echo NO | git commit-tree $P -p $commit0) &&
parent=$(git show --pretty=raw $commit1 |
sed -n -e "s/^parent //p" -e "/^author /q") &&
test "z$commit0" = "z$parent"
* ok 39: git commit-tree records the correct parent in a commit.
* expecting success: commit2=$(echo NO | git commit-tree $P -p $commit0 -p $commit0) &&
parent=$(git show --pretty=raw $commit2 |
sed -n -e "s/^parent //p" -e "/^author /q" |
sort -u) &&
test "z$commit0" = "z$parent" &&
numparent=$(git show --pretty=raw $commit2 |
sed -n -e "s/^parent //p" -e "/^author /q" |
wc -l) &&
test $numparent = 1
error: duplicate parent 474e1b464b28b0956cac180e89bd1f76ed10ae39 ignored
* ok 40: git commit-tree omits duplicated parent in a commit.
* expecting success:
mv path0 tmp &&
mv path2 path0 &&
mv tmp path2 &&
git update-index --add --replace path2 path0/file2 &&
numpath0=$(git ls-files path0 | wc -l) &&
test $numpath0 = 1
* ok 41: update-index D/F conflict
* expecting success:
mkdir first &&
ln -s ../.git first/.git &&
mkdir second &&
ln -s ../first second/other &&
mkdir third &&
dir="$(cd .git; pwd -P)" &&
dir2=third/../second/other/.git &&
test "$dir" = "$(test-path-utils make_absolute_path $dir2)" &&
file="$dir"/index &&
test "$file" = "$(test-path-utils make_absolute_path $dir2/index)" &&
basename=blub &&
test "$dir/$basename" = "$(cd .git && test-path-utils make_absolute_path "$basename")" &&
ln -s ../first/file .git/syml &&
sym="$(cd first; pwd -P)"/file &&
test "$sym" = "$(test-path-utils make_absolute_path "$dir2/syml")"
* ok 42: absolute path works as expected
* expecting success:
a=a && # 1
a=$a$a$a$a$a$a$a$a$a$a$a$a$a$a$a$a && # 16
a=$a$a$a$a$a$a$a$a$a$a$a$a$a$a$a$a && # 256
a=$a$a$a$a$a$a$a$a$a$a$a$a$a$a$a$a && # 4096
a=${a}q &&
>path4 &&
git update-index --add path4 &&
(
git ls-files -s path4 |
sed -e "s/ .*/ /" |
tr -d "
"
echo "$a"
) | git update-index --index-info &&
len=$(git ls-files "a*" | wc -c) &&
test $len = 4098
* ok 43: very long name in the index handled sanely
* fixed 1 known breakage(s)
* still have 1 known breakage(s)
* passed all remaining 42 test(s)
*** t0001-init.sh ***
Initialized empty Git repository in /build/buildd/git-core-1.6.3.3/t/trash directory.t0001-init/.git/
* expecting success:
(
unset GIT_DIR GIT_WORK_TREE
mkdir plain &&
cd plain &&
git init
) &&
check_config plain/.git false unset
Initialized empty Git repository in /build/buildd/git-core-1.6.3.3/t/trash directory.t0001-init/plain/.git/
* ok 1: plain
* expecting success:
if (
unset GIT_DIR
mkdir plain-wt &&
cd plain-wt &&
GIT_WORK_TREE=$(pwd) git init
)
then
echo Should have failed -- GIT_WORK_TREE should not be used
false
fi
fatal: GIT_WORK_TREE (or --work-tree=<directory>) not allowed without specifying GIT_DIR (or --git-dir=<directory>)
* ok 2: plain with GIT_WORK_TREE
* expecting success:
(
unset GIT_DIR GIT_WORK_TREE GIT_CONFIG
mkdir plain-bare-1 &&
cd plain-bare-1 &&
git --bare init
) &&
check_config plain-bare-1 true unset
Initialized empty Git repository in /build/buildd/git-core-1.6.3.3/t/trash directory.t0001-init/plain-bare-1/
* ok 3: plain bare
* expecting success:
if (
unset GIT_DIR GIT_CONFIG
mkdir plain-bare-2 &&
cd plain-bare-2 &&
GIT_WORK_TREE=$(pwd) git --bare init
)
then
echo Should have failed -- GIT_WORK_TREE should not be used
false
fi
fatal: GIT_WORK_TREE (or --work-tree=<directory>) not allowed without specifying GIT_DIR (or --git-dir=<directory>)
* ok 4: plain bare with GIT_WORK_TREE
* expecting success:
(
unset GIT_CONFIG
mkdir git-dir-bare.git &&
GIT_DIR=git-dir-bare.git git init
) &&
check_config git-dir-bare.git true unset
Initialized empty Git repository in /build/buildd/git-core-1.6.3.3/t/trash directory.t0001-init/git-dir-bare.git/
* ok 5: GIT_DIR bare
* expecting success:
(
unset GIT_DIR GIT_WORK_TREE GIT_CONFIG
mkdir init-bare.git &&
cd init-bare.git &&
git init --bare
) &&
check_config init-bare.git true unset
Initialized empty Git repository in /build/buildd/git-core-1.6.3.3/t/trash directory.t0001-init/init-bare.git/
* ok 6: init --bare
* expecting success:
(
unset GIT_CONFIG
mkdir non-bare &&
cd non-bare &&
GIT_DIR=.git git init
) &&
check_config non-bare/.git false unset
Initialized empty Git repository in /build/buildd/git-core-1.6.3.3/t/trash directory.t0001-init/non-bare/.git/
* ok 7: GIT_DIR non-bare
* expecting success:
(
unset GIT_CONFIG
mkdir git-dir-wt-1.git &&
GIT_WORK_TREE=$(pwd) GIT_DIR=git-dir-wt-1.git git init
) &&
check_config git-dir-wt-1.git false "$(pwd)"
Initialized empty Git repository in /build/buildd/git-core-1.6.3.3/t/trash directory.t0001-init/git-dir-wt-1.git/
* ok 8: GIT_DIR & GIT_WORK_TREE (1)
* expecting success:
if (
unset GIT_CONFIG
mkdir git-dir-wt-2.git &&
GIT_WORK_TREE=$(pwd) GIT_DIR=git-dir-wt-2.git git --bare init
)
then
echo Should have failed -- --bare should not be used
false
fi
fatal: GIT_WORK_TREE (or --work-tree=<directory>) not allowed without specifying GIT_DIR (or --git-dir=<directory>)
* ok 9: GIT_DIR & GIT_WORK_TREE (2)
* expecting success:
(
unset GIT_CONFIG GIT_WORK_TREE GIT_CONFIG
mkdir again &&
cd again &&
git init >out1 2>err1 &&
git init >out2 2>err2
) &&
grep "Initialized empty" again/out1 &&
grep "Reinitialized existing" again/out2 &&
>again/empty &&
test_cmp again/empty again/err1 &&
test_cmp again/empty again/err2
Initialized empty Git repository in /build/buildd/git-core-1.6.3.3/t/trash directory.t0001-init/again/.git/
Reinitialized existing Git repository in /build/buildd/git-core-1.6.3.3/t/trash directory.t0001-init/again/.git/
* ok 10: reinit
* expecting success:
mkdir template-source &&
echo content >template-source/file &&
(
mkdir template-custom &&
cd template-custom &&
git init --template=../template-source
) &&
test_cmp template-source/file template-custom/.git/file
Initialized empty Git repository in /build/buildd/git-core-1.6.3.3/t/trash directory.t0001-init/template-custom/.git/
* ok 11: init with --template
* expecting success:
(
mkdir template-plain &&
cd template-plain &&
git init
) &&
test -f template-plain/.git/info/exclude &&
(
mkdir template-blank &&
cd template-blank &&
git init --template=
) &&
! test -f template-blank/.git/info/exclude
Initialized empty Git repository in /build/buildd/git-core-1.6.3.3/t/trash directory.t0001-init/template-plain/.git/
Initialized empty Git repository in /build/buildd/git-core-1.6.3.3/t/trash directory.t0001-init/template-blank/.git/
* ok 12: init with --template (blank)
* expecting success:
(
HOME="`pwd`" &&
export HOME &&
test_config="$HOME"/.gitconfig &&
unset GIT_CONFIG_NOGLOBAL &&
git config -f "$test_config" core.bare false &&
git config -f "$test_config" core.sharedRepository 0640 &&
mkdir init-bare-shared-override &&
cd init-bare-shared-override &&
git init --bare --shared=0666
) &&
check_config init-bare-shared-override true unset &&
test x0666 = \
x`git config -f init-bare-shared-override/config core.sharedRepository`
Initialized empty shared Git repository in /build/buildd/git-core-1.6.3.3/t/trash directory.t0001-init/init-bare-shared-override/
* ok 13: init --bare/--shared overrides system/global config
* expecting success:
(
HOME="`pwd`" &&
export HOME &&
test_config="$HOME"/.gitconfig &&
unset GIT_CONFIG_NOGLOBAL &&
git config -f "$test_config" core.sharedRepository 0666 &&
mkdir shared-honor-global &&
cd shared-honor-global &&
git init
) &&
test x0666 = \
x`git config -f shared-honor-global/.git/config core.sharedRepository`
Initialized empty shared Git repository in /build/buildd/git-core-1.6.3.3/t/trash directory.t0001-init/shared-honor-global/.git/
* ok 14: init honors global core.sharedRepository
* expecting success:
(
insane=$(printf "x%09999dx" 1) &&
mkdir test &&
cd test &&
test_must_fail git init --template=$insane
)
fatal: insanely long template path x000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
0000000000000000000000000000000000000000
* ok 15: init rejects insanely long --template
* passed all 15 test(s)
*** t0002-gitfile.sh ***
Initialized empty Git repository in /build/buildd/git-core-1.6.3.3/t/trash directory.t0002-gitfile/.git/
* expecting success:
REAL="$(pwd)/.real" &&
mv .git "$REAL"
* ok 1: initial setup
* expecting success:
echo "gitdir $REAL" >.git &&
if git rev-parse 2>.err
then
echo "git rev-parse accepted an invalid .git file"
false
fi &&
if ! grep "Invalid gitfile format" .err
then
echo "git rev-parse returned wrong error"
false
fi
fatal: Invalid gitfile format: .git
* ok 2: bad setup: invalid .git file format
* expecting success:
echo "gitdir: $REAL.not" >.git &&
if git rev-parse 2>.err
then
echo "git rev-parse accepted an invalid .git file path"
false
fi &&
if ! grep "Not a git repository" .err
then
echo "git rev-parse returned wrong error"
false
fi
fatal: Not a git repository: /build/buildd/git-core-1.6.3.3/t/trash directory.t0002-gitfile/.real.not
* ok 3: bad setup: invalid .git file path
* expecting success:
echo "gitdir: $REAL" >.git &&
test "$REAL" = "$(git rev-parse --git-dir)"
* ok 4: final setup + check rev-parse --git-dir
* expecting success:
echo "foo" >bar &&
SHA=$(cat bar | git hash-object -w --stdin) &&
objck $SHA
* ok 5: check hash-object
* expecting success:
git cat-file blob $SHA >actual &&
test_cmp bar actual
* ok 6: check cat-file
* expecting success:
if test -f "$REAL/index"
then
echo "Hmm, $REAL/index exists?"
false
fi &&
rm -f "$REAL/objects/$(objpath $SHA)" &&
git update-index --add bar &&
if ! test -f "$REAL/index"
then
echo "$REAL/index not found"
false
fi &&
objck $SHA
* ok 7: check update-index
* expecting success:
SHA=$(git write-tree) &&
objck $SHA
* ok 8: check write-tree
* expecting success:
SHA=$(echo "commit bar" | git commit-tree $SHA) &&
objck $SHA
* ok 9: check commit-tree
* expecting success:
echo $SHA >"$REAL/HEAD" &&
test "$SHA" = "$(git rev-list HEAD)"
* ok 10: check rev-list
* passed all 10 test(s)
*** t0003-attributes.sh ***
Initialized empty Git repository in /build/buildd/git-core-1.6.3.3/t/trash directory.t0003-attributes/.git/
* expecting success:
mkdir -p a/b/d a/c &&
(
echo "f test=f"
echo "a/i test=a/i"
) >.gitattributes &&
(
echo "g test=a/g" &&
echo "b/g test=a/b/g"
) >a/.gitattributes &&
(
echo "h test=a/b/h" &&
echo "d/* test=a/b/d/*"
) >a/b/.gitattributes
* ok 1: setup
* expecting success:
attr_check f f &&
attr_check a/f f &&
attr_check a/c/f f &&
attr_check a/g a/g &&
attr_check a/b/g a/b/g &&
attr_check b/g unspecified &&
attr_check a/b/h a/b/h &&
attr_check a/b/d/g "a/b/d/*"
* ok 2: attribute test
* expecting success:
cat <<EOF > expect
f: test: f
a/f: test: f
a/c/f: test: f
a/g: test: a/g
a/b/g: test: a/b/g
b/g: test: unspecified
a/b/h: test: a/b/h
a/b/d/g: test: a/b/d/*
EOF
sed -e "s/:.*//" < expect | git check-attr --stdin test > actual &&
test_cmp expect actual
* ok 3: attribute test: read paths from stdin
* expecting success:
attr_check a/i a/i &&
attr_check subdir/a/i unspecified
* ok 4: root subdir attribute test
* expecting success:
git clone --bare . bare.git &&
cd bare.git
Initialized empty Git repository in /build/buildd/git-core-1.6.3.3/t/trash directory.t0003-attributes/bare.git/
warning: You appear to have cloned an empty repository.
* ok 5: setup bare
* expecting success:
(
echo "f test=f"
echo "a/i test=a/i"
) >.gitattributes &&
attr_check f unspecified &&
attr_check a/f unspecified &&
attr_check a/c/f unspecified &&
attr_check a/i unspecified &&
attr_check subdir/a/i unspecified
* ok 6: bare repository: check that .gitattribute is ignored
* expecting success:
(
echo "f test=f"
echo "a/i test=a/i"
) >info/attributes &&
attr_check f f &&
attr_check a/f f &&
attr_check a/c/f f &&
attr_check a/i a/i &&
attr_check subdir/a/i unspecified
* ok 7: bare repository: test info/attributes
* passed all 7 test(s)
*** t0004-unwritable.sh ***
Initialized empty Git repository in /build/buildd/git-core-1.6.3.3/t/trash directory.t0004-unwritable/.git/
* expecting success:
>file &&
git add file &&
test_tick &&
git commit -m initial &&
echo >file &&
git add file
[master (root-commit) 1bd44cb] initial
0 files changed, 0 insertions(+), 0 deletions(-)
create mode 100644 file
* ok 1: setup
* expecting success:
(
chmod a-w .git/objects .git/objects/?? &&
test_must_fail git write-tree
)
status=$?
chmod 775 .git/objects .git/objects/??
(exit $status)
error: insufficient permission for adding an object to repository database .git/objects
fatal: git-write-tree: error building trees
* ok 2: write-tree should notice unwritable repository
* expecting success:
(
chmod a-w .git/objects .git/objects/?? &&
test_must_fail git commit -m second
)
status=$?
chmod 775 .git/objects .git/objects/??
(exit $status)
error: insufficient permission for adding an object to repository database .git/objects
error: Error building trees
* ok 3: commit should notice unwritable repository
* expecting success:
(
echo 6O >file &&
chmod a-w .git/objects .git/objects/?? &&
test_must_fail git update-index file
)
status=$?
chmod 775 .git/objects .git/objects/??
(exit $status)
error: insufficient permission for adding an object to repository database .git/objects
error: file: failed to insert into database
fatal: Unable to process path file
* ok 4: update-index should notice unwritable repository
* expecting success:
(
echo b >file &&
chmod a-w .git/objects .git/objects/?? &&
test_must_fail git add file
)
status=$?
chmod 775 .git/objects .git/objects/??
(exit $status)
error: insufficient permission for adding an object to repository database .git/objects
error: file: failed to insert into database
error: unable to index file file
fatal: updating files failed
* ok 5: add should notice unwritable repository
* passed all 5 test(s)
*** t0005-signals.sh ***
Initialized empty Git repository in /build/buildd/git-core-1.6.3.3/t/trash directory.t0005-signals/.git/
* expecting success:
test-sigchain >actual
case "$?" in
143) true ;; # POSIX w/ SIGTERM=15
3) true ;; # Windows
*) false ;;
esac &&
test_cmp expect actual
Terminated
* ok 1: sigchain works
* passed all 1 test(s)
*** t0010-racy-git.sh ***
Initialized empty Git repository in /build/buildd/git-core-1.6.3.3/t/trash directory.t0010-racy-git/.git/
* expecting success: test "" != "$files"
* ok 1: Racy GIT trial #0 part A
* expecting success: test "" != "$files"
* ok 2: Racy GIT trial #0 part B
* expecting success: test "" != "$files"
* ok 3: Racy GIT trial #1 part A
* expecting success: test "" != "$files"
* ok 4: Racy GIT trial #1 part B
* expecting success: test "" != "$files"
* ok 5: Racy GIT trial #2 part A
* expecting success: test "" != "$files"
* ok 6: Racy GIT trial #2 part B
* expecting success: test "" != "$files"
* ok 7: Racy GIT trial #3 part A
* expecting success: test "" != "$files"
* ok 8: Racy GIT trial #3 part B
* expecting success: test "" != "$files"
* ok 9: Racy GIT trial #4 part A
* expecting success: test "" != "$files"
* ok 10: Racy GIT trial #4 part B
* passed all 10 test(s)
*** t0020-crlf.sh ***
Initialized empty Git repository in /build/buildd/git-core-1.6.3.3/t/trash directory.t0020-crlf/.git/
* expecting success:
git config core.autocrlf false &&
for w in Hello world how are you; do echo $w; done >one &&
mkdir dir &&
for w in I am very very fine thank you; do echo $w; done >dir/two &&
for w in Oh here is NULQin text here; do echo $w; done | q_to_nul >three &&
git add . &&
git commit -m initial &&
one=`git rev-parse HEAD:one` &&
dir=`git rev-parse HEAD:dir` &&
two=`git rev-parse HEAD:dir/two` &&
three=`git rev-parse HEAD:three` &&
for w in Some extra lines here; do echo $w; done >>one &&
git diff >patch.file &&
patched=`git hash-object --stdin <one` &&
git read-tree --reset -u HEAD &&
echo happy.
[master (root-commit) 30efe2e] initial
3 files changed, 12 insertions(+), 0 deletions(-)
create mode 100644 dir/two
create mode 100644 one
create mode 100644 three
happy.
* ok 1: setup
* expecting success:
git config core.autocrlf input &&
git config core.safecrlf true &&
for w in I am all CRLF; do echo $w; done | append_cr >allcrlf &&
test_must_fail git add allcrlf
fatal: CRLF would be replaced by LF in allcrlf.
* ok 2: safecrlf: autocrlf=input, all CRLF
* expecting success:
git config core.autocrlf input &&
git config core.safecrlf true &&
for w in Oh here is CRLFQ in text; do echo $w; done | q_to_cr >mixed &&
test_must_fail git add mixed
fatal: CRLF would be replaced by LF in mixed.
* ok 3: safecrlf: autocrlf=input, mixed LF/CRLF
* expecting success:
git config core.autocrlf true &&
git config core.safecrlf true &&
for w in I am all LF; do echo $w; done >alllf &&
test_must_fail git add alllf
fatal: LF would be replaced by CRLF in alllf
* ok 4: safecrlf: autocrlf=true, all LF
* expecting success:
git config core.autocrlf true &&
git config core.safecrlf true &&
for w in Oh here is CRLFQ in text; do echo $w; done | q_to_cr >mixed &&
test_must_fail git add mixed
fatal: LF would be replaced by CRLF in mixed
* ok 5: safecrlf: autocrlf=true mixed LF/CRLF
* expecting success:
git config core.autocrlf input &&
git config core.safecrlf warn &&
for w in I am all LF; do echo $w; done >doublewarn &&
git add doublewarn &&
git commit -m "nowarn" &&
for w in Oh here is CRLFQ in text; do echo $w; done | q_to_cr >doublewarn &&
test $(git add doublewarn 2>&1 | grep "CRLF will be replaced by LF" | wc -l) = 1
[master 9f072c8] nowarn
1 files changed, 4 insertions(+), 0 deletions(-)
create mode 100644 doublewarn
* ok 6: safecrlf: print warning only once
* expecting success:
git config core.autocrlf false &&
git config core.safecrlf false &&
git reset --hard HEAD^
HEAD is now at 30efe2e initial
* ok 7: switch off autocrlf, safecrlf, reset HEAD
* expecting success:
rm -f tmp one dir/two three &&
git read-tree --reset -u HEAD &&
git config core.autocrlf input &&
for f in one dir/two
do
append_cr <$f >tmp && mv -f tmp $f &&
git update-index -- $f || {
echo Oops
false
break
}
done &&
differs=`git diff-index --cached HEAD` &&
test -z "$differs" || {
echo Oops "$differs"
false
}
* ok 8: update with autocrlf=input
* expecting success:
rm -f tmp one dir/two three &&
git read-tree --reset -u HEAD &&
git config core.autocrlf true &&
for f in one dir/two
do
append_cr <$f >tmp && mv -f tmp $f &&
git update-index -- $f || {
echo "Oops $f"
false
break
}
done &&
differs=`git diff-index --cached HEAD` &&
test -z "$differs" || {
echo Oops "$differs"
false
}
* ok 9: update with autocrlf=true
* expecting success:
rm -f tmp one dir/two three &&
git config core.autocrlf true &&
git read-tree --reset -u HEAD &&
for f in one dir/two
do
remove_cr "$f" >tmp && mv -f tmp $f &&
git update-index -- $f || {
echo "Eh? $f"
false
break
}
done &&
test "$one" = `git hash-object --stdin <one` &&
test "$two" = `git hash-object --stdin <dir/two` &&
differs=`git diff-index --cached HEAD` &&
test -z "$differs" || {
echo Oops "$differs"
false
}
* ok 10: checkout with autocrlf=true
* expecting success:
rm -f tmp one dir/two three &&
git config core.autocrlf input &&
git read-tree --reset -u HEAD &&
for f in one dir/two
do
if remove_cr "$f" >/dev/null
then
echo "Eh? $f"
false
break
else
git update-index -- $f
fi
done &&
test "$one" = `git hash-object --stdin <one` &&
test "$two" = `git hash-object --stdin <dir/two` &&
differs=`git diff-index --cached HEAD` &&
test -z "$differs" || {
echo Oops "$differs"
false
}
* ok 11: checkout with autocrlf=input
* expecting success:
rm -f tmp one dir/two three &&
git config core.autocrlf input &&
git read-tree --reset -u HEAD &&
git apply patch.file &&
test "$patched" = "`git hash-object --stdin <one`" || {
echo "Eh? apply without index"
false
}
* ok 12: apply patch (autocrlf=input)
* expecting success:
rm -f tmp one dir/two three &&
git config core.autocrlf input &&
git read-tree --reset -u HEAD &&
git apply --cached patch.file &&
test "$patched" = `git rev-parse :one` || {
echo "Eh? apply with --cached"
false
}
* ok 13: apply patch --cached (autocrlf=input)
* expecting success:
rm -f tmp one dir/two three &&
git config core.autocrlf input &&
git read-tree --reset -u HEAD &&
git apply --index patch.file &&
test "$patched" = `git rev-parse :one` &&
test "$patched" = `git hash-object --stdin <one` || {
echo "Eh? apply with --index"
false
}
* ok 14: apply patch --index (autocrlf=input)
* expecting success:
rm -f tmp one dir/two three &&
git config core.autocrlf true &&
git read-tree --reset -u HEAD &&
git apply patch.file &&
test "$patched" = "`remove_cr one | git hash-object --stdin`" || {
echo "Eh? apply without index"
false
}
* ok 15: apply patch (autocrlf=true)
* expecting success:
rm -f tmp one dir/two three &&
git config core.autocrlf true &&
git read-tree --reset -u HEAD &&
git apply --cached patch.file &&
test "$patched" = `git rev-parse :one` || {
echo "Eh? apply without index"
false
}
* ok 16: apply patch --cached (autocrlf=true)
* expecting success:
rm -f tmp one dir/two three &&
git config core.autocrlf true &&
git read-tree --reset -u HEAD &&
git apply --index patch.file &&
test "$patched" = `git rev-parse :one` &&
test "$patched" = "`remove_cr one | git hash-object --stdin`" || {
echo "Eh? apply with --index"
false
}
* ok 17: apply patch --index (autocrlf=true)
* expecting success:
rm -f tmp one dir/two three &&
echo "two -crlf" >.gitattributes &&
git config core.autocrlf true &&
git read-tree --reset -u HEAD &&
if remove_cr dir/two >/dev/null
then
echo "Huh?"
false
else
: happy
fi &&
if remove_cr one >/dev/null
then
: happy
else
echo "Huh?"
false
fi &&
if remove_cr three >/dev/null
then
echo "Huh?"
false
else
: happy
fi
* ok 18: .gitattributes says two is binary
* expecting success:
rm -f tmp one dir/two three &&
echo "two crlf=input" >.gitattributes &&
git read-tree --reset -u HEAD &&
if remove_cr dir/two >/dev/null
then
echo "Huh?"
false
else
: happy
fi
* ok 19: .gitattributes says two is input
* expecting success:
rm -f tmp one dir/two three &&
echo "t* crlf" >.gitattributes &&
git read-tree --reset -u HEAD &&
if remove_cr dir/two >/dev/null
then
: happy
else
echo "Huh?"
false
fi &&
if remove_cr three >/dev/null
then
: happy
else
echo "Huh?"
false
fi
* ok 20: .gitattributes says two and three are text
* expecting success:
echo "one -crlf" >>.gitattributes &&
git add .gitattributes &&
git commit -m "Add .gitattributes" &&
rm -rf tmp one dir .gitattributes patch.file three &&
git read-tree --reset -u HEAD &&
if remove_cr one >/dev/null
then
echo "Eh? one should not have CRLF"
false
else
: happy
fi &&
remove_cr three >/dev/null || {
echo "Eh? three should still have CRLF"
false
}
[master 5110cec] Add .gitattributes
1 files changed, 2 insertions(+), 0 deletions(-)
create mode 100644 .gitattributes
* ok 21: in-tree .gitattributes (1)
* expecting success:
rm -rf tmp one dir .gitattributes patch.file three &&
git read-tree --reset HEAD &&
git checkout-index -f -q -u -a &&
if remove_cr one >/dev/null
then
echo "Eh? one should not have CRLF"
false
else
: happy
fi &&
remove_cr three >/dev/null || {
echo "Eh? three should still have CRLF"
false
}
* ok 22: in-tree .gitattributes (2)
* expecting success:
rm -rf tmp one dir .gitattributes patch.file three &&
git read-tree --reset HEAD &&
git checkout-index -u .gitattributes &&
git checkout-index -u one dir/two three &&
if remove_cr one >/dev/null
then
echo "Eh? one should not have CRLF"
false
else
: happy
fi &&
remove_cr three >/dev/null || {
echo "Eh? three should still have CRLF"
false
}
* ok 23: in-tree .gitattributes (3)
* expecting success:
rm -rf tmp one dir .gitattributes patch.file three &&
git read-tree --reset HEAD &&
git checkout-index -u one dir/two three &&
git checkout-index -u .gitattributes &&
if remove_cr one >/dev/null
then
echo "Eh? one should not have CRLF"
false
else
: happy
fi &&
remove_cr three >/dev/null || {
echo "Eh? three should still have CRLF"
false
}
* ok 24: in-tree .gitattributes (4)
* expecting success:
git config core.autocrlf true &&
git config --unset core.safecrlf &&
echo ".file2 -crlfQ" | q_to_cr >> .gitattributes &&
git add .gitattributes &&
git commit -m initial &&
echo ".file -crlfQ" | q_to_cr >> .gitattributes &&
echo "contents" > .file &&
git add .gitattributes .file &&
git commit -m second &&
git checkout master~1 &&
git checkout master &&
test "$(git diff-files --raw)" = ""
[master 2c091ef] initial
1 files changed, 1 insertions(+), 0 deletions(-)
[master 75fc461] second
2 files changed, 2 insertions(+), 0 deletions(-)
create mode 100644 .file
Note: moving to 'master~1' which isn't a local branch
If you want to create a new branch from this checkout, you may do so
(now or later) by using -b with the checkout command again. Example:
git checkout -b <new_branch_name>
HEAD is now at 2c091ef... initial
Previous HEAD position was 2c091ef... initial
Switched to branch 'master'
* ok 25: checkout with existing .gitattributes
* expecting success:
git rm .gitattributes &&
echo "contentsQ" | q_to_cr > .file2 &&
git add .file2 &&
git commit -m third
git checkout master~1 &&
git checkout master &&
remove_cr .file2 >/dev/null
rm '.gitattributes'
[master d2f3d7d] third
2 files changed, 1 insertions(+), 4 deletions(-)
create mode 100644 .file2
delete mode 100644 .gitattributes
Note: moving to 'master~1' which isn't a local branch
If you want to create a new branch from this checkout, you may do so
(now or later) by using -b with the checkout command again. Example:
git checkout -b <new_branch_name>
HEAD is now at 75fc461... second
M three
Previous HEAD position was 75fc461... second
Switched to branch 'master'
* ok 26: checkout when deleting .gitattributes
* expecting success:
echo "three +crlf" >>.gitattributes &&
git diff
+crlf is not a valid attribute name: .gitattributes:1
diff --git a/three b/three
index 98efc5e..c5c386a 100644
Binary files a/three and b/three differ
* ok 27: invalid .gitattributes (must not crash)
* passed all 27 test(s)
*** t0021-conversion.sh ***
Initialized empty Git repository in /build/buildd/git-core-1.6.3.3/t/trash directory.t0021-conversion/.git/
* expecting success:
git config filter.rot13.smudge ./rot13.sh &&
git config filter.rot13.clean ./rot13.sh &&
{
echo "*.t filter=rot13"
echo "*.i ident"
} >.gitattributes &&
{
echo a b c d e f g h i j k l m
echo n o p q r s t u v w x y z
echo '$Id$'
} >test &&
cat test >test.t &&
cat test >test.o &&
cat test >test.i &&
git add test test.t test.i &&
rm -f test test.t test.i &&
git checkout -- test test.t test.i
* ok 1: setup
* expecting success:
cmp test.o test &&
cmp test.o test.t &&
# ident should be stripped in the repository
git diff --raw --exit-code :test :test.i &&
id=$(git rev-parse --verify :test) &&
embedded=$(sed -ne "$script" test.i) &&
test "z$id" = "z$embedded" &&
git cat-file blob :test.t > test.r &&
./rot13.sh < test.o > test.t &&
cmp test.r test.t
* ok 2: check
* expecting success:
{
echo "File with expanded keywords"
echo "\$Id\$"
echo "\$Id:\$"
echo "\$Id: 0000000000000000000000000000000000000000 \$"
echo "\$Id: NoSpaceAtEnd\$"
echo "\$Id:NoSpaceAtFront \$"
echo "\$Id:NoSpaceAtEitherEnd\$"
echo "\$Id: NoTerminatingSymbol"
} > expanded-keywords &&
{
echo "File with expanded keywords"
echo "\$Id: 4f21723e7b15065df7de95bd46c8ba6fb1818f4c \$"
echo "\$Id: 4f21723e7b15065df7de95bd46c8ba6fb1818f4c \$"
echo "\$Id: 4f21723e7b15065df7de95bd46c8ba6fb1818f4c \$"
echo "\$Id: 4f21723e7b15065df7de95bd46c8ba6fb1818f4c \$"
echo "\$Id: 4f21723e7b15065df7de95bd46c8ba6fb1818f4c \$"
echo "\$Id: 4f21723e7b15065df7de95bd46c8ba6fb1818f4c \$"
echo "\$Id: NoTerminatingSymbol"
} > expected-output &&
git add expanded-keywords &&
git commit -m "File with keywords expanded" &&
echo "expanded-keywords ident" >> .gitattributes &&
rm -f expanded-keywords &&
git checkout -- expanded-keywords &&
cat expanded-keywords &&
cmp expanded-keywords expected-output
[master (root-commit) cdc710b] File with keywords expanded
4 files changed, 17 insertions(+), 0 deletions(-)
create mode 100644 expanded-keywords
create mode 100644 test
create mode 100644 test.i
create mode 100644 test.t
File with expanded keywords
$Id: 4f21723e7b15065df7de95bd46c8ba6fb1818f4c $
$Id: 4f21723e7b15065df7de95bd46c8ba6fb1818f4c $
$Id: 4f21723e7b15065df7de95bd46c8ba6fb1818f4c $
$Id: 4f21723e7b15065df7de95bd46c8ba6fb1818f4c $
$Id: 4f21723e7b15065df7de95bd46c8ba6fb1818f4c $
$Id: 4f21723e7b15065df7de95bd46c8ba6fb1818f4c $
$Id: NoTerminatingSymbol
* ok 3: expanded_in_repo
* passed all 3 test(s)
*** t0022-crlf-rename.sh ***
Initialized empty Git repository in /build/buildd/git-core-1.6.3.3/t/trash directory.t0022-crlf-rename/.git/
* expecting success:
cat "$TEST_DIRECTORY"/t0022-crlf-rename.sh >sample &&
git add sample &&
test_tick &&
git commit -m Initial &&
sed -e "s/\$/
/" "$TEST_DIRECTORY"/t0022-crlf-rename.sh >elpmas &&
git add elpmas &&
rm -f sample &&
test_tick &&
git commit -a -m Second
[master (root-commit) 5856e5d] Initial
1 files changed, 33 insertions(+), 0 deletions(-)
create mode 100644 sample
[master febd9aa] Second
2 files changed, 33 insertions(+), 33 deletions(-)
create mode 100644 elpmas
delete mode 100644 sample
* ok 1: setup
* expecting success:
git diff-tree -M -r --name-status HEAD^ HEAD |
sed -e "s/R[0-9]*/RNUM/" >actual &&
echo "RNUM sample elpmas" >expect &&
test_cmp expect actual
* ok 2: diff -M
* passed all 2 test(s)
*** t0023-crlf-am.sh ***
Initialized empty Git repository in /build/buildd/git-core-1.6.3.3/t/trash directory.t0023-crlf-am/.git/
* expecting success:
git config core.autocrlf true &&
echo foo >bar &&
git add bar &&
test_tick &&
git commit -m initial
warning: LF will be replaced by CRLF in bar
warning: LF will be replaced by CRLF in bar
[master (root-commit) 1adb513] initial
1 files changed, 1 insertions(+), 0 deletions(-)
create mode 100644 bar
* ok 1: setup
* expecting success:
git am -3 <patchfile &&
git diff-files --name-status --exit-code
Applying: test1
* ok 2: am
* passed all 2 test(s)
*** t0024-crlf-archive.sh ***
Initialized empty Git repository in /build/buildd/git-core-1.6.3.3/t/trash directory.t0024-crlf-archive/.git/
* expecting success:
git config core.autocrlf true
printf "CRLF line ending
And another
" > sample &&
git add sample &&
test_tick &&
git commit -m Initial
[master (root-commit) 4f7f1aa] Initial
1 files changed, 2 insertions(+), 0 deletions(-)
create mode 100644 sample
* ok 1: setup
* expecting success:
git archive --format=tar HEAD |
( mkdir untarred && cd untarred && "$TAR" -xf - )
test_cmp sample untarred/sample
* ok 2: tar archive
* expecting success:
git archive --format=zip HEAD >test.zip &&
( mkdir unzipped && cd unzipped && unzip ../test.zip ) &&
test_cmp sample unzipped/sample
Archive: ../test.zip
4f7f1aaec1ee996d8f5e13c2cfbd43a378578e1f
extracting: sample
* ok 3: zip archive
* passed all 3 test(s)
*** t0030-stripspace.sh ***
Initialized empty Git repository in /build/buildd/git-core-1.6.3.3/t/trash directory.t0030-stripspace/.git/
* expecting success:
echo "$ttt" >expect &&
git stripspace <expect >actual &&
test_cmp expect actual &&
echo "$ttt$ttt" >expect &&
git stripspace <expect >actual &&
test_cmp expect actual &&
echo "$ttt$ttt$ttt" >expect &&
git stripspace <expect >actual &&
test_cmp expect actual &&
echo "$ttt$ttt$ttt$ttt" >expect &&
git stripspace <expect >actual &&
test_cmp expect actual
* ok 1: long lines without spaces should be unchanged
* expecting success:
echo "$sss$ttt" >expect &&
git stripspace <expect >actual &&
test_cmp expect actual &&
echo "$sss$sss$ttt" >expect &&
git stripspace <expect >actual &&
test_cmp expect actual &&
echo "$sss$sss$sss$ttt" >expect &&
git stripspace <expect >actual &&
test_cmp expect actual
* ok 2: lines with spaces at the beginning should be unchanged
* expecting success:
echo "$ttt$sss$ttt" >expect &&
git stripspace <expect >actual &&
test_cmp expect actual &&
echo "$ttt$sss$sss$ttt" >expect &&
git stripspace <expect >actual &&
test_cmp expect actual
* ok 3: lines with intermediate spaces should be unchanged
* expecting success:
printf "$ttt
$ttt
" > expect &&
printf "$ttt
$ttt
" | git stripspace >actual &&
test_cmp expect actual &&
printf "$ttt$ttt
$ttt
" > expect &&
printf "$ttt$ttt
$ttt
" | git stripspace >actual &&
test_cmp expect actual &&
printf "$ttt$ttt$ttt
$ttt
" > expect &&
printf "$ttt$ttt$ttt
$ttt
" | git stripspace >actual &&
test_cmp expect actual &&
printf "$ttt
$ttt
" > expect &&
printf "$ttt
$ttt
" | git stripspace >actual &&
test_cmp expect actual &&
printf "$ttt
$ttt$ttt
" > expect &&
printf "$ttt
$ttt$ttt
" | git stripspace >actual &&
test_cmp expect actual &&
printf "$ttt
$ttt$ttt$ttt
" > expect &&
printf "$ttt
$ttt$ttt$ttt
" | git stripspace >actual &&
test_cmp expect actual &&
printf "$ttt
$ttt
" > expect &&
printf "$ttt
$ttt
" | git stripspace >actual &&
test_cmp expect actual &&
printf "$ttt$ttt
$ttt
" > expect &&
printf "$ttt$ttt
$ttt
" | git stripspace >actual &&
test_cmp expect actual &&
printf "$ttt$ttt$ttt
$ttt
" > expect &&
printf "$ttt$ttt$ttt
$ttt
" | git stripspace >actual &&
test_cmp expect actual &&
printf "$ttt
$ttt
" > expect &&
printf "$ttt
$ttt
" | git stripspace >actual &&
test_cmp expect actual &&
printf "$ttt
$ttt$ttt
" > expect &&
printf "$ttt
$ttt$ttt
" | git stripspace >actual &&
test_cmp expect actual &&
printf "$ttt
$ttt$ttt$ttt
" > expect &&
printf "$ttt
$ttt$ttt$ttt
" | git stripspace >actual &&
test_cmp expect actual
* ok 4: consecutive blank lines should be unified
* expecting success:
> expect &&
printf "
" | git stripspace >actual &&
test_cmp expect actual &&
printf "
" | git stripspace >actual &&
test_cmp expect actual &&
printf "$sss
$sss
$sss
" | git stripspace >actual &&
test_cmp expect actual &&
printf "$sss$sss
$sss
" | git stripspace >actual &&
test_cmp expect actual &&
printf "
$sss
$sss$sss
" | git stripspace >actual &&
test_cmp expect actual &&
printf "$sss$sss$sss$sss
" | git stripspace >actual &&
test_cmp expect actual &&
printf "
$sss$sss$sss$sss
" | git stripspace >actual &&
test_cmp expect actual &&
printf "
$sss$sss$sss$sss
" | git stripspace >actual &&
test_cmp expect actual
* ok 5: only consecutive blank lines should be completely removed
* expecting success:
printf "$ttt
" > expect &&
printf "
$ttt
" | git stripspace >actual &&
test_cmp expect actual &&
printf "$ttt
" > expect &&
printf "
$ttt
" | git stripspace >actual &&
test_cmp expect actual &&
printf "$ttt$ttt
" > expect &&
printf "
$ttt$ttt
" | git stripspace >actual &&
test_cmp expect actual &&
printf "$ttt$ttt$ttt
" > expect &&
printf "
$ttt$ttt$ttt
" | git stripspace >actual &&
test_cmp expect actual &&
printf "$ttt$ttt$ttt$ttt
" > expect &&
printf "
$ttt$ttt$ttt$ttt
" | git stripspace >actual &&
test_cmp expect actual &&
printf "$ttt
" > expect &&
printf "$sss
$sss
$sss
$ttt
" | git stripspace >actual &&
test_cmp expect actual &&
printf "
$sss
$sss$sss
$ttt
" | git stripspace >actual &&
test_cmp expect actual &&
printf "$sss$sss
$sss
$ttt
" | git stripspace >actual &&
test_cmp expect actual &&
printf "$sss$sss$sss
$ttt
" | git stripspace >actual &&
test_cmp expect actual &&
printf "
$sss$sss$sss
$ttt
" | git stripspace >actual &&
test_cmp expect actual &&
printf "
$sss$sss$sss
$ttt
" | git stripspace >actual &&
test_cmp expect actual
* ok 6: consecutive blank lines at the beginning should be removed
* expecting success:
printf "$ttt
" > expect &&
printf "$ttt
" | git stripspace >actual &&
test_cmp expect actual &&
printf "$ttt
" > expect &&
printf "$ttt
" | git stripspace >actual &&
test_cmp expect actual &&
printf "$ttt$ttt
" > expect &&
printf "$ttt$ttt
" | git stripspace >actual &&
test_cmp expect actual &&
printf "$ttt$ttt$ttt
" > expect &&
printf "$ttt$ttt$ttt
" | git stripspace >actual &&
test_cmp expect actual &&
printf "$ttt$ttt$ttt$ttt
" > expect &&
printf "$ttt$ttt$ttt$ttt
" | git stripspace >actual &&
test_cmp expect actual &&
printf "$ttt
" > expect &&
printf "$ttt
$sss
$sss
$sss
" | git stripspace >actual &&
test_cmp expect actual &&
printf "$ttt
$sss
$sss$sss
" | git stripspace >actual &&
test_cmp expect actual &&
printf "$ttt
$sss$sss
$sss
" | git stripspace >actual &&
test_cmp expect actual &&
printf "$ttt
$sss$sss$sss
" | git stripspace >actual &&
test_cmp expect actual &&
printf "$ttt
$sss$sss$sss
" | git stripspace >actual &&
test_cmp expect actual &&
printf "$ttt
$sss$sss$sss
" | git stripspace >actual &&
test_cmp expect actual
* ok 7: consecutive blank lines at the end should be removed
* expecting success:
test `printf "$ttt" | git stripspace | wc -l` -gt 0 &&
test `printf "$ttt$ttt" | git stripspace | wc -l` -gt 0 &&
test `printf "$ttt$ttt$ttt" | git stripspace | wc -l` -gt 0 &&
test `printf "$ttt$ttt$ttt$ttt" | git stripspace | wc -l` -gt 0
* ok 8: text without newline at end should end with newline
* expecting success:
test `printf "$ttt$sss" | git stripspace | wc -l` -gt 0 &&
test `printf "$ttt$ttt$sss" | git stripspace | wc -l` -gt 0 &&
test `printf "$ttt$ttt$ttt$sss" | git stripspace | wc -l` -gt 0 &&
test `printf "$ttt$sss$sss" | git stripspace | wc -l` -gt 0 &&
test `printf "$ttt$ttt$sss$sss" | git stripspace | wc -l` -gt 0 &&
test `printf "$ttt$sss$sss$sss" | git stripspace | wc -l` -gt 0
* ok 9: text plus spaces without newline at end should end with newline
* expecting success:
! (printf "$ttt$sss" | git stripspace | grep " " >/dev/null) &&
! (printf "$ttt$ttt$sss" | git stripspace | grep " " >/dev/null) &&
! (printf "$ttt$ttt$ttt$sss" | git stripspace | grep " " >/dev/null) &&
! (printf "$ttt$sss$sss" | git stripspace | grep " " >/dev/null) &&
! (printf "$ttt$ttt$sss$sss" | git stripspace | grep " " >/dev/null) &&
! (printf "$ttt$sss$sss$sss" | git stripspace | grep " " >/dev/null)
* ok 10: text plus spaces without newline at end should not show spaces
* expecting success:
printf "$ttt
" >expect &&
printf "$ttt$sss" | git stripspace >actual &&
test_cmp expect actual &&
printf "$ttt
" >expect &&
printf "$ttt$sss$sss" | git stripspace >actual &&
test_cmp expect actual &&
printf "$ttt
" >expect &&
printf "$ttt$sss$sss$sss" | git stripspace >actual &&
test_cmp expect actual &&
printf "$ttt$ttt
" >expect &&
printf "$ttt$ttt$sss" | git stripspace >actual &&
test_cmp expect actual &&
printf "$ttt$ttt
" >expect &&
printf "$ttt$ttt$sss$sss" | git stripspace >actual &&
test_cmp expect actual &&
printf "$ttt$ttt$ttt
" >expect &&
printf "$ttt$ttt$ttt$sss" | git stripspace >actual &&
test_cmp expect actual
* ok 11: text plus spaces without newline should show the correct lines
* expecting success:
! (echo "$ttt$sss" | git stripspace | grep " " >/dev/null) &&
! (echo "$ttt$ttt$sss" | git stripspace | grep " " >/dev/null) &&
! (echo "$ttt$ttt$ttt$sss" | git stripspace | grep " " >/dev/null) &&
! (echo "$ttt$sss$sss" | git stripspace | grep " " >/dev/null) &&
! (echo "$ttt$ttt$sss$sss" | git stripspace | grep " " >/dev/null) &&
! (echo "$ttt$sss$sss$sss" | git stripspace | grep " " >/dev/null)
* ok 12: text plus spaces at end should not show spaces
* expecting success:
echo "$ttt" >expect &&
echo "$ttt$sss" | git stripspace >actual &&
test_cmp expect actual &&
echo "$ttt" >expect &&
echo "$ttt$sss$sss" | git stripspace >actual &&
test_cmp expect actual &&
echo "$ttt" >expect &&
echo "$ttt$sss$sss$sss" | git stripspace >actual &&
test_cmp expect actual &&
echo "$ttt$ttt" >expect &&
echo "$ttt$ttt$sss" | git stripspace >actual &&
test_cmp expect actual &&
echo "$ttt$ttt" >expect &&
echo "$ttt$ttt$sss$sss" | git stripspace >actual &&
test_cmp expect actual &&
echo "$ttt$ttt$ttt" >expect &&
echo "$ttt$ttt$ttt$sss" | git stripspace >actual &&
test_cmp expect actual
* ok 13: text plus spaces at end should be cleaned and newline must remain
* expecting success:
printf "" >expect &&
echo | git stripspace >actual &&
test_cmp expect actual &&
echo "$sss" | git stripspace >actual &&
test_cmp expect actual &&
echo "$sss$sss" | git stripspace >actual &&
test_cmp expect actual &&
echo "$sss$sss$sss" | git stripspace >actual &&
test_cmp expect actual &&
echo "$sss$sss$sss$sss" | git stripspace >actual &&
test_cmp expect actual
* ok 14: spaces with newline at end should be replaced with empty string
* expecting success:
! (printf "" | git stripspace | grep " " >/dev/null) &&
! (printf "$sss" | git stripspace | grep " " >/dev/null) &&
! (printf "$sss$sss" | git stripspace | grep " " >/dev/null) &&
! (printf "$sss$sss$sss" | git stripspace | grep " " >/dev/null) &&
! (printf "$sss$sss$sss$sss" | git stripspace | grep " " >/dev/null)
* ok 15: spaces without newline at end should not show spaces
* expecting success:
printf "" >expect &&
printf "" | git stripspace >actual &&
test_cmp expect actual &&
printf "$sss$sss" | git stripspace >actual &&
test_cmp expect actual &&
printf "$sss$sss$sss" | git stripspace >actual &&
test_cmp expect actual &&
printf "$sss$sss$sss$sss" | git stripspace >actual &&
test_cmp expect actual
* ok 16: spaces without newline at end should be replaced with empty string
* expecting success:
printf "$ttt$ttt
$ttt
" >expect &&
printf "$ttt$ttt
$ttt
" | git stripspace >actual &&
test_cmp expect actual &&
printf "$ttt
$ttt$ttt
$ttt
" >expect &&
printf "$ttt
$ttt$ttt
$ttt
" | git stripspace >actual &&
test_cmp expect actual &&
printf "$ttt
$ttt
$ttt
$ttt$ttt
" >expect &&
printf "$ttt
$ttt
$ttt
$ttt$ttt
" | git stripspace >actual &&
test_cmp expect actual &&
printf "$ttt
$ttt
$ttt$ttt
$ttt
" >expect &&
printf "$ttt
$ttt
$ttt$ttt
$ttt
" | git stripspace >actual &&
test_cmp expect actual &&
printf "$ttt$ttt
$ttt
$ttt$ttt
" >expect &&
printf "$ttt$ttt
$ttt
$ttt$ttt
" | git stripspace >actual &&
test_cmp expect actual &&
printf "$ttt
$ttt$ttt
$ttt
" >expect &&
printf "$ttt
$ttt$ttt
$ttt
" | git stripspace >actual &&
test_cmp expect actual
* ok 17: consecutive text lines should be unchanged
* expecting success:
test ! -z "$(echo "# comment" | git stripspace)" &&
test -z "$(echo "# comment" | git stripspace -s)"
* ok 18: strip comments, too
* passed all 18 test(s)
*** t0040-parse-options.sh ***
Initialized empty Git repository in /build/buildd/git-core-1.6.3.3/t/trash directory.t0040-parse-options/.git/
* expecting success:
test_must_fail test-parse-options -h > output 2> output.err &&
test ! -s output &&
test_cmp expect.err output.err
* ok 1: test help
* expecting success:
test-parse-options -s123 -b -i 1729 -b -vv -n > output 2> output.err &&
test_cmp expect output &&
test ! -s output.err
* ok 2: short options
* expecting success:
test-parse-options --boolean --integer 1729 --boolean --string2=321 \
--verbose --verbose --no-dry-run --abbrev=10 \
> output 2> output.err &&
test ! -s output.err &&
test_cmp expect output
* ok 3: long options
* expecting success:
test-parse-options -s;
test $? = 129 &&
test-parse-options --string;
test $? = 129
error: switch `s' requires a value
usage: test-parse-options <options>
-b, --boolean get a boolean
-4, --or4 bitwise-or boolean with ...0100
-i, --integer <n> get a integer
-j <n> get a integer, too
--set23 set integer to 23
-t <time> get timestamp of <time>
-L, --length <str> get length of <str>
String options
-s, --string <string>
get a string
--string2 <str> get another string
--st <st> get another string (pervert ordering)
-o <str> get another string
--default-string set string to default
Magic arguments
--quux means --quux
Standard options
--abbrev[=<n>] use <n> digits to display SHA-1s
-v, --verbose be verbose
-n, --dry-run dry run
-q, --quiet be quiet
error: option `string' requires a value
usage: test-parse-options <options>
-b, --boolean get a boolean
-4, --or4 bitwise-or boolean with ...0100
-i, --integer <n> get a integer
-j <n> get a integer, too
--set23 set integer to 23
-t <time> get timestamp of <time>
-L, --length <str> get length of <str>
String options
-s, --string <string>
get a string
--string2 <str> get another string
--st <st> get another string (pervert ordering)
-o <str> get another string
--default-string set string to default
Magic arguments
--quux means --quux
Standard options
--abbrev[=<n>] use <n> digits to display SHA-1s
-v, --verbose be verbose
-n, --dry-run dry run
-q, --quiet be quiet
* ok 4: missing required value
* expecting success:
test-parse-options a1 --string 123 b1 --boolean -j 13 -- --boolean \
> output 2> output.err &&
test ! -s output.err &&
test_cmp expect output
* ok 5: intermingled arguments
* expecting success:
test-parse-options --int 2 --boolean --no-bo > output 2> output.err &&
test ! -s output.err &&
test_cmp expect output
* ok 6: unambiguously abbreviated option
* expecting success:
test-parse-options --int=2 > output 2> output.err &&
test ! -s output.err &&
test_cmp expect output
* ok 7: unambiguously abbreviated option with "="
* expecting success:
test-parse-options --strin 123;
test $? = 129
error: Ambiguous option: strin (could be --string or --string2)
usage: test-parse-options <options>
-b, --boolean get a boolean
-4, --or4 bitwise-or boolean with ...0100
-i, --integer <n> get a integer
-j <n> get a integer, too
--set23 set integer to 23
-t <time> get timestamp of <time>
-L, --length <str> get length of <str>
String options
-s, --string <string>
get a string
--string2 <str> get another string
--st <st> get another string (pervert ordering)
-o <str> get another string
--default-string set string to default
Magic arguments
--quux means --quux
Standard options
--abbrev[=<n>] use <n> digits to display SHA-1s
-v, --verbose be verbose
-n, --dry-run dry run
-q, --quiet be quiet
* ok 8: ambiguously abbreviated option
* expecting success:
test-parse-options --st 123 > output 2> output.err &&
test ! -s output.err &&
test_cmp expect output
* ok 9: non ambiguous option (after two options it abbreviates)
* expecting success:
test_must_fail test-parse-options -boolean > output 2> output.err &&
test ! -s output &&
test_cmp typo.err output.err
* ok 10: detect possible typos
* expecting success:
test-parse-options --quux > output 2> output.err &&
test ! -s output.err &&
test_cmp expect output
* ok 11: keep some options as arguments
* expecting success:
test-parse-options -t "1970-01-01 00:00:01 +0000" --default-string \
foo -q > output 2> output.err &&
test ! -s output.err &&
test_cmp expect output
* ok 12: OPT_DATE() and OPT_SET_PTR() work
* expecting success:
test-parse-options --length=four -b -4 > output 2> output.err &&
test ! -s output.err &&
test_cmp expect output
* ok 13: OPT_CALLBACK() and OPT_BIT() work
* expecting success:
test_must_fail test-parse-options --no-length > output 2> output.err &&
test_cmp expect output &&
test_cmp expect.err output.err
* ok 14: OPT_CALLBACK() and callback errors work
* expecting success:
test-parse-options --set23 -bbbbb --no-or4 > output 2> output.err &&
test ! -s output.err &&
test_cmp expect output
* ok 15: OPT_BIT() and OPT_SET_INT() work
* passed all 15 test(s)
*** t0050-filesystem.sh ***
Initialized empty Git repository in /build/buildd/git-core-1.6.3.3/t/trash directory.t0050-filesystem/.git/
* expecting success:
test_case=test_expect_success
test_unicode=test_expect_success
mkdir junk &&
echo good >junk/CamelCase &&
echo bad >junk/camelcase &&
if test "$(cat junk/CamelCase)" != good
then
test_case=test_expect_failure
case_insensitive=t
fi &&
rm -fr junk &&
mkdir junk &&
>junk/"$auml" &&
case "$(cd junk && echo *)" in
"$aumlcdiar")
test_unicode=test_expect_failure
unibad=t
;;
*) ;;
esac &&
rm -fr junk &&
{
ln -s x y 2> /dev/null &&
test -h y 2> /dev/null ||
no_symlinks=1
rm -f y
}
* ok 1: see what we expect
* expecting success:
test_must_fail git config --bool core.ignorecase >/dev/null ||
test $(git config --bool core.ignorecase) = false
* ok 2: detection of case insensitive filesystem during repo init
* expecting success:
test_must_fail git config --bool core.symlinks ||
test "$(git config --bool core.symlinks)" = true
* ok 3: detection of filesystem w/o symlink support during repo init
* expecting success:
git config core.ignorecase true &&
touch camelcase &&
git add camelcase &&
git commit -m "initial" &&
git tag initial &&
git checkout -b topic &&
git mv camelcase tmp &&
git mv tmp CamelCase &&
git commit -m "rename" &&
git checkout -f master
[master (root-commit) da2a7c0] initial
0 files changed, 0 insertions(+), 0 deletions(-)
create mode 100644 camelcase
Switched to a new branch 'topic'
[topic 9f7419a] rename
1 files changed, 0 insertions(+), 0 deletions(-)
rename camelcase => CamelCase (100%)
Switched to branch 'master'
* ok 4: setup case tests
* expecting success:
git mv camelcase CamelCase &&
git commit -m "rename"
[master 9f7419a] rename
1 files changed, 0 insertions(+), 0 deletions(-)
rename camelcase => CamelCase (100%)
* ok 5: rename (case change)
* expecting success:
rm -f CamelCase &&
rm -f camelcase &&
git reset --hard initial &&
git merge topic
HEAD is now at da2a7c0 initial
Updating da2a7c0..9f7419a
Fast forward
camelcase => CamelCase | 0
1 files changed, 0 insertions(+), 0 deletions(-)
rename camelcase => CamelCase (100%)
* ok 6: merge (case change)
* expecting success:
git reset --hard initial &&
rm camelcase &&
echo 1 >CamelCase &&
git add CamelCase &&
test $(git ls-files | grep -i camelcase | wc -l) = 1
HEAD is now at da2a7c0 initial
* ok 7: add (with different case)
* expecting success:
test_create_repo unicode &&
cd unicode &&
touch "$aumlcdiar" &&
git add "$aumlcdiar" &&
git commit -m initial
git tag initial &&
git checkout -b topic &&
git mv $aumlcdiar tmp &&
git mv tmp "$auml" &&
git commit -m rename &&
git checkout -f master
Initialized empty Git repository in /build/buildd/git-core-1.6.3.3/t/trash directory.t0050-filesystem/unicode/.git/
[master (root-commit) df49402] initial
0 files changed, 0 insertions(+), 0 deletions(-)
create mode 100644 "\\x61\\xcc\\x88"
Switched to a new branch 'topic'
[topic 5c2c9ee] rename
1 files changed, 0 insertions(+), 0 deletions(-)
rename "\\x61\\xcc\\x88" => "\\xc3\\xa4" (100%)
Switched to branch 'master'
* ok 8: setup unicode normalization tests
* expecting success:
git mv "$aumlcdiar" "$auml" &&
git commit -m rename
[master 5c2c9ee] rename
1 files changed, 0 insertions(+), 0 deletions(-)
rename "\\x61\\xcc\\x88" => "\\xc3\\xa4" (100%)
* ok 9: rename (silent unicode normalization)
* expecting success:
git reset --hard initial &&
git merge topic
HEAD is now at df49402 initial
Updating df49402..5c2c9ee
Fast forward
"\\x61\\xcc\\x88" => "\\xc3\\xa4" | 0
1 files changed, 0 insertions(+), 0 deletions(-)
rename "\\x61\\xcc\\x88" => "\\xc3\\xa4" (100%)
* ok 10: merge (silent unicode normalization)
* passed all 10 test(s)
*** t0055-beyond-symlinks.sh ***
Initialized empty Git repository in /build/buildd/git-core-1.6.3.3/t/trash directory.t0055-beyond-symlinks/.git/
* expecting success:
>a &&
mkdir b &&
ln -s b c &&
>c/d &&
git update-index --add a b/d
* ok 1: setup
* expecting success:
test_must_fail git update-index --add c/d &&
! ( git ls-files | grep c/d )
error: 'c/d' is beyond a symbolic link
fatal: Unable to process path c/d
* ok 2: update-index --add beyond symlinks
* expecting success:
test_must_fail git add c/d &&
! ( git ls-files | grep c/d )
fatal: 'c/d' is beyond a symbolic link
* ok 3: add beyond symlinks
* passed all 3 test(s)
*** t0060-path-utils.sh ***
Initialized empty Git repository in /build/buildd/git-core-1.6.3.3/t/trash directory.t0060-path-utils/.git/
* expecting success: test "$(test-path-utils normalize_path_copy '')" = ''
* ok 1: normalize path: =>
* expecting success: test "$(test-path-utils normalize_path_copy '.')" = ''
* ok 2: normalize path: . =>
* expecting success: test "$(test-path-utils normalize_path_copy './')" = ''
* ok 3: normalize path: ./ =>
* expecting success: test "$(test-path-utils normalize_path_copy './.')" = ''
* ok 4: normalize path: ./. =>
* expecting success: test "$(test-path-utils normalize_path_copy './..')" = '++failed++'
* ok 5: normalize path: ./.. => ++failed++
* expecting success: test "$(test-path-utils normalize_path_copy '../.')" = '++failed++'
* ok 6: normalize path: ../. => ++failed++
* expecting success: test "$(test-path-utils normalize_path_copy './.././/')" = '++failed++'
* ok 7: normalize path: ./../.// => ++failed++
* expecting success: test "$(test-path-utils normalize_path_copy 'dir/..')" = ''
* ok 8: normalize path: dir/.. =>
* expecting success: test "$(test-path-utils normalize_path_copy 'dir/sub/../..')" = ''
* ok 9: normalize path: dir/sub/../.. =>
* expecting success: test "$(test-path-utils normalize_path_copy 'dir/sub/../../..')" = '++failed++'
* ok 10: normalize path: dir/sub/../../.. => ++failed++
* expecting success: test "$(test-path-utils normalize_path_copy 'dir')" = 'dir'
* ok 11: normalize path: dir => dir
* expecting success: test "$(test-path-utils normalize_path_copy 'dir//')" = 'dir/'
* ok 12: normalize path: dir// => dir/
* expecting success: test "$(test-path-utils normalize_path_copy './dir')" = 'dir'
* ok 13: normalize path: ./dir => dir
* expecting success: test "$(test-path-utils normalize_path_copy 'dir/.')" = 'dir/'
* ok 14: normalize path: dir/. => dir/
* expecting success: test "$(test-path-utils normalize_path_copy 'dir///./')" = 'dir/'
* ok 15: normalize path: dir///./ => dir/
* expecting success: test "$(test-path-utils normalize_path_copy 'dir//sub/..')" = 'dir/'
* ok 16: normalize path: dir//sub/.. => dir/
* expecting success: test "$(test-path-utils normalize_path_copy 'dir/sub/../')" = 'dir/'
* ok 17: normalize path: dir/sub/../ => dir/
* expecting success: test "$(test-path-utils normalize_path_copy 'dir/sub/../.')" = 'dir/'
* ok 18: normalize path: dir/sub/../. => dir/
* expecting success: test "$(test-path-utils normalize_path_copy 'dir/s1/../s2/')" = 'dir/s2/'
* ok 19: normalize path: dir/s1/../s2/ => dir/s2/
* expecting success: test "$(test-path-utils normalize_path_copy 'd1/s1///s2/..//../s3/')" = 'd1/s3/'
* ok 20: normalize path: d1/s1///s2/..//../s3/ => d1/s3/
* expecting success: test "$(test-path-utils normalize_path_copy 'd1/s1//../s2/../../d2')" = 'd2'
* ok 21: normalize path: d1/s1//../s2/../../d2 => d2
* expecting success: test "$(test-path-utils normalize_path_copy 'd1/.../d2')" = 'd1/.../d2'
* ok 22: normalize path: d1/.../d2 => d1/.../d2
* expecting success: test "$(test-path-utils normalize_path_copy 'd1/..././../d2')" = 'd1/d2'
* ok 23: normalize path: d1/..././../d2 => d1/d2
* expecting success: test "$(test-path-utils normalize_path_copy '/')" = '/'
* ok 24: normalize path: / => /
* expecting success: test "$(test-path-utils normalize_path_copy '//')" = '/'
* ok 25: normalize path: // => /
* expecting success: test "$(test-path-utils normalize_path_copy '///')" = '/'
* ok 26: normalize path: /// => /
* expecting success: test "$(test-path-utils normalize_path_copy '/.')" = '/'
* ok 27: normalize path: /. => /
* expecting success: test "$(test-path-utils normalize_path_copy '/./')" = '/'
* ok 28: normalize path: /./ => /
* expecting success: test "$(test-path-utils normalize_path_copy '/./..')" = '++failed++'
* ok 29: normalize path: /./.. => ++failed++
* expecting success: test "$(test-path-utils normalize_path_copy '/../.')" = '++failed++'
* ok 30: normalize path: /../. => ++failed++
* expecting success: test "$(test-path-utils normalize_path_copy '/./.././/')" = '++failed++'
* ok 31: normalize path: /./../.// => ++failed++
* expecting success: test "$(test-path-utils normalize_path_copy '/dir/..')" = '/'
* ok 32: normalize path: /dir/.. => /
* expecting success: test "$(test-path-utils normalize_path_copy '/dir/sub/../..')" = '/'
* ok 33: normalize path: /dir/sub/../.. => /
* expecting success: test "$(test-path-utils normalize_path_copy '/dir/sub/../../..')" = '++failed++'
* ok 34: normalize path: /dir/sub/../../.. => ++failed++
* expecting success: test "$(test-path-utils normalize_path_copy '/dir')" = '/dir'
* ok 35: normalize path: /dir => /dir
* expecting success: test "$(test-path-utils normalize_path_copy '/dir//')" = '/dir/'
* ok 36: normalize path: /dir// => /dir/
* expecting success: test "$(test-path-utils normalize_path_copy '/./dir')" = '/dir'
* ok 37: normalize path: /./dir => /dir
* expecting success: test "$(test-path-utils normalize_path_copy '/dir/.')" = '/dir/'
* ok 38: normalize path: /dir/. => /dir/
* expecting success: test "$(test-path-utils normalize_path_copy '/dir///./')" = '/dir/'
* ok 39: normalize path: /dir///./ => /dir/
* expecting success: test "$(test-path-utils normalize_path_copy '/dir//sub/..')" = '/dir/'
* ok 40: normalize path: /dir//sub/.. => /dir/
* expecting success: test "$(test-path-utils normalize_path_copy '/dir/sub/../')" = '/dir/'
* ok 41: normalize path: /dir/sub/../ => /dir/
* expecting success: test "$(test-path-utils normalize_path_copy '//dir/sub/../.')" = '/dir/'
* ok 42: normalize path: //dir/sub/../. => /dir/
* expecting success: test "$(test-path-utils normalize_path_copy '/dir/s1/../s2/')" = '/dir/s2/'
* ok 43: normalize path: /dir/s1/../s2/ => /dir/s2/
* expecting success: test "$(test-path-utils normalize_path_copy '/d1/s1///s2/..//../s3/')" = '/d1/s3/'
* ok 44: normalize path: /d1/s1///s2/..//../s3/ => /d1/s3/
* expecting success: test "$(test-path-utils normalize_path_copy '/d1/s1//../s2/../../d2')" = '/d2'
* ok 45: normalize path: /d1/s1//../s2/../../d2 => /d2
* expecting success: test "$(test-path-utils normalize_path_copy '/d1/.../d2')" = '/d1/.../d2'
* ok 46: normalize path: /d1/.../d2 => /d1/.../d2
* expecting success: test "$(test-path-utils normalize_path_copy '/d1/..././../d2')" = '/d1/d2'
* ok 47: normalize path: /d1/..././../d2 => /d1/d2
* expecting success: actual=$(test-path-utils longest_ancestor_length '/' '') &&
test "$actual" = '-1'
* ok 48: longest ancestor: / => -1
* expecting success: actual=$(test-path-utils longest_ancestor_length '/' '/') &&
test "$actual" = '-1'
* ok 49: longest ancestor: / / => -1
* expecting success: actual=$(test-path-utils longest_ancestor_length '/foo' '') &&
test "$actual" = '-1'
* ok 50: longest ancestor: /foo => -1
* expecting success: actual=$(test-path-utils longest_ancestor_length '/foo' ':') &&
test "$actual" = '-1'
* ok 51: longest ancestor: /foo : => -1
* expecting success: actual=$(test-path-utils longest_ancestor_length '/foo' '::.') &&
test "$actual" = '-1'
* ok 52: longest ancestor: /foo ::. => -1
* expecting success: actual=$(test-path-utils longest_ancestor_length '/foo' '::..::') &&
test "$actual" = '-1'
* ok 53: longest ancestor: /foo ::..:: => -1
* expecting success: actual=$(test-path-utils longest_ancestor_length '/foo' '/') &&
test "$actual" = '0'
* ok 54: longest ancestor: /foo / => 0
* expecting success: actual=$(test-path-utils longest_ancestor_length '/foo' '/fo') &&
test "$actual" = '-1'
* ok 55: longest ancestor: /foo /fo => -1
* expecting success: actual=$(test-path-utils longest_ancestor_length '/foo' '/foo') &&
test "$actual" = '-1'
* ok 56: longest ancestor: /foo /foo => -1
* expecting success: actual=$(test-path-utils longest_ancestor_length '/foo' '/foo/') &&
test "$actual" = '-1'
* ok 57: longest ancestor: /foo /foo/ => -1
* expecting success: actual=$(test-path-utils longest_ancestor_length '/foo' '/bar') &&
test "$actual" = '-1'
* ok 58: longest ancestor: /foo /bar => -1
* expecting success: actual=$(test-path-utils longest_ancestor_length '/foo' '/bar/') &&
test "$actual" = '-1'
* ok 59: longest ancestor: /foo /bar/ => -1
* expecting success: actual=$(test-path-utils longest_ancestor_length '/foo' '/foo/bar') &&
test "$actual" = '-1'
* ok 60: longest ancestor: /foo /foo/bar => -1
* expecting success: actual=$(test-path-utils longest_ancestor_length '/foo' '/foo:/bar/') &&
test "$actual" = '-1'
* ok 61: longest ancestor: /foo /foo:/bar/ => -1
* expecting success: actual=$(test-path-utils longest_ancestor_length '/foo' '/foo/:/bar/') &&
test "$actual" = '-1'
* ok 62: longest ancestor: /foo /foo/:/bar/ => -1
* expecting success: actual=$(test-path-utils longest_ancestor_length '/foo' '/foo::/bar/') &&
test "$actual" = '-1'
* ok 63: longest ancestor: /foo /foo::/bar/ => -1
* expecting success: actual=$(test-path-utils longest_ancestor_length '/foo' '/:/foo:/bar/') &&
test "$actual" = '0'
* ok 64: longest ancestor: /foo /:/foo:/bar/ => 0
* expecting success: actual=$(test-path-utils longest_ancestor_length '/foo' '/foo:/:/bar/') &&
test "$actual" = '0'
* ok 65: longest ancestor: /foo /foo:/:/bar/ => 0
* expecting success: actual=$(test-path-utils longest_ancestor_length '/foo' '/:/bar/:/foo') &&
test "$actual" = '0'
* ok 66: longest ancestor: /foo /:/bar/:/foo => 0
* expecting success: actual=$(test-path-utils longest_ancestor_length '/foo/bar' '') &&
test "$actual" = '-1'
* ok 67: longest ancestor: /foo/bar => -1
* expecting success: actual=$(test-path-utils longest_ancestor_length '/foo/bar' '/') &&
test "$actual" = '0'
* ok 68: longest ancestor: /foo/bar / => 0
* expecting success: actual=$(test-path-utils longest_ancestor_length '/foo/bar' '/fo') &&
test "$actual" = '-1'
* ok 69: longest ancestor: /foo/bar /fo => -1
* expecting success: actual=$(test-path-utils longest_ancestor_length '/foo/bar' 'foo') &&
test "$actual" = '-1'
* ok 70: longest ancestor: /foo/bar foo => -1
* expecting success: actual=$(test-path-utils longest_ancestor_length '/foo/bar' '/foo') &&
test "$actual" = '4'
* ok 71: longest ancestor: /foo/bar /foo => 4
* expecting success: actual=$(test-path-utils longest_ancestor_length '/foo/bar' '/foo/') &&
test "$actual" = '4'
* ok 72: longest ancestor: /foo/bar /foo/ => 4
* expecting success: actual=$(test-path-utils longest_ancestor_length '/foo/bar' '/foo/ba') &&
test "$actual" = '-1'
* ok 73: longest ancestor: /foo/bar /foo/ba => -1
* expecting success: actual=$(test-path-utils longest_ancestor_length '/foo/bar' '/:/fo') &&
test "$actual" = '0'
* ok 74: longest ancestor: /foo/bar /:/fo => 0
* expecting success: actual=$(test-path-utils longest_ancestor_length '/foo/bar' '/foo:/foo/ba') &&
test "$actual" = '4'
* ok 75: longest ancestor: /foo/bar /foo:/foo/ba => 4
* expecting success: actual=$(test-path-utils longest_ancestor_length '/foo/bar' '/bar') &&
test "$actual" = '-1'
* ok 76: longest ancestor: /foo/bar /bar => -1
* expecting success: actual=$(test-path-utils longest_ancestor_length '/foo/bar' '/bar/') &&
test "$actual" = '-1'
* ok 77: longest ancestor: /foo/bar /bar/ => -1
* expecting success: actual=$(test-path-utils longest_ancestor_length '/foo/bar' '/fo:') &&
test "$actual" = '-1'
* ok 78: longest ancestor: /foo/bar /fo: => -1
* expecting success: actual=$(test-path-utils longest_ancestor_length '/foo/bar' ':/fo') &&
test "$actual" = '-1'
* ok 79: longest ancestor: /foo/bar :/fo => -1
* expecting success: actual=$(test-path-utils longest_ancestor_length '/foo/bar' '/foo:/bar/') &&
test "$actual" = '4'
* ok 80: longest ancestor: /foo/bar /foo:/bar/ => 4
* expecting success: actual=$(test-path-utils longest_ancestor_length '/foo/bar' '/:/foo:/bar/') &&
test "$actual" = '4'
* ok 81: longest ancestor: /foo/bar /:/foo:/bar/ => 4
* expecting success: actual=$(test-path-utils longest_ancestor_length '/foo/bar' '/foo:/:/bar/') &&
test "$actual" = '4'
* ok 82: longest ancestor: /foo/bar /foo:/:/bar/ => 4
* expecting success: actual=$(test-path-utils longest_ancestor_length '/foo/bar' '/:/bar/:/fo') &&
test "$actual" = '0'
* ok 83: longest ancestor: /foo/bar /:/bar/:/fo => 0
* expecting success: actual=$(test-path-utils longest_ancestor_length '/foo/bar' '/:/bar/') &&
test "$actual" = '0'
* ok 84: longest ancestor: /foo/bar /:/bar/ => 0
* expecting success: actual=$(test-path-utils longest_ancestor_length '/foo/bar' '.:/foo/.') &&
test "$actual" = '4'
* ok 85: longest ancestor: /foo/bar .:/foo/. => 4
* expecting success: actual=$(test-path-utils longest_ancestor_length '/foo/bar' '.:/foo/.:.:') &&
test "$actual" = '4'
* ok 86: longest ancestor: /foo/bar .:/foo/.:.: => 4
* expecting success: actual=$(test-path-utils longest_ancestor_length '/foo/bar' '/foo/./:.:/bar') &&
test "$actual" = '4'
* ok 87: longest ancestor: /foo/bar /foo/./:.:/bar => 4
* expecting success: actual=$(test-path-utils longest_ancestor_length '/foo/bar' '.:/bar') &&
test "$actual" = '-1'
* ok 88: longest ancestor: /foo/bar .:/bar => -1
* expecting success:
test c:/msysgit = $(test-path-utils strip_path_suffix \
c:/msysgit/libexec//git-core libexec/git-core)
* ok 89: strip_path_suffix
* passed all 89 test(s)
*** t0070-fundamental.sh ***
Initialized empty Git repository in /build/buildd/git-core-1.6.3.3/t/trash directory.t0070-fundamental/.git/
* expecting success:
test-ctype
* ok 1: character classes (isspace, isalpha etc.)
* passed all 1 test(s)
*** t0100-previous.sh ***
Initialized empty Git repository in /build/buildd/git-core-1.6.3.3/t/trash directory.t0100-previous/.git/
* expecting success:
test_commit A &&
git checkout -b junk &&
git checkout - &&
test "$(git symbolic-ref HEAD)" = refs/heads/master &&
git branch -d @{-1} &&
test_must_fail git rev-parse --verify refs/heads/junk
[master (root-commit) 0ddfaf1] A
1 files changed, 1 insertions(+), 0 deletions(-)
create mode 100644 A.t
Switched to a new branch 'junk'
Switched to branch 'master'
Deleted branch junk (was 0ddfaf1).
fatal: Needed a single revision
* ok 1: branch -d @{-1}
* expecting success:
git reflog expire --expire=now &&
git checkout -b junk2 &&
git checkout - &&
test "$(git symbolic-ref HEAD)" = refs/heads/master &&
test_must_fail git branch -d @{-12} &&
git rev-parse --verify refs/heads/master
Switched to a new branch 'junk2'
Switched to branch 'master'
error: branch '@{-12}' not found.
0ddfaf193ff13d6ab39b7cbd9eed645e3ee2f050
* ok 2: branch -d @{-12} when there is not enough switches yet
* expecting success:
git checkout A &&
test_commit B &&
git checkout A &&
test_commit C &&
git branch -f master B &&
git branch -f other &&
git checkout other &&
git checkout master &&
git merge @{-1} &&
git cat-file commit HEAD | grep "Merge branch 'other'"
Note: moving to 'A' which isn't a local branch
If you want to create a new branch from this checkout, you may do so
(now or later) by using -b with the checkout command again. Example:
git checkout -b <new_branch_name>
HEAD is now at 0ddfaf1... A
[detached HEAD d9df450] B
1 files changed, 1 insertions(+), 0 deletions(-)
create mode 100644 B.t
Previous HEAD position was d9df450... B
HEAD is now at 0ddfaf1... A
[detached HEAD 5dee784] C
1 files changed, 1 insertions(+), 0 deletions(-)
create mode 100644 C.t
Switched to branch 'other'
Switched to branch 'master'
Merging:
d9df450 B
virtual @{-1}
found 1 common ancestor(s):
0ddfaf1 A
Merge made by recursive.
C.t | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)
create mode 100644 C.t
Merge branch 'other'
* ok 3: merge @{-1}
* expecting success:
git reflog expire --expire=now &&
git checkout -f master &&
git reset --hard B &&
git branch -f other C &&
git checkout other &&
git checkout master &&
test_must_fail git merge @{-12}
Already on 'master'
HEAD is now at d9df450 B
Switched to branch 'other'
Switched to branch 'master'
fatal: '@{-12}' does not point to a commit
* ok 4: merge @{-1} when there is not enough switches yet
* passed all 4 test(s)
*** t1000-read-tree-m-3way.sh ***
Initialized empty Git repository in /build/buildd/git-core-1.6.3.3/t/trash directory.t1000-read-tree-m-3way/.git/
* expecting success: git update-index --add $p &&
git update-index --add Z/$p
* ok 1: adding test file NN and Z/NN
* expecting success: git update-index --add $p &&
git update-index --add Z/$p
* ok 2: adding test file ND and Z/ND
* expecting success: git update-index --add $p &&
git update-index --add Z/$p
* ok 3: adding test file NM and Z/NM
* expecting success: git update-index --add $p &&
git update-index --add Z/$p
* ok 4: adding test file DN and Z/DN
* expecting success: git update-index --add $p &&
git update-index --add Z/$p
* ok 5: adding test file DD and Z/DD
* expecting success: git update-index --add $p &&
git update-index --add Z/$p
* ok 6: adding test file DM and Z/DM
* expecting success: git update-index --add $p &&
git update-index --add Z/$p
* ok 7: adding test file MN and Z/MN
* expecting success: git update-index --add $p &&
git update-index --add Z/$p
* ok 8: adding test file MD and Z/MD
* expecting success: git update-index --add $p &&
git update-index --add Z/$p
* ok 9: adding test file MM and Z/MM
* expecting success: git update-index --add SS
* ok 10: adding test file SS
* expecting success: git update-index --add TT
* ok 11: adding test file TT
* expecting success: tree_O=$(git write-tree)
* ok 12: prepare initial tree
* expecting success: git update-index --remove $to_remove
* ok 13: change in branch A (removal)
* expecting success: git update-index MD
* ok 14: change in branch A (modification)
* expecting success: git update-index MM
* ok 15: change in branch A (modification)
* expecting success: git update-index MN
* ok 16: change in branch A (modification)
* expecting success: git update-index Z/MD
* ok 17: change in branch A (modification)
* expecting success: git update-index Z/MM
* ok 18: change in branch A (modification)
* expecting success: git update-index Z/MN
* ok 19: change in branch A (modification)
* expecting success: git update-index --add AN
* ok 20: change in branch A (addition)
* expecting success: git update-index --add AA
* ok 21: change in branch A (addition)
* expecting success: git update-index --add Z/AN
* ok 22: change in branch A (addition)
* expecting success: git update-index --add Z/AA
* ok 23: change in branch A (addition)
* expecting success: git update-index --add LL &&
git update-index SS
* ok 24: change in branch A (addition)
* expecting success: git update-index TT
* ok 25: change in branch A (edit)
* expecting success: git update-index --add DF/DF
* ok 26: change in branch A (change file to directory)
* expecting success: tree_A=$(git write-tree)
* ok 27: recording branch A tree
* expecting success: git read-tree $tree_O &&
git checkout-index -a
* ok 28: reading original tree and checking out
* expecting success: git update-index --remove DD MD ND Z/DD Z/MD Z/ND
* ok 29: change in branch B (removal)
* expecting success: git update-index DM
* ok 30: change in branch B (modification)
* expecting success: git update-index MM
* ok 31: change in branch B (modification)
* expecting success: git update-index NM
* ok 32: change in branch B (modification)
* expecting success: git update-index Z/DM
* ok 33: change in branch B (modification)
* expecting success: git update-index Z/MM
* ok 34: change in branch B (modification)
* expecting success: git update-index Z/NM
* ok 35: change in branch B (modification)
* expecting success: git update-index --add NA
* ok 36: change in branch B (addition)
* expecting success: git update-index --add AA
* ok 37: change in branch B (addition)
* expecting success: git update-index --add Z/NA
* ok 38: change in branch B (addition)
* expecting success: git update-index --add Z/AA
* ok 39: change in branch B (addition)
* expecting success: git update-index --add LL &&
git update-index SS
* ok 40: change in branch B (addition and modification)
* expecting success: git update-index TT
* ok 41: change in branch B (modification)
* expecting success: git update-index --add DF
* ok 42: change in branch B (addition of a file to conflict with directory)
* expecting success: tree_B=$(git write-tree)
* ok 43: recording branch B tree
* expecting success: rm -f .git/index &&
git read-tree $tree_O &&
mkdir .orig-O &&
git checkout-index --prefix=.orig-O/ -f -q -a &&
rm -f .git/index &&
git read-tree $tree_A &&
mkdir .orig-A &&
git checkout-index --prefix=.orig-A/ -f -q -a &&
rm -f .git/index &&
git read-tree $tree_B &&
mkdir .orig-B &&
git checkout-index --prefix=.orig-B/ -f -q -a
* ok 44: keep contents of 3 trees for easy access
* expecting success: rm -fr [NDMALTS][NDMALTSF] Z &&
rm .git/index &&
git read-tree -m 3fe085e0589de4327971d50e416fc292dd00fbfe 997bbc4a0a51e0574168a4f637739380edebe4d7 76d47d681d7f1d4fa975334a9a0ba8a6eeea2226 &&
check_result
* ok 45: 3-way merge with git read-tree -m, empty cache
* expecting success: rm -fr [NDMALTS][NDMALTSF] Z &&
rm .git/index &&
git read-tree 997bbc4a0a51e0574168a4f637739380edebe4d7 &&
git checkout-index -f -u -a &&
git read-tree -m 3fe085e0589de4327971d50e416fc292dd00fbfe 997bbc4a0a51e0574168a4f637739380edebe4d7 76d47d681d7f1d4fa975334a9a0ba8a6eeea2226 &&
check_result
* ok 46: 3-way merge with git read-tree -m, match H
* expecting success:
rm -f .git/index XX &&
echo XX >XX &&
git update-index --add XX &&
test_must_fail git read-tree -m 3fe085e0589de4327971d50e416fc292dd00fbfe 997bbc4a0a51e0574168a4f637739380edebe4d7 76d47d681d7f1d4fa975334a9a0ba8a6eeea2226
error: Entry 'XX' would be overwritten by merge. Cannot merge.
* ok 47: 1 - must not have an entry not in A.
* expecting success: rm -f .git/index NA &&
cp .orig-B/NA NA &&
git update-index --add NA &&
git read-tree -m 3fe085e0589de4327971d50e416fc292dd00fbfe 997bbc4a0a51e0574168a4f637739380edebe4d7 76d47d681d7f1d4fa975334a9a0ba8a6eeea2226
* ok 48: 2 - must match B in !O && !A && B case.
* expecting success: rm -f .git/index NA &&
cp .orig-B/NA NA &&
git update-index --add NA &&
echo extra >>NA &&
git read-tree -m 3fe085e0589de4327971d50e416fc292dd00fbfe 997bbc4a0a51e0574168a4f637739380edebe4d7 76d47d681d7f1d4fa975334a9a0ba8a6eeea2226
* ok 49: 2 - matching B alone is OK in !O && !A && B case.
* expecting success: rm -f .git/index AN &&
cp .orig-A/AN AN &&
git update-index --add AN &&
git read-tree -m 3fe085e0589de4327971d50e416fc292dd00fbfe 997bbc4a0a51e0574168a4f637739380edebe4d7 76d47d681d7f1d4fa975334a9a0ba8a6eeea2226 &&
check_result
* ok 50: 3 - must match A in !O && A && !B case.
* expecting success: rm -f .git/index AN &&
cp .orig-A/AN AN &&
git update-index --add AN &&
echo extra >>AN &&
git read-tree -m 3fe085e0589de4327971d50e416fc292dd00fbfe 997bbc4a0a51e0574168a4f637739380edebe4d7 76d47d681d7f1d4fa975334a9a0ba8a6eeea2226
* ok 51: 3 - matching A alone is OK in !O && A && !B case.
* expecting success:
rm -f .git/index AN &&
cp .orig-A/AN AN &&
echo extra >>AN &&
git update-index --add AN &&
test_must_fail git read-tree -m 3fe085e0589de4327971d50e416fc292dd00fbfe 997bbc4a0a51e0574168a4f637739380edebe4d7 76d47d681d7f1d4fa975334a9a0ba8a6eeea2226
error: Entry 'AN' would be overwritten by merge. Cannot merge.
* ok 52: 3 (fail) - must match A in !O && A && !B case.
* expecting success: rm -f .git/index AA &&
cp .orig-A/AA AA &&
git update-index --add AA &&
git read-tree -m 3fe085e0589de4327971d50e416fc292dd00fbfe 997bbc4a0a51e0574168a4f637739380edebe4d7 76d47d681d7f1d4fa975334a9a0ba8a6eeea2226 &&
check_result
* ok 53: 4 - must match and be up-to-date in !O && A && B && A!=B case.
* expecting success:
rm -f .git/index AA &&
cp .orig-A/AA AA &&
git update-index --add AA &&
echo extra >>AA &&
test_must_fail git read-tree -m 3fe085e0589de4327971d50e416fc292dd00fbfe 997bbc4a0a51e0574168a4f637739380edebe4d7 76d47d681d7f1d4fa975334a9a0ba8a6eeea2226
error: Entry 'AA' not uptodate. Cannot merge.
* ok 54: 4 (fail) - must match and be up-to-date in !O && A && B && A!=B case.
* expecting success:
rm -f .git/index AA &&
cp .orig-A/AA AA &&
echo extra >>AA &&
git update-index --add AA &&
test_must_fail git read-tree -m 3fe085e0589de4327971d50e416fc292dd00fbfe 997bbc4a0a51e0574168a4f637739380edebe4d7 76d47d681d7f1d4fa975334a9a0ba8a6eeea2226
error: Entry 'AA' would be overwritten by merge. Cannot merge.
* ok 55: 4 (fail) - must match and be up-to-date in !O && A && B && A!=B case.
* expecting success: rm -f .git/index LL &&
cp .orig-A/LL LL &&
git update-index --add LL &&
git read-tree -m 3fe085e0589de4327971d50e416fc292dd00fbfe 997bbc4a0a51e0574168a4f637739380edebe4d7 76d47d681d7f1d4fa975334a9a0ba8a6eeea2226 &&
check_result
* ok 56: 5 - must match in !O && A && B && A==B case.
* expecting success: rm -f .git/index LL &&
cp .orig-A/LL LL &&
git update-index --add LL &&
echo extra >>LL &&
git read-tree -m 3fe085e0589de4327971d50e416fc292dd00fbfe 997bbc4a0a51e0574168a4f637739380edebe4d7 76d47d681d7f1d4fa975334a9a0ba8a6eeea2226 &&
check_result
* ok 57: 5 - must match in !O && A && B && A==B case.
* expecting success:
rm -f .git/index LL &&
cp .orig-A/LL LL &&
echo extra >>LL &&
git update-index --add LL &&
test_must_fail git read-tree -m 3fe085e0589de4327971d50e416fc292dd00fbfe 997bbc4a0a51e0574168a4f637739380edebe4d7 76d47d681d7f1d4fa975334a9a0ba8a6eeea2226
error: Entry 'LL' would be overwritten by merge. Cannot merge.
* ok 58: 5 (fail) - must match A in !O && A && B && A==B case.
* expecting success:
rm -f .git/index DD &&
echo DD >DD
git update-index --add DD &&
test_must_fail git read-tree -m 3fe085e0589de4327971d50e416fc292dd00fbfe 997bbc4a0a51e0574168a4f637739380edebe4d7 76d47d681d7f1d4fa975334a9a0ba8a6eeea2226
error: Entry 'DD' would be overwritten by merge. Cannot merge.
* ok 59: 6 - must not exist in O && !A && !B case
* expecting success:
rm -f .git/index DM &&
cp .orig-B/DM DM &&
git update-index --add DM &&
test_must_fail git read-tree -m 3fe085e0589de4327971d50e416fc292dd00fbfe 997bbc4a0a51e0574168a4f637739380edebe4d7 76d47d681d7f1d4fa975334a9a0ba8a6eeea2226
error: Entry 'DM' would be overwritten by merge. Cannot merge.
* ok 60: 7 - must not exist in O && !A && B && O!=B case
* expecting success:
rm -f .git/index DN &&
cp .orig-B/DN DN &&
git update-index --add DN &&
test_must_fail git read-tree -m 3fe085e0589de4327971d50e416fc292dd00fbfe 997bbc4a0a51e0574168a4f637739380edebe4d7 76d47d681d7f1d4fa975334a9a0ba8a6eeea2226
error: Entry 'DN' would be overwritten by merge. Cannot merge.
* ok 61: 8 - must not exist in O && !A && B && O==B case
* expecting success: rm -f .git/index MD &&
cp .orig-A/MD MD &&
git update-index --add MD &&
git read-tree -m 3fe085e0589de4327971d50e416fc292dd00fbfe 997bbc4a0a51e0574168a4f637739380edebe4d7 76d47d681d7f1d4fa975334a9a0ba8a6eeea2226 &&
check_result
* ok 62: 9 - must match and be up-to-date in O && A && !B && O!=A case
* expecting success:
rm -f .git/index MD &&
cp .orig-A/MD MD &&
git update-index --add MD &&
echo extra >>MD &&
test_must_fail git read-tree -m 3fe085e0589de4327971d50e416fc292dd00fbfe 997bbc4a0a51e0574168a4f637739380edebe4d7 76d47d681d7f1d4fa975334a9a0ba8a6eeea2226
error: Entry 'MD' not uptodate. Cannot merge.
* ok 63: 9 (fail) - must match and be up-to-date in O && A && !B && O!=A case
* expecting success:
rm -f .git/index MD &&
cp .orig-A/MD MD &&
echo extra >>MD &&
git update-index --add MD &&
test_must_fail git read-tree -m 3fe085e0589de4327971d50e416fc292dd00fbfe 997bbc4a0a51e0574168a4f637739380edebe4d7 76d47d681d7f1d4fa975334a9a0ba8a6eeea2226
error: Entry 'MD' would be overwritten by merge. Cannot merge.
* ok 64: 9 (fail) - must match and be up-to-date in O && A && !B && O!=A case
* expecting success: rm -f .git/index ND &&
cp .orig-A/ND ND &&
git update-index --add ND &&
git read-tree -m 3fe085e0589de4327971d50e416fc292dd00fbfe 997bbc4a0a51e0574168a4f637739380edebe4d7 76d47d681d7f1d4fa975334a9a0ba8a6eeea2226 &&
check_result
* ok 65: 10 - must match and be up-to-date in O && A && !B && O==A case
* expecting success:
rm -f .git/index ND &&
cp .orig-A/ND ND &&
git update-index --add ND &&
echo extra >>ND &&
test_must_fail git read-tree -m 3fe085e0589de4327971d50e416fc292dd00fbfe 997bbc4a0a51e0574168a4f637739380edebe4d7 76d47d681d7f1d4fa975334a9a0ba8a6eeea2226
error: Entry 'ND' not uptodate. Cannot merge.
* ok 66: 10 (fail) - must match and be up-to-date in O && A && !B && O==A case
* expecting success:
rm -f .git/index ND &&
cp .orig-A/ND ND &&
echo extra >>ND &&
git update-index --add ND &&
test_must_fail git read-tree -m 3fe085e0589de4327971d50e416fc292dd00fbfe 997bbc4a0a51e0574168a4f637739380edebe4d7 76d47d681d7f1d4fa975334a9a0ba8a6eeea2226
error: Entry 'ND' would be overwritten by merge. Cannot merge.
* ok 67: 10 (fail) - must match and be up-to-date in O && A && !B && O==A case
* expecting success: rm -f .git/index MM &&
cp .orig-A/MM MM &&
git update-index --add MM &&
git read-tree -m 3fe085e0589de4327971d50e416fc292dd00fbfe 997bbc4a0a51e0574168a4f637739380edebe4d7 76d47d681d7f1d4fa975334a9a0ba8a6eeea2226 &&
check_result
* ok 68: 11 - must match and be up-to-date in O && A && B && O!=A && O!=B && A!=B case
* expecting success:
rm -f .git/index MM &&
cp .orig-A/MM MM &&
git update-index --add MM &&
echo extra >>MM &&
test_must_fail git read-tree -m 3fe085e0589de4327971d50e416fc292dd00fbfe 997bbc4a0a51e0574168a4f637739380edebe4d7 76d47d681d7f1d4fa975334a9a0ba8a6eeea2226
error: Entry 'MM' not uptodate. Cannot merge.
* ok 69: 11 (fail) - must match and be up-to-date in O && A && B && O!=A && O!=B && A!=B case
* expecting success:
rm -f .git/index MM &&
cp .orig-A/MM MM &&
echo extra >>MM &&
git update-index --add MM &&
test_must_fail git read-tree -m 3fe085e0589de4327971d50e416fc292dd00fbfe 997bbc4a0a51e0574168a4f637739380edebe4d7 76d47d681d7f1d4fa975334a9a0ba8a6eeea2226
error: Entry 'MM' would be overwritten by merge. Cannot merge.
* ok 70: 11 (fail) - must match and be up-to-date in O && A && B && O!=A && O!=B && A!=B case
* expecting success: rm -f .git/index SS &&
cp .orig-A/SS SS &&
git update-index --add SS &&
git read-tree -m 3fe085e0589de4327971d50e416fc292dd00fbfe 997bbc4a0a51e0574168a4f637739380edebe4d7 76d47d681d7f1d4fa975334a9a0ba8a6eeea2226 &&
check_result
* ok 71: 12 - must match A in O && A && B && O!=A && A==B case
* expecting success: rm -f .git/index SS &&
cp .orig-A/SS SS &&
git update-index --add SS &&
echo extra >>SS &&
git read-tree -m 3fe085e0589de4327971d50e416fc292dd00fbfe 997bbc4a0a51e0574168a4f637739380edebe4d7 76d47d681d7f1d4fa975334a9a0ba8a6eeea2226 &&
check_result
* ok 72: 12 - must match A in O && A && B && O!=A && A==B case
* expecting success:
rm -f .git/index SS &&
cp .orig-A/SS SS &&
echo extra >>SS &&
git update-index --add SS &&
test_must_fail git read-tree -m 3fe085e0589de4327971d50e416fc292dd00fbfe 997bbc4a0a51e0574168a4f637739380edebe4d7 76d47d681d7f1d4fa975334a9a0ba8a6eeea2226
error: Entry 'SS' would be overwritten by merge. Cannot merge.
* ok 73: 12 (fail) - must match A in O && A && B && O!=A && A==B case
* expecting success: rm -f .git/index MN &&
cp .orig-A/MN MN &&
git update-index --add MN &&
git read-tree -m 3fe085e0589de4327971d50e416fc292dd00fbfe 997bbc4a0a51e0574168a4f637739380edebe4d7 76d47d681d7f1d4fa975334a9a0ba8a6eeea2226 &&
check_result
* ok 74: 13 - must match A in O && A && B && O!=A && O==B case
* expecting success: rm -f .git/index MN &&
cp .orig-A/MN MN &&
git update-index --add MN &&
echo extra >>MN &&
git read-tree -m 3fe085e0589de4327971d50e416fc292dd00fbfe 997bbc4a0a51e0574168a4f637739380edebe4d7 76d47d681d7f1d4fa975334a9a0ba8a6eeea2226 &&
check_result
* ok 75: 13 - must match A in O && A && B && O!=A && O==B case
* expecting success: rm -f .git/index NM &&
cp .orig-A/NM NM &&
git update-index --add NM &&
git read-tree -m 3fe085e0589de4327971d50e416fc292dd00fbfe 997bbc4a0a51e0574168a4f637739380edebe4d7 76d47d681d7f1d4fa975334a9a0ba8a6eeea2226 &&
check_result
* ok 76: 14 - must match and be up-to-date in O && A && B && O==A && O!=B case
* expecting success: rm -f .git/index NM &&
cp .orig-B/NM NM &&
git update-index --add NM &&
echo extra >>NM &&
git read-tree -m 3fe085e0589de4327971d50e416fc292dd00fbfe 997bbc4a0a51e0574168a4f637739380edebe4d7 76d47d681d7f1d4fa975334a9a0ba8a6eeea2226 &&
check_result
* ok 77: 14 - may match B in O && A && B && O==A && O!=B case
* expecting success:
rm -f .git/index NM &&
cp .orig-A/NM NM &&
git update-index --add NM &&
echo extra >>NM &&
test_must_fail git read-tree -m 3fe085e0589de4327971d50e416fc292dd00fbfe 997bbc4a0a51e0574168a4f637739380edebe4d7 76d47d681d7f1d4fa975334a9a0ba8a6eeea2226
error: Entry 'NM' not uptodate. Cannot merge.
* ok 78: 14 (fail) - must match and be up-to-date in O && A && B && O==A && O!=B case
* expecting success:
rm -f .git/index NM &&
cp .orig-A/NM NM &&
echo extra >>NM &&
git update-index --add NM &&
test_must_fail git read-tree -m 3fe085e0589de4327971d50e416fc292dd00fbfe 997bbc4a0a51e0574168a4f637739380edebe4d7 76d47d681d7f1d4fa975334a9a0ba8a6eeea2226
error: Entry 'NM' would be overwritten by merge. Cannot merge.
* ok 79: 14 (fail) - must match and be up-to-date in O && A && B && O==A && O!=B case
* expecting success: rm -f .git/index NN &&
cp .orig-A/NN NN &&
git update-index --add NN &&
git read-tree -m 3fe085e0589de4327971d50e416fc292dd00fbfe 997bbc4a0a51e0574168a4f637739380edebe4d7 76d47d681d7f1d4fa975334a9a0ba8a6eeea2226 &&
check_result
* ok 80: 15 - must match A in O && A && B && O==A && O==B case
* expecting success: rm -f .git/index NN &&
cp .orig-A/NN NN &&
git update-index --add NN &&
echo extra >>NN &&
git read-tree -m 3fe085e0589de4327971d50e416fc292dd00fbfe 997bbc4a0a51e0574168a4f637739380edebe4d7 76d47d681d7f1d4fa975334a9a0ba8a6eeea2226 &&
check_result
* ok 81: 15 - must match A in O && A && B && O==A && O==B case
* expecting success:
rm -f .git/index NN &&
cp .orig-A/NN NN &&
echo extra >>NN &&
git update-index --add NN &&
test_must_fail git read-tree -m 3fe085e0589de4327971d50e416fc292dd00fbfe 997bbc4a0a51e0574168a4f637739380edebe4d7 76d47d681d7f1d4fa975334a9a0ba8a6eeea2226
error: Entry 'NN' would be overwritten by merge. Cannot merge.
* ok 82: 15 (fail) - must match A in O && A && B && O==A && O==B case
* expecting success: rm -f .git/index F16 &&
echo F16 >F16 &&
git update-index --add F16 &&
tree0=`git write-tree` &&
echo E16 >F16 &&
git update-index F16 &&
tree1=`git write-tree` &&
git read-tree -m $tree0 $tree1 $tree1 $tree0 &&
git ls-files --stage
100644 ecbec6db011caa3ae26739812f092f76875fe6b6 2 F16
100644 bcf4afda2c30299bf6538240d40bcb8fb3857691 3 F16
* ok 83: 16 - A matches in one and B matches in another.
* passed all 83 test(s)
*** t1001-read-tree-m-2way.sh ***
Initialized empty Git repository in /build/buildd/git-core-1.6.3.3/t/trash directory.t1001-read-tree-m-2way/.git/
* expecting success: echo frotz >frotz &&
echo nitfol >nitfol &&
cat bozbar-old >bozbar &&
echo rezrov >rezrov &&
echo yomin >yomin &&
git update-index --add nitfol bozbar rezrov &&
treeH=`git write-tree` &&
echo treeH $treeH &&
git ls-tree $treeH &&
cat bozbar-new >bozbar &&
git update-index --add frotz bozbar --force-remove rezrov &&
git ls-files --stage >M.out &&
treeM=`git write-tree` &&
echo treeM $treeM &&
git ls-tree $treeM &&
git diff-tree $treeH $treeM
treeH a84bea48d4a65941237a1b3f2ff9183c587868be
100644 blob ddecab218f1d9be94290870bd7feb2ca250eedc0 bozbar
100644 blob dca6b92303befc93086aa025d90a5facd7eb2812 nitfol
100644 blob 766498d93a4b06057a8e49d23f4068f1170ff38f rezrov
treeM f1ddde56821fe484a99881139dd00299d1578a60
100644 blob b122a38d94a66f65ac8ec7438679fa782962300d bozbar
100644 blob 8e4020bb5a8d8c873b25de15933e75cc0fc275df frotz
100644 blob dca6b92303befc93086aa025d90a5facd7eb2812 nitfol
:100644 100644 ddecab218f1d9be94290870bd7feb2ca250eedc0 b122a38d94a66f65ac8ec7438679fa782962300d M bozbar
:000000 100644 0000000000000000000000000000000000000000 8e4020bb5a8d8c873b25de15933e75cc0fc275df A frotz
:100644 000000 766498d93a4b06057a8e49d23f4068f1170ff38f 0000000000000000000000000000000000000000 D rezrov
* ok 1: setup
* expecting success: rm -f .git/index &&
read_tree_twoway $treeH $treeM &&
git ls-files --stage >1-3.out &&
test_cmp M.out 1-3.out &&
check_cache_at bozbar dirty &&
check_cache_at frotz dirty &&
check_cache_at nitfol dirty
100644 b122a38d94a66f65ac8ec7438679fa782962300d 0 bozbar
100644 8e4020bb5a8d8c873b25de15933e75cc0fc275df 0 frotz
100644 dca6b92303befc93086aa025d90a5facd7eb2812 0 nitfol
bozbar: dirty
frotz: dirty
nitfol: dirty
* ok 2: 1, 2, 3 - no carry forward
* expecting success: rm -f .git/index &&
git read-tree $treeH &&
git checkout-index -u -f -q -a &&
git update-index --add yomin &&
read_tree_twoway $treeH $treeM &&
git ls-files --stage >4.out || return 1
git diff --no-index M.out 4.out >4diff.out
compare_change 4diff.out expected &&
check_cache_at yomin clean
100644 b122a38d94a66f65ac8ec7438679fa782962300d 0 bozbar
100644 8e4020bb5a8d8c873b25de15933e75cc0fc275df 0 frotz
100644 dca6b92303befc93086aa025d90a5facd7eb2812 0 nitfol
100644 0a41e115ab61be0328a19b29f18cdcb49338d516 0 yomin
--- expected 2009-10-07 13:32:16.000000000 +0000
+++ current 2009-10-07 13:32:16.000000000 +0000
@@ -1 +0,0 @@
-+100644 X 0 yomin
* FAIL 3: 4 - carry forward local addition.
rm -f .git/index &&
git read-tree $treeH &&
git checkout-index -u -f -q -a &&
git update-index --add yomin &&
read_tree_twoway $treeH $treeM &&
git ls-files --stage >4.out || return 1
git diff --no-index M.out 4.out >4diff.out
compare_change 4diff.out expected &&
check_cache_at yomin clean
* expecting success: rm -f .git/index &&
git read-tree $treeH &&
git checkout-index -u -f -q -a &&
echo yomin >yomin &&
git update-index --add yomin &&
echo yomin yomin >yomin &&
read_tree_twoway $treeH $treeM &&
git ls-files --stage >5.out || return 1
git diff --no-index M.out 5.out >5diff.out
compare_change 5diff.out expected &&
check_cache_at yomin dirty
100644 b122a38d94a66f65ac8ec7438679fa782962300d 0 bozbar
100644 8e4020bb5a8d8c873b25de15933e75cc0fc275df 0 frotz
100644 dca6b92303befc93086aa025d90a5facd7eb2812 0 nitfol
100644 0a41e115ab61be0328a19b29f18cdcb49338d516 0 yomin
--- expected 2009-10-07 13:32:16.000000000 +0000
+++ current 2009-10-07 13:32:16.000000000 +0000
@@ -1 +0,0 @@
-+100644 X 0 yomin
* FAIL 4: 5 - carry forward local addition.
rm -f .git/index &&
git read-tree $treeH &&
git checkout-index -u -f -q -a &&
echo yomin >yomin &&
git update-index --add yomin &&
echo yomin yomin >yomin &&
read_tree_twoway $treeH $treeM &&
git ls-files --stage >5.out || return 1
git diff --no-index M.out 5.out >5diff.out
compare_change 5diff.out expected &&
check_cache_at yomin dirty
* expecting success: rm -f .git/index &&
git read-tree $treeH &&
git checkout-index -u -f -q -a &&
git update-index --add frotz &&
read_tree_twoway $treeH $treeM &&
git ls-files --stage >6.out &&
test_cmp M.out 6.out &&
check_cache_at frotz clean
100644 b122a38d94a66f65ac8ec7438679fa782962300d 0 bozbar
100644 8e4020bb5a8d8c873b25de15933e75cc0fc275df 0 frotz
100644 dca6b92303befc93086aa025d90a5facd7eb2812 0 nitfol
frotz: clean
* ok 5: 6 - local addition already has the same.
* expecting success: rm -f .git/index &&
git read-tree $treeH &&
git checkout-index -u -f -q -a &&
echo frotz >frotz &&
git update-index --add frotz &&
echo frotz frotz >frotz &&
read_tree_twoway $treeH $treeM &&
git ls-files --stage >7.out &&
test_cmp M.out 7.out &&
check_cache_at frotz dirty
100644 b122a38d94a66f65ac8ec7438679fa782962300d 0 bozbar
100644 8e4020bb5a8d8c873b25de15933e75cc0fc275df 0 frotz
100644 dca6b92303befc93086aa025d90a5facd7eb2812 0 nitfol
frotz: dirty
* ok 6: 7 - local addition already has the same.
* expecting success: rm -f .git/index &&
git read-tree $treeH &&
git checkout-index -u -f -q -a &&
echo frotz frotz >frotz &&
git update-index --add frotz &&
if read_tree_twoway $treeH $treeM; then false; else :; fi
error: Entry 'frotz' would be overwritten by merge. Cannot merge.
* ok 7: 8 - conflicting addition.
* expecting success: rm -f .git/index &&
git read-tree $treeH &&
git checkout-index -u -f -q -a &&
echo frotz frotz >frotz &&
git update-index --add frotz &&
echo frotz >frotz &&
if read_tree_twoway $treeH $treeM; then false; else :; fi
error: Entry 'frotz' would be overwritten by merge. Cannot merge.
* ok 8: 9 - conflicting addition.
* expecting success: rm -f .git/index &&
git read-tree $treeH &&
git checkout-index -u -f -q -a &&
echo rezrov >rezrov &&
git update-index --add rezrov &&
read_tree_twoway $treeH $treeM &&
git ls-files --stage >10.out &&
test_cmp M.out 10.out
100644 b122a38d94a66f65ac8ec7438679fa782962300d 0 bozbar
100644 8e4020bb5a8d8c873b25de15933e75cc0fc275df 0 frotz
100644 dca6b92303befc93086aa025d90a5facd7eb2812 0 nitfol
* ok 9: 10 - path removed.
* expecting success: rm -f .git/index &&
git read-tree $treeH &&
git checkout-index -u -f -q -a &&
echo rezrov >rezrov &&
git update-index --add rezrov &&
echo rezrov rezrov >rezrov &&
if read_tree_twoway $treeH $treeM; then false; else :; fi
error: Entry 'rezrov' not uptodate. Cannot merge.
* ok 10: 11 - dirty path removed.
* expecting success: rm -f .git/index &&
git read-tree $treeH &&
git checkout-index -u -f -q -a &&
echo rezrov rezrov >rezrov &&
git update-index --add rezrov &&
if read_tree_twoway $treeH $treeM; then false; else :; fi
error: Entry 'rezrov' would be overwritten by merge. Cannot merge.
* ok 11: 12 - unmatching local changes being removed.
* expecting success: rm -f .git/index &&
git read-tree $treeH &&
git checkout-index -u -f -q -a &&
echo rezrov rezrov >rezrov &&
git update-index --add rezrov &&
echo rezrov >rezrov &&
if read_tree_twoway $treeH $treeM; then false; else :; fi
error: Entry 'rezrov' would be overwritten by merge. Cannot merge.
* ok 12: 13 - unmatching local changes being removed.
* expecting success: rm -f .git/index &&
git read-tree $treeH &&
git checkout-index -u -f -q -a &&
echo nitfol nitfol >nitfol &&
git update-index --add nitfol &&
read_tree_twoway $treeH $treeM &&
git ls-files --stage >14.out || return 1
git diff --no-index M.out 14.out >14diff.out
compare_change 14diff.out expected &&
check_cache_at nitfol clean
100644 b122a38d94a66f65ac8ec7438679fa782962300d 0 bozbar
100644 8e4020bb5a8d8c873b25de15933e75cc0fc275df 0 frotz
100644 7e1bf714fb103c778a21dd67411666901222425a 0 nitfol
nitfol: clean
* ok 13: 14 - unchanged in two heads.
* expecting success: rm -f .git/index &&
git read-tree $treeH &&
git checkout-index -u -f -q -a &&
echo nitfol nitfol >nitfol &&
git update-index --add nitfol &&
echo nitfol nitfol nitfol >nitfol &&
read_tree_twoway $treeH $treeM &&
git ls-files --stage >15.out || return 1
git diff --no-index M.out 15.out >15diff.out
compare_change 15diff.out expected &&
check_cache_at nitfol dirty
100644 b122a38d94a66f65ac8ec7438679fa782962300d 0 bozbar
100644 8e4020bb5a8d8c873b25de15933e75cc0fc275df 0 frotz
100644 7e1bf714fb103c778a21dd67411666901222425a 0 nitfol
nitfol: dirty
* ok 14: 15 - unchanged in two heads.
* expecting success: rm -f .git/index &&
git read-tree $treeH &&
git checkout-index -u -f -q -a &&
echo bozbar bozbar >bozbar &&
git update-index --add bozbar &&
if read_tree_twoway $treeH $treeM; then false; else :; fi
error: Entry 'bozbar' would be overwritten by merge. Cannot merge.
* ok 15: 16 - conflicting local change.
* expecting success: rm -f .git/index &&
git read-tree $treeH &&
git checkout-index -u -f -q -a &&
echo bozbar bozbar >bozbar &&
git update-index --add bozbar &&
echo bozbar bozbar bozbar >bozbar &&
if read_tree_twoway $treeH $treeM; then false; else :; fi
error: Entry 'bozbar' would be overwritten by merge. Cannot merge.
* ok 16: 17 - conflicting local change.
* expecting success: rm -f .git/index &&
git read-tree $treeH &&
git checkout-index -u -f -q -a &&
cat bozbar-new >bozbar &&
git update-index --add bozbar &&
read_tree_twoway $treeH $treeM &&
git ls-files --stage >18.out &&
test_cmp M.out 18.out &&
check_cache_at bozbar clean
100644 b122a38d94a66f65ac8ec7438679fa782962300d 0 bozbar
100644 8e4020bb5a8d8c873b25de15933e75cc0fc275df 0 frotz
100644 dca6b92303befc93086aa025d90a5facd7eb2812 0 nitfol
bozbar: clean
* ok 17: 18 - local change already having a good result.
* expecting success: rm -f .git/index &&
git read-tree $treeH &&
git checkout-index -u -f -q -a &&
cat bozbar-new >bozbar &&
git update-index --add bozbar &&
echo gnusto gnusto >bozbar &&
read_tree_twoway $treeH $treeM &&
git ls-files --stage >19.out &&
test_cmp M.out 19.out &&
check_cache_at bozbar dirty
100644 b122a38d94a66f65ac8ec7438679fa782962300d 0 bozbar
100644 8e4020bb5a8d8c873b25de15933e75cc0fc275df 0 frotz
100644 dca6b92303befc93086aa025d90a5facd7eb2812 0 nitfol
bozbar: dirty
* ok 18: 19 - local change already having a good result, further modified.
* expecting success: rm -f .git/index &&
git read-tree $treeH &&
git checkout-index -u -f -q -a &&
cat bozbar-old >bozbar &&
git update-index --add bozbar &&
read_tree_twoway $treeH $treeM &&
git ls-files --stage >20.out &&
test_cmp M.out 20.out &&
check_cache_at bozbar dirty
100644 b122a38d94a66f65ac8ec7438679fa782962300d 0 bozbar
100644 8e4020bb5a8d8c873b25de15933e75cc0fc275df 0 frotz
100644 dca6b92303befc93086aa025d90a5facd7eb2812 0 nitfol
bozbar: dirty
* ok 19: 20 - no local change, use new tree.
* expecting success: rm -f .git/index &&
git read-tree $treeH &&
git checkout-index -u -f -q -a &&
cat bozbar-old >bozbar &&
git update-index --add bozbar &&
echo gnusto gnusto >bozbar &&
if read_tree_twoway $treeH $treeM; then false; else :; fi
error: Entry 'bozbar' not uptodate. Cannot merge.
* ok 20: 21 - no local change, dirty cache.
* expecting success: rm -f .git/index &&
git read-tree $treeH &&
git checkout-index -u -f -q -a &&
sed -e "s/such as/SUCH AS/" bozbar-old >bozbar &&
git update-index --add bozbar &&
if read_tree_twoway $treeH $treeM; then false; else :; fi
error: Entry 'bozbar' would be overwritten by merge. Cannot merge.
* ok 21: 22 - local change cache updated.
* expecting success: rm -f .git/index &&
echo DF >DF &&
git update-index --add DF &&
treeDF=`git write-tree` &&
echo treeDF $treeDF &&
git ls-tree $treeDF &&
rm -f DF &&
mkdir DF &&
echo DF/DF >DF/DF &&
git update-index --add --remove DF DF/DF &&
treeDFDF=`git write-tree` &&
echo treeDFDF $treeDFDF &&
git ls-tree $treeDFDF &&
git ls-files --stage >DFDF.out
treeDF 6bf22db9043f2b5821c019d0ce0f2605421affcb
100644 blob 052efc3abbc31348f7abd34535b1953d38273257 DF
treeDFDF c38e296263d024b0f48c4a728d293232ac6c5443
040000 tree 90bbead36f4d6a7c325fd450e6cfbcc7479d421a DF
* ok 22: DF vs DF/DF case setup.
* expecting success: rm -f .git/index &&
rm -fr DF &&
echo DF >DF &&
git update-index --add DF &&
read_tree_twoway $treeDF $treeDFDF &&
git ls-files --stage >DFDFcheck.out &&
test_cmp DFDF.out DFDFcheck.out &&
check_cache_at DF/DF dirty &&
:
100644 b90ea14b2dd74b6f377c10870b3757344bbe077c 0 DF/DF
DF/DF: dirty
* ok 23: DF vs DF/DF case test.
* expecting success: rm -f .git/index &&
: >a &&
git update-index --add a &&
treeM=`git write-tree` &&
echo treeM $treeM &&
git ls-tree $treeM &&
git ls-files --stage >treeM.out &&
rm -f a &&
git update-index --remove a &&
mkdir a &&
: >a/b &&
treeH=`git write-tree` &&
echo treeH $treeH &&
git ls-tree $treeH
treeM 496d6428b9cf92981dc9495211e6e1120fb6f2ba
100644 blob e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 a
treeH 4b825dc642cb6eb9a060e54bf8d69288fbee4904
* ok 24: a/b (untracked) vs a case setup.
* expecting success: ! git read-tree -u -m "$treeH" "$treeM" &&
git ls-files --stage &&
test -f a/b
error: Updating 'a' would lose untracked files in it
* ok 25: a/b (untracked) vs a, plus c/d case test.
* expecting success: rm -f .git/index &&
rm -fr a &&
: >a &&
mkdir c &&
: >c/d &&
git update-index --add a c/d &&
treeM=`git write-tree` &&
echo treeM $treeM &&
git ls-tree $treeM &&
git ls-files --stage >treeM.out &&
rm -f a &&
mkdir a
: >a/b &&
git update-index --add --remove a a/b &&
treeH=`git write-tree` &&
echo treeH $treeH &&
git ls-tree $treeH
treeM 3e82e8b9894d6c7982dcd25a6dad66400d52735f
100644 blob e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 a
040000 tree 2a26db49a6962700da5bd4084ae0e5a22d6583ee c
treeH 02c6f058fb950781e5b773c21e4c237db1ff4d5a
040000 tree 4277b6e69d25e5efa77c455340557b384a4c018a a
040000 tree 2a26db49a6962700da5bd4084ae0e5a22d6583ee c
* ok 26: a/b vs a, plus c/d case setup.
* expecting success: git read-tree -u -m "$treeH" "$treeM" &&
git ls-files --stage | tee >treeMcheck.out &&
test_cmp treeM.out treeMcheck.out
* ok 27: a/b vs a, plus c/d case test.
* failed 2 among 27 test(s)
make[3]: *** [t1001-read-tree-m-2way.sh] Error 1
make[3]: Leaving directory `/build/buildd/git-core-1.6.3.3/t'
make[2]: *** [all] Error 2
make[2]: Leaving directory `/build/buildd/git-core-1.6.3.3/t'
make[1]: *** [test] Error 2
make[1]: Leaving directory `/build/buildd/git-core-1.6.3.3'
make: *** [build-arch-stamp] Error 2
dpkg-buildpackage: error: debian/rules build gave error exit status 2
******************************************************************************
Build finished at 20091007-1432
FAILED [dpkg-buildpackage died]
Purging chroot-karmic-autotest/build/buildd/git-core-1.6.3.3
------------------------------------------------------------------------------
/usr/bin/sudo dpkg --root=/srv/weddell.ubuntu.com/home/buildd/build-karmic-autotest/chroot-karmic-autotest --purge libglib2.0-0 unzip mime-support gettext zlib1g-dev libldap2-dev libgcrypt11-dev sgml-data libkadm5srv6 libdbi-perl libxml2-utils comerr-dev libgpg-error-dev python2.6 libkrb5-dev libcroco3 libdbd-sqlite3-perl libnet-daemon-perl libxml2 libkdb5-4 cvsps libapr1 pkg-config update-inetd libsvn-perl libexpat1-dev xml-core libtasn1-3-dev subversion libaprutil1 libcurl4-gnutls-dev gettext-base libplrpc-perl xmlto sgml-base cvs python docbook-xml tcl8.5 libxslt1.1 libsvn1 libgnutls-dev libexpat1 libsqlite3-0 libidn11-dev asciidoc libneon27-gnutls libpcre3 xsltproc libgssrpc4 docbook-xsl libncursesw5
(Reading database ... 14518 files and directories currently installed.)
Removing unzip ...
Removing gettext ...
Removing libcroco3 ...
Purging configuration files for libcroco3 ...
Removing libdbd-sqlite3-perl ...
Removing cvsps ...
Removing libsvn-perl ...
Purging configuration files for libsvn-perl ...
Removing libexpat1-dev ...
Removing subversion ...
Purging configuration files for subversion ...
Removing libcurl4-gnutls-dev ...
Removing gettext-base ...
Removing xmlto ...
Removing cvs ...
Purging configuration files for cvs ...
Removing docbook-xml ...
Purging configuration files for docbook-xml ...
Removing tcl8.5 ...
Purging configuration files for tcl8.5 ...
Removing libsvn1 ...
Purging configuration files for libsvn1 ...
Removing libgnutls-dev ...
Removing libidn11-dev ...
install-info: warning: maintainer scripts should not call install-info anymore,
install-info: warning: this is handled now by a dpkg trigger provided by the
install-info: warning: install-info package; package libidn11-dev should be updated.
Removing asciidoc ...
Purging configuration files for asciidoc ...
Removing libneon27-gnutls ...
Purging configuration files for libneon27-gnutls ...
Removing xsltproc ...
Removing docbook-xsl ...
Purging configuration files for docbook-xsl ...
Removing zlib1g-dev ...
Removing libldap2-dev ...
Removing libgcrypt11-dev ...
Removing sgml-data ...
Purging configuration files for sgml-data ...
Removing libdbi-perl ...
Removing libxml2-utils ...
Removing libgpg-error-dev ...
Removing libkrb5-dev ...
Removing pkg-config ...
Removing update-inetd ...
Purging configuration files for update-inetd ...
Removing xml-core ...
Purging configuration files for xml-core ...
dpkg - warning: while removing xml-core, directory `/usr/share/debhelper/autoscripts' not empty so not removed.
dpkg - warning: while removing xml-core, directory `/usr/share/debhelper' not empty so not removed.
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 libplrpc-perl ...
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 libkadm5srv6 ...
Purging configuration files for libkadm5srv6 ...
Removing comerr-dev ...
Removing python2.6 ...
Purging configuration files for python2.6 ...
Removing libnet-daemon-perl ...
Removing libxml2 ...
Purging configuration files for libxml2 ...
Removing libkdb5-4 ...
Purging configuration files for libkdb5-4 ...
Removing libapr1 ...
Purging configuration files for libapr1 ...
Removing libsqlite3-0 ...
Purging configuration files for libsqlite3-0 ...
Removing libpcre3 ...
Purging configuration files for libpcre3 ...
Removing libgssrpc4 ...
Purging configuration files for libgssrpc4 ...
Removing libncursesw5 ...
Purging configuration files for libncursesw5 ...
Removing mime-support ...
Purging configuration files for mime-support ...
Processing triggers for libc-bin ...
ldconfig deferred processing now taking place
******************************************************************************
Finished at 20091007-1432
Build needed 00:33:34, 96900k disk space
More information about the ubuntu-autotest
mailing list