build log

git-log (text/plain), 58.99 KB, created by Michał Kiedrowicz on 2008-04-30 15:14:18 UTC

>>> Unpacking source...
>>> Unpacking git-1.5.5.1.tar.bz2 to /var/tmp/portage/dev-util/git-1.5.5.1/work
>>> Unpacking git-manpages-1.5.5.1.tar.bz2 to /var/tmp/portage/dev-util/git-1.5.5.1/work/git-1.5.5.1
 [32;01m*[0m Applying git-1.5.3-symlinks.patch ...
[A[72C  [34;01m[ [32;01mok[34;01m ][0m
 [32;01m*[0m Applying 20080423-git-1.5.5.1-noperl.patch ...
[A[72C  [34;01m[ [32;01mok[34;01m ][0m
>>> Source unpacked.
>>> Compiling source in /var/tmp/portage/dev-util/git-1.5.5.1/work/git-1.5.5.1 ...
GIT_VERSION = 1.5.5.1
    * new build flags or prefix
    GEN common-cmds.h
    CC ident.o
    CC interpolate.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 object.o
    CC pack-check.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-list.o
    CC path.o
    CC pkt-line.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 revision.o
    CC run-command.o
    CC server-info.o
    CC setup.o
    CC sha1_file.o
    CC sha1_name.o
    CC shallow.o
    CC sideband.o
    CC strbuf.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 utf8.o
    CC walker.o
    CC write_or_die.o
    CC ws.o
    CC wt-status.o
    CC xdiff-interface.o
    CC thread-utils.o
    CC compat/strlcpy.o
    CC xdiff/xdiffi.o
    CC xdiff/xprepare.o
    CC xdiff/xutils.o
    CC xdiff/xemit.o
    CC xdiff/xmerge.o
    CC fast-import.o
    CC git.o
    CC builtin-add.o
    CC builtin-annotate.o
builtin-add.c:22: warning: ‘patch_interactive’ defined but not used
builtin-add.c:22: warning: ‘add_interactive’ defined but not used
    CC builtin-apply.o
    CC builtin-archive.o
    CC builtin-blame.o
    CC builtin-branch.o
    CC builtin-bundle.o
    CC builtin-cat-file.o
    CC builtin-check-attr.o
    CC builtin-check-ref-format.o
    CC builtin-checkout-index.o
    CC builtin-checkout.o
    CC builtin-clean.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-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-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-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 hash-object.o
    CC imap-send.o
    CC index-pack.o
    CC merge-index.o
    CC merge-tree.o
    CC mktag.o
    CC mktree.o
    CC pack-redundant.o
    CC patch-id.o
    CC receive-pack.o
    CC shell.o
    CC show-index.o
    CC unpack-file.o
    CC update-server-info.o
    CC upload-pack.o
    CC var.o
    GEN git-am
    GEN git-bisect
    GEN git-clone
    GEN git-filter-branch
    GEN git-lost-found
    GEN git-merge-octopus
    GEN git-merge-one-file
    GEN git-merge-resolve
    GEN git-merge
    GEN git-merge-stupid
    GEN git-mergetool
    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
    CC test-chmtime.o
    CC test-genrandom.o
    CC test-date.o
    CC test-delta.o
    CC test-sha1.o
    CC test-match-trees.o
    CC test-absolute-path.o
    CC test-parse-options.o
    CC daemon.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 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.o
    CC dir.o
    CC entry.o
    CC environment.o
    CC exec_cmd.o
    CC fsck.o
    CC grep.o
    CC hash.o
    CC help.o
    AR xdiff/lib.a
    AR libgit.a
    LINK git-daemon
    LINK git-fast-import
    LINK git
    LINK git-hash-object
    LINK git-imap-send
    LINK git-index-pack
    LINK git-merge-index
    LINK git-merge-tree
    LINK git-mktag
    LINK git-mktree
    LINK git-pack-redundant
    LINK git-patch-id
    LINK git-receive-pack
    BUILTIN git-send-pack
    LINK git-shell
    LINK git-show-index
    LINK git-unpack-file
    LINK git-update-server-info
    LINK git-upload-pack
    LINK git-var
    BUILTIN git-add
    BUILTIN git-annotate
    BUILTIN git-apply
    BUILTIN git-archive
    BUILTIN git-blame
    BUILTIN git-branch
    BUILTIN git-bundle
    BUILTIN git-cat-file
    BUILTIN git-check-attr
    BUILTIN git-check-ref-format
    BUILTIN git-checkout
    BUILTIN git-checkout-index
    BUILTIN git-clean
    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-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-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-reflog
    BUILTIN git-rerere
    BUILTIN git-remote
    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-verify-pack
    BUILTIN git-verify-tag
    BUILTIN git-write-tree
    BUILTIN git-cherry-pick
    BUILTIN git-cherry
    BUILTIN git-format-patch
    BUILTIN git-fsck-objects
    BUILTIN git-get-tar-commit-id
    BUILTIN git-init
    BUILTIN git-upload-archive
    BUILTIN git-merge-subtree
    BUILTIN git-peek-remote
    BUILTIN git-repo-config
    BUILTIN git-show
    BUILTIN git-status
    BUILTIN git-whatchanged
    LINK test-chmtime
    LINK test-genrandom
    LINK test-date
    LINK test-delta
    LINK test-sha1
    LINK test-match-trees
    LINK test-absolute-path
    LINK test-parse-options
    BUILTIN git-fetch-pack
    SUBDIR templates
>>> Source compiled.
 [32;01m*[0m Disabling CVS tests (needs dev-util/cvs[USE=server])
 [32;01m*[0m Disabling tests that need Perl
 [32;01m*[0m Disabled tests:
 [32;01m*[0m Disabled t5000-tar-tree.sh
 [32;01m*[0m Disabled t9200-git-cvsexportcommit.sh
 [32;01m*[0m Disabled t9400-git-cvsserver-server.sh
 [32;01m*[0m Disabled t9600-cvsimport.sh
 [32;01m*[0m Disabled t5502-quickfetch.sh
 [32;01m*[0m Disabled t5512-ls-remote.sh
 [32;01m*[0m Disabled t5520-pull.sh
 [32;01m*[0m Start test run
    SUBDIR templates
make -C t/ all
make[1]: Entering directory `/var/tmp/portage/dev-util/git-1.5.5.1/work/git-1.5.5.1/t'
*** t0000-basic.sh ***
*   ok 1: .git/objects should be empty after git init in an empty repo.
[m*   ok 2: .git/objects should have 3 subdirectories.
[m*   ok 3: success is reported like this
[m[1m[38;5;2m*   still broken 4: pretend we have a known breakage
[m*   FIXED 5: pretend we have fixed a known breakage
[m*   ok 6: git update-index without --add should fail adding.
[m*   ok 7: git update-index with --add should succeed.
[m*   ok 8: writing tree out with git write-tree
[m*   ok 9: validate object ID of a known tree.
[m*   ok 10: git update-index without --remove should fail removing.
[m*   ok 11: git update-index with --remove should be able to remove.
[m*   ok 12: git write-tree should be able to write an empty tree.
[m*   ok 13: validate object ID of a known tree.
[m*   ok 14: adding various types of objects with git update-index --add.
[m*   ok 15: showing stage with git ls-files --stage
[m*   ok 16: validate git ls-files output for a known tree.
[m*   ok 17: writing tree out with git write-tree.
[m*   ok 18: validate object ID for a known tree.
[m*   ok 19: showing tree with git ls-tree
[m*   ok 20: git ls-tree output for a known tree.
[m*   ok 21: showing tree with git ls-tree -r
[m*   ok 22: git ls-tree -r output for a known tree.
[m*   ok 23: showing tree with git ls-tree -r -t
[m*   ok 24: git ls-tree -r output for a known tree.
[m*   ok 25: writing partial tree out with git write-tree --prefix.
[m*   ok 26: validate object ID for a known tree.
[m*   ok 27: writing partial tree out with git write-tree --prefix.
[m*   ok 28: validate object ID for a known tree.
[m*   ok 29: put invalid objects into the index.
[m*   ok 30: writing this tree without --missing-ok.
[m*   ok 31: writing this tree with --missing-ok.
[m*   ok 32: git read-tree followed by write-tree should be idempotent.
[m*   ok 33: validate git diff-files output for a know cache/work tree state.
[m*   ok 34: git update-index --refresh should succeed.
[m*   ok 35: no diff after checkout and git update-index --refresh.
[m*   ok 36: git commit-tree records the correct tree in a commit.
[m*   ok 37: git commit-tree records the correct parent in a commit.
[m*   ok 38: git commit-tree omits duplicated parent in a commit.
[m*   ok 39: update-index D/F conflict
[m*   ok 40: absolute path works as expected
[m*   ok 41: very long name in the index handled sanely
[m[38;5;2m* fixed 1 known breakage(s)
[m[1m[38;5;1m* still have 1 known breakage(s)
[m[38;5;2m* passed all remaining 40 test(s)
[m*** t0001-init.sh ***
*   ok 1: plain
[m*   ok 2: plain with GIT_WORK_TREE
[m*   ok 3: plain bare
[m*   ok 4: plain bare with GIT_WORK_TREE
[m*   ok 5: GIT_DIR bare
[m*   ok 6: GIT_DIR non-bare
[m*   ok 7: GIT_DIR & GIT_WORK_TREE (1)
[m*   ok 8: GIT_DIR & GIT_WORK_TREE (2)
[m*   ok 9: reinit
[m[38;5;2m* passed all 9 test(s)
[m*** t0003-attributes.sh ***
*   ok 1: setup
[m*   ok 2: attribute test
[m[38;5;2m* passed all 2 test(s)
[m*** t0010-racy-git.sh ***
*   ok 1: Racy GIT trial #0 part A
[m*   ok 2: Racy GIT trial #0 part B
[m*   ok 3: Racy GIT trial #1 part A
[m*   ok 4: Racy GIT trial #1 part B
[m*   ok 5: Racy GIT trial #2 part A
[m*   ok 6: Racy GIT trial #2 part B
[m*   ok 7: Racy GIT trial #3 part A
[m*   ok 8: Racy GIT trial #3 part B
[m*   ok 9: Racy GIT trial #4 part A
[m*   ok 10: Racy GIT trial #4 part B
[m[38;5;2m* passed all 10 test(s)
[m*** t0020-crlf.sh ***
*   ok 1: setup
[m*   ok 2: safecrlf: autocrlf=input, all CRLF
[m*   ok 3: safecrlf: autocrlf=input, mixed LF/CRLF
[m*   ok 4: safecrlf: autocrlf=true, all LF
[m*   ok 5: safecrlf: autocrlf=true mixed LF/CRLF
[m*   ok 6: safecrlf: print warning only once
[m*   ok 7: switch off autocrlf, safecrlf, reset HEAD
[m*   ok 8: update with autocrlf=input
[m*   ok 9: update with autocrlf=true
[m*   ok 10: checkout with autocrlf=true
[m*   ok 11: checkout with autocrlf=input
[m*   ok 12: apply patch (autocrlf=input)
[m*   ok 13: apply patch --cached (autocrlf=input)
[m*   ok 14: apply patch --index (autocrlf=input)
[m*   ok 15: apply patch (autocrlf=true)
[m*   ok 16: apply patch --cached (autocrlf=true)
[m*   ok 17: apply patch --index (autocrlf=true)
[m*   ok 18: .gitattributes says two is binary
[m*   ok 19: .gitattributes says two is input
[m*   ok 20: .gitattributes says two and three are text
[m*   ok 21: in-tree .gitattributes (1)
[m*   ok 22: in-tree .gitattributes (2)
[m*   ok 23: in-tree .gitattributes (3)
[m*   ok 24: in-tree .gitattributes (4)
[m*   ok 25: invalid .gitattributes (must not crash)
[m[38;5;2m* passed all 25 test(s)
[m*** t0021-conversion.sh ***
*   ok 1: setup
[m*   ok 2: check
[m*   ok 3: expanded_in_repo
[m[38;5;2m* passed all 3 test(s)
[m*** t0022-crlf-rename.sh ***
*   ok 1: setup
[m*   ok 2: diff -M
[m[38;5;2m* passed all 2 test(s)
[m*** t0023-crlf-am.sh ***
*   ok 1: setup
[m*   ok 2: am
[m[38;5;2m* passed all 2 test(s)
[m*** t0030-stripspace.sh ***
*   ok 1: long lines without spaces should be unchanged
[m*   ok 2: lines with spaces at the beginning should be unchanged
[m*   ok 3: lines with intermediate spaces should be unchanged
[m*   ok 4: consecutive blank lines should be unified
[m*   ok 5: only consecutive blank lines should be completely removed
[m*   ok 6: consecutive blank lines at the beginning should be removed
[m*   ok 7: consecutive blank lines at the end should be removed
[m*   ok 8: text without newline at end should end with newline
[m*   ok 9: text plus spaces without newline at end should end with newline
[m*   ok 10: text plus spaces without newline at end should not show spaces
[m*   ok 11: text plus spaces without newline should show the correct lines
[m*   ok 12: text plus spaces at end should not show spaces
[m*   ok 13: text plus spaces at end should be cleaned and newline must remain
[m*   ok 14: spaces with newline at end should be replaced with empty string
[m*   ok 15: spaces without newline at end should not show spaces
[m*   ok 16: spaces without newline at end should be replaced with empty string
[m*   ok 17: consecutive text lines should be unchanged
[m*   ok 18: strip comments, too
[m[38;5;2m* passed all 18 test(s)
[m*** t0040-parse-options.sh ***
*   ok 1: test help
[m*   ok 2: short options
[m*   ok 3: long options
[m*   ok 4: intermingled arguments
[m*   ok 5: unambiguously abbreviated option
[m*   ok 6: unambiguously abbreviated option with "="
[m*   ok 7: ambiguously abbreviated option
[m*   ok 8: non ambiguous option (after two options it abbreviates)
[m*   ok 9: detect possible typos
[m*   ok 10: keep some options as arguments
[m[38;5;2m* passed all 10 test(s)
[m*** t0050-filesystem.sh ***
*   ok 1: see if we expect 
[m*   ok 2: setup case tests
[m*   ok 3: rename (case change)
[m*   ok 4: merge (case change)
[m*   ok 5: setup unicode normalization tests
[m*   ok 6: rename (silent unicode normalization)
[m*   ok 7: merge (silent unicode normalization)
[m[38;5;2m* passed all 7 test(s)
[m*** t1000-read-tree-m-3way.sh ***
*   ok 1: adding test file NN and Z/NN
[m*   ok 2: adding test file ND and Z/ND
[m*   ok 3: adding test file NM and Z/NM
[m*   ok 4: adding test file DN and Z/DN
[m*   ok 5: adding test file DD and Z/DD
[m*   ok 6: adding test file DM and Z/DM
[m*   ok 7: adding test file MN and Z/MN
[m*   ok 8: adding test file MD and Z/MD
[m*   ok 9: adding test file MM and Z/MM
[m*   ok 10: adding test file SS
[m*   ok 11: adding test file TT
[m*   ok 12: prepare initial tree
[m*   ok 13: change in branch A (removal)
[m*   ok 14: change in branch A (modification)
[m*   ok 15: change in branch A (modification)
[m*   ok 16: change in branch A (modification)
[m*   ok 17: change in branch A (modification)
[m*   ok 18: change in branch A (modification)
[m*   ok 19: change in branch A (modification)
[m*   ok 20: change in branch A (addition)
[m*   ok 21: change in branch A (addition)
[m*   ok 22: change in branch A (addition)
[m*   ok 23: change in branch A (addition)
[m*   ok 24: change in branch A (addition)
[m*   ok 25: change in branch A (edit)
[m*   ok 26: change in branch A (change file to directory)
[m*   ok 27: recording branch A tree
[m*   ok 28: reading original tree and checking out
[m*   ok 29: change in branch B (removal)
[m*   ok 30: change in branch B (modification)
[m*   ok 31: change in branch B (modification)
[m*   ok 32: change in branch B (modification)
[m*   ok 33: change in branch B (modification)
[m*   ok 34: change in branch B (modification)
[m*   ok 35: change in branch B (modification)
[m*   ok 36: change in branch B (addition)
[m*   ok 37: change in branch B (addition)
[m*   ok 38: change in branch B (addition)
[m*   ok 39: change in branch B (addition)
[m*   ok 40: change in branch B (addition and modification)
[m*   ok 41: change in branch B (modification)
[m*   ok 42: change in branch B (addition of a file to conflict with directory)
[m*   ok 43: recording branch B tree
[m*   ok 44: keep contents of 3 trees for easy access
[m*   ok 45: 3-way merge with git read-tree -m, empty cache
[m*   ok 46: 3-way merge with git read-tree -m, match H
[m*   ok 47: 1 - must not have an entry not in A.
[m*   ok 48: 2 - must match B in !O && !A && B case.
[m*   ok 49: 2 - matching B alone is OK in !O && !A && B case.
[m*   ok 50: 3 - must match A in !O && A && !B case.
[m*   ok 51: 3 - matching A alone is OK in !O && A && !B case.
[m*   ok 52: 3 (fail) - must match A in !O && A && !B case.
[m*   ok 53: 4 - must match and be up-to-date in !O && A && B && A!=B case.
[m*   ok 54: 4 (fail) - must match and be up-to-date in !O && A && B && A!=B case.
[m*   ok 55: 4 (fail) - must match and be up-to-date in !O && A && B && A!=B case.
[m*   ok 56: 5 - must match in !O && A && B && A==B case.
[m*   ok 57: 5 - must match in !O && A && B && A==B case.
[m*   ok 58: 5 (fail) - must match A in !O && A && B && A==B case.
[m*   ok 59: 6 - must not exist in O && !A && !B case
[m*   ok 60: 7 - must not exist in O && !A && B && O!=B case
[m*   ok 61: 8 - must not exist in O && !A && B && O==B case
[m*   ok 62: 9 - must match and be up-to-date in O && A && !B && O!=A case
[m*   ok 63: 9 (fail) - must match and be up-to-date in O && A && !B && O!=A case
[m*   ok 64: 9 (fail) - must match and be up-to-date in O && A && !B && O!=A case
[m*   ok 65: 10 - must match and be up-to-date in O && A && !B && O==A case
[m*   ok 66: 10 (fail) - must match and be up-to-date in O && A && !B && O==A case
[m*   ok 67: 10 (fail) - must match and be up-to-date in O && A && !B && O==A case
[m*   ok 68: 11 - must match and be up-to-date in O && A && B && O!=A && O!=B && A!=B case
[m*   ok 69: 11 (fail) - must match and be up-to-date in O && A && B && O!=A && O!=B && A!=B case
[m*   ok 70: 11 (fail) - must match and be up-to-date in O && A && B && O!=A && O!=B && A!=B case
[m*   ok 71: 12 - must match A in O && A && B && O!=A && A==B case
[m*   ok 72: 12 - must match A in O && A && B && O!=A && A==B case
[m*   ok 73: 12 (fail) - must match A in O && A && B && O!=A && A==B case
[m*   ok 74: 13 - must match A in O && A && B && O!=A && O==B case
[m*   ok 75: 13 - must match A in O && A && B && O!=A && O==B case
[m*   ok 76: 14 - must match and be up-to-date in O && A && B && O==A && O!=B case
[m*   ok 77: 14 - may match B in O && A && B && O==A && O!=B case
[m*   ok 78: 14 (fail) - must match and be up-to-date in O && A && B && O==A && O!=B case
[m*   ok 79: 14 (fail) - must match and be up-to-date in O && A && B && O==A && O!=B case
[m*   ok 80: 15 - must match A in O && A && B && O==A && O==B case
[m*   ok 81: 15 - must match A in O && A && B && O==A && O==B case
[m*   ok 82: 15 (fail) - must match A in O && A && B && O==A && O==B case
[m*   ok 83: 16 - A matches in one and B matches in another.
[m[38;5;2m* passed all 83 test(s)
[m*** t1001-read-tree-m-2way.sh ***
*   ok 1: setup
[m*   ok 2: 1, 2, 3 - no carry forward
[m*   ok 3: 4 - carry forward local addition.
[m*   ok 4: 5 - carry forward local addition.
[m*   ok 5: 6 - local addition already has the same.
[m*   ok 6: 7 - local addition already has the same.
[m*   ok 7: 8 - conflicting addition.
[m*   ok 8: 9 - conflicting addition.
[m*   ok 9: 10 - path removed.
[m*   ok 10: 11 - dirty path removed.
[m*   ok 11: 12 - unmatching local changes being removed.
[m*   ok 12: 13 - unmatching local changes being removed.
[m*   ok 13: 14 - unchanged in two heads.
[m*   ok 14: 15 - unchanged in two heads.
[m*   ok 15: 16 - conflicting local change.
[m*   ok 16: 17 - conflicting local change.
[m*   ok 17: 18 - local change already having a good result.
[m*   ok 18: 19 - local change already having a good result, further modified.
[m*   ok 19: 20 - no local change, use new tree.
[m*   ok 20: 21 - no local change, dirty cache.
[m*   ok 21: 22 - local change cache updated.
[m*   ok 22: DF vs DF/DF case setup.
[m*   ok 23: DF vs DF/DF case test.
[m[38;5;2m* passed all 23 test(s)
[m*** t1002-read-tree-m-u-2way.sh ***
*   ok 1: setup
[m*   ok 2: 1, 2, 3 - no carry forward
[m*   ok 3: 4 - carry forward local addition.
[m*   ok 4: 5 - carry forward local addition.
[m*   ok 5: 6 - local addition already has the same.
[m*   ok 6: 7 - local addition already has the same.
[m*   ok 7: 8 - conflicting addition.
[m*   ok 8: 9 - conflicting addition.
[m*   ok 9: 10 - path removed.
[m*   ok 10: 11 - dirty path removed.
[m*   ok 11: 12 - unmatching local changes being removed.
[m*   ok 12: 13 - unmatching local changes being removed.
[m*   ok 13: 14 - unchanged in two heads.
[m*   ok 14: 15 - unchanged in two heads.
[m*   ok 15: 16 - conflicting local change.
[m*   ok 16: 17 - conflicting local change.
[m*   ok 17: 18 - local change already having a good result.
[m*   ok 18: 19 - local change already having a good result, further modified.
[m*   ok 19: 20 - no local change, use new tree.
[m*   ok 20: 21 - no local change, dirty cache.
[m*   ok 21: DF vs DF/DF case setup.
[m*   ok 22: DF vs DF/DF case test.
[m[38;5;2m* passed all 22 test(s)
[m*** t1003-read-tree-prefix.sh ***
*   ok 1: setup
[m*   ok 2: read-tree --prefix
[m[38;5;2m* passed all 2 test(s)
[m*** t1004-read-tree-m-u-wf.sh ***
*   ok 1: two-way setup
[m*   ok 2: two-way not clobbering
[m*   ok 3: two-way with incorrect --exclude-per-directory (1)
[m*   ok 4: two-way with incorrect --exclude-per-directory (2)
[m*   ok 5: two-way clobbering a ignored file
[m*   ok 6: three-way not complaining on an untracked path in both
[m*   ok 7: three-way not clobbering a working tree file
[m*   ok 8: three-way not complaining on an untracked file
[m*   ok 9: 3-way not overwriting local changes (setup)
[m*   ok 10: 3-way not overwriting local changes (our side)
[m*   ok 11: 3-way not overwriting local changes (their side)
[m*   ok 12: funny symlink in work tree
[m*   ok 13: funny symlink in work tree, un-unlink-able
[m*   ok 14: D/F setup
[m*   ok 15: D/F
[m*   ok 16: D/F resolve
[m*   ok 17: D/F recursive
[m[38;5;2m* passed all 17 test(s)
[m*** t1005-read-tree-reset.sh ***
*   ok 1: setup
[m*   ok 2: reset should work
[m[38;5;2m* passed all 2 test(s)
[m*** t1020-subdirectory.sh ***
*   ok 1: setup
[m*   ok 2: update-index and ls-files
[m*   ok 3: cat-file
[m*   ok 4: diff-files
[m*   ok 5: write-tree
[m*   ok 6: checkout-index
[m*   ok 7: read-tree
[m*   ok 8: no file/rev ambiguity check inside .git
[m*   ok 9: no file/rev ambiguity check inside a bare repo
[m*   ok 10: detection should not be fooled by a symlink
[m[38;5;2m* passed all 10 test(s)
[m*** t1100-commit-tree-options.sh ***
*   ok 1: test preparation: write empty tree
[m*   ok 2: construct commit
[m*   ok 3: read commit
[m*   ok 4: compare commit
[m[38;5;2m* passed all 4 test(s)
[m*** t1200-tutorial.sh ***
*   ok 1: blob
[m*   ok 2: blob 557db03
[m*   ok 3: git diff-files -p
[m*   ok 4: git diff
[m*   ok 5: tree
[m*   ok 6: git diff-index -p HEAD
[m*   ok 7: git diff HEAD
[m*   ok 8: git whatchanged -p --root
[m*   ok 9: git tag my-first-tag
[mM	hello
Switched to a new branch "mybranch"
*   ok 10: git checkout -b mybranch
[m*   ok 11: git branch
[mM	hello
Already on "mybranch"
Created commit 18dd2a8: Some work.
 1 files changed, 2 insertions(+), 0 deletions(-)
Switched to branch "master"
Created commit c2ecc77: Some fun.
 2 files changed, 2 insertions(+), 0 deletions(-)
*   ok 12: git resolve now fails
[mCreated commit e0ffd0c: Merged "mybranch" changes.
[38;5;2m* passed all 12 test(s)
[m*** t1300-repo-config.sh ***
*   ok 1: initial
[m*   ok 2: mixed case
[m*   ok 3: similar section
[m*   ok 4: similar section
[m*   ok 5: replace with non-match
[m*   ok 6: replace with non-match (actually matching)
[m*   ok 7: non-match result
[m*   ok 8: unset with cont. lines
[m*   ok 9: unset with cont. lines is correct
[m*   ok 10: multiple unset
[m*   ok 11: multiple unset is correct
[m*   ok 12: --replace-all
[m*   ok 13: all replaced
[m*   ok 14: really mean test
[m*   ok 15: really really mean test
[m*   ok 16: get value
[m*   ok 17: unset
[m*   ok 18: multivar
[m*   ok 19: non-match
[m*   ok 20: non-match value
[m*   ok 21: ambiguous get
[m*   ok 22: get multivar
[m*   ok 23: multivar replace
[m*   ok 24: ambiguous value
[m*   ok 25: ambiguous unset
[m*   ok 26: invalid unset
[m*   ok 27: multivar unset
[m*   ok 28: invalid key
[m*   ok 29: correct key
[m*   ok 30: hierarchical section
[m*   ok 31: hierarchical section value
[m*   ok 32: working --list
[m*   ok 33: --get-regexp
[m*   ok 34: --add
[m*   ok 35: get variable with no value
[m*   ok 36: get variable with empty value
[m*   ok 37: get-regexp variable with no value
[m*   ok 38: get-regexp variable with empty value
[m*   ok 39: get bool variable with no value
[m*   ok 40: get bool variable with empty value
[m*   ok 41: no arguments, but no crash
[m*   ok 42: new section is partial match of another
[m*   ok 43: new variable inserts into proper section
[m*   ok 44: alternative GIT_CONFIG (non-existing file should fail)
[m*   ok 45: alternative GIT_CONFIG
[m*   ok 46: alternative GIT_CONFIG (--file)
[m*   ok 47: --set in alternative GIT_CONFIG
[m*   ok 48: rename section
[m*   ok 49: rename succeeded
[m*   ok 50: rename non-existing section
[m*   ok 51: rename succeeded
[m*   ok 52: rename another section
[m*   ok 53: rename succeeded
[m*   ok 54: remove section
[m*   ok 55: section was removed properly
[m*   ok 56: section ending
[m*   ok 57: numbers
[m*   ok 58: invalid unit
[m*   ok 59: bool
[m*   ok 60: invalid bool (--get)
[m*   ok 61: invalid bool (set)
[m*   ok 62: set --bool
[m*   ok 63: set --int
[m*   ok 64: quoting
[m*   ok 65: key with newline
[m*   ok 66: value with newline
[m*   ok 67: value continued on next line
[m*   ok 68: --null --list
[m*   ok 69: --null --get-regexp
[m*   ok 70: symlinked configuration
[m[38;5;2m* passed all 70 test(s)
[m*** t1301-shared-repo.sh ***
*   ok 1: shared=all
[m*   ok 2: update-server-info honors core.sharedRepository
[m[38;5;2m* passed all 2 test(s)
[m*** t1302-repo-version.sh ***
*   ok 1: gitdir selection on normal repos
[m*   ok 2: gitdir selection on unsupported repo
[m*   ok 3: gitdir not required mode
[m*   ok 4: gitdir required mode on normal repos
[m*   ok 5: gitdir required mode on unsupported repo
[m[38;5;2m* passed all 5 test(s)
[m*** t1303-wacky-config.sh ***
*   ok 1: modify same key
[m*   ok 2: add key in same section
[m*   ok 3: add key in different section
[m[38;5;2m* passed all 3 test(s)
[m*** t1400-update-ref.sh ***
*   ok 1: setup
[m*   ok 2: create refs/heads/master
[m*   ok 3: create refs/heads/master
[m*   ok 4: fail to create refs/heads/gu/fixes
[m*   ok 5: create refs/heads/master (by HEAD)
[m*   ok 6: create refs/heads/master (by HEAD)
[m*   ok 7: (not) create HEAD with old sha1
[m*   ok 8: (not) prior created .git/refs/heads/master
[m*   ok 9: create HEAD
[m*   ok 10: (not) change HEAD with wrong SHA1
[m*   ok 11: (not) changed .git/refs/heads/master
[m*   ok 12: create refs/heads/master (logged by touch)
[m*   ok 13: update refs/heads/master (logged by touch)
[m*   ok 14: set refs/heads/master (logged by touch)
[m*   ok 15: verifying refs/heads/master's log
[m*   ok 16: enable core.logAllRefUpdates
[m*   ok 17: create refs/heads/master (logged by config)
[m*   ok 18: update refs/heads/master (logged by config)
[m*   ok 19: set refs/heads/master (logged by config)
[m*   ok 20: verifying refs/heads/master's log
[m*   ok 21: Query "master@{May 25 2005}" (before history)
[m*   ok 22: Query master@{2005-05-25} (before history)
[m*   ok 23: Query "master@{May 26 2005 23:31:59}" (1 second before history)
[m*   ok 24: Query "master@{May 26 2005 23:32:00}" (exactly history start)
[m*   ok 25: Query "master@{2005-05-26 23:33:01}" (middle of history with gap)
[m*   ok 26: Query "master@{2005-05-26 23:38:00}" (middle of history)
[m*   ok 27: Query "master@{2005-05-26 23:43:00}" (exact end of history)
[m*   ok 28: Query "master@{2005-05-28}" (past end of history)
[m*   ok 29: creating initial files
[m*   ok 30: git-commit logged updates
[m*   ok 31: git cat-file blob master:F (expect OTHER)
[m*   ok 32: git cat-file blob master@{2005-05-26 23:30}:F (expect TEST)
[m*   ok 33: git cat-file blob master@{2005-05-26 23:42}:F (expect OTHER)
[m[38;5;2m* passed all 33 test(s)
[m*** t1410-reflog.sh ***
*   ok 1: setup
[m*   ok 2: rewind
[m*   ok 3: corrupt and check
[m*   ok 4: reflog expire --dry-run should not touch reflog
[m*   ok 5: reflog expire
[m*   ok 6: prune and fsck
[m*   ok 7: recover and check
[m*   ok 8: delete
[m[38;5;2m* passed all 8 test(s)
[m*** t1420-lost-found.sh ***
*   ok 1: setup
[m*   ok 2: lost and found something
[m[38;5;2m* passed all 2 test(s)
[m*** t1500-rev-parse.sh ***
*   ok 1: toplevel: is-bare-repository
[m*   ok 2: toplevel: is-inside-git-dir
[m*   ok 3: toplevel: is-inside-work-tree
[m*   ok 4: toplevel: prefix
[m*   ok 5: .git/: is-bare-repository
[m*   ok 6: .git/: is-inside-git-dir
[m*   ok 7: .git/: is-inside-work-tree
[m*   ok 8: .git/: prefix
[m*   ok 9: .git/objects/: is-bare-repository
[m*   ok 10: .git/objects/: is-inside-git-dir
[m*   ok 11: .git/objects/: is-inside-work-tree
[m*   ok 12: .git/objects/: prefix
[m*   ok 13: subdirectory: is-bare-repository
[m*   ok 14: subdirectory: is-inside-git-dir
[m*   ok 15: subdirectory: is-inside-work-tree
[m*   ok 16: subdirectory: prefix
[m*   ok 17: core.bare = true: is-bare-repository
[m*   ok 18: core.bare = true: is-inside-git-dir
[m*   ok 19: core.bare = true: is-inside-work-tree
[m*   ok 20: core.bare undefined: is-bare-repository
[m*   ok 21: core.bare undefined: is-inside-git-dir
[m*   ok 22: core.bare undefined: is-inside-work-tree
[m*   ok 23: GIT_DIR=../.git, core.bare = false: is-bare-repository
[m*   ok 24: GIT_DIR=../.git, core.bare = false: is-inside-git-dir
[m*   ok 25: GIT_DIR=../.git, core.bare = false: is-inside-work-tree
[m*   ok 26: GIT_DIR=../.git, core.bare = false: prefix
[m*   ok 27: GIT_DIR=../.git, core.bare = true: is-bare-repository
[m*   ok 28: GIT_DIR=../.git, core.bare = true: is-inside-git-dir
[m*   ok 29: GIT_DIR=../.git, core.bare = true: is-inside-work-tree
[m*   ok 30: GIT_DIR=../.git, core.bare = true: prefix
[m*   ok 31: GIT_DIR=../.git, core.bare undefined: is-bare-repository
[m*   ok 32: GIT_DIR=../.git, core.bare undefined: is-inside-git-dir
[m*   ok 33: GIT_DIR=../.git, core.bare undefined: is-inside-work-tree
[m*   ok 34: GIT_DIR=../.git, core.bare undefined: prefix
[m*   ok 35: GIT_DIR=../repo.git, core.bare = false: is-bare-repository
[m*   ok 36: GIT_DIR=../repo.git, core.bare = false: is-inside-git-dir
[m*   ok 37: GIT_DIR=../repo.git, core.bare = false: is-inside-work-tree
[m*   ok 38: GIT_DIR=../repo.git, core.bare = false: prefix
[m*   ok 39: GIT_DIR=../repo.git, core.bare = true: is-bare-repository
[m*   ok 40: GIT_DIR=../repo.git, core.bare = true: is-inside-git-dir
[m*   ok 41: GIT_DIR=../repo.git, core.bare = true: is-inside-work-tree
[m*   ok 42: GIT_DIR=../repo.git, core.bare = true: prefix
[m*   ok 43: GIT_DIR=../repo.git, core.bare undefined: is-bare-repository
[m*   ok 44: GIT_DIR=../repo.git, core.bare undefined: is-inside-git-dir
[m*   ok 45: GIT_DIR=../repo.git, core.bare undefined: is-inside-work-tree
[m*   ok 46: GIT_DIR=../repo.git, core.bare undefined: prefix
[m[38;5;2m* passed all 46 test(s)
[m*** t1501-worktree.sh ***
[38;5;3m* core.worktree = relative path
[m*   ok 1: outside: is-bare-repository
[m*   ok 2: outside: is-inside-git-dir
[m*   ok 3: outside: is-inside-work-tree
[m*   ok 4: inside: is-bare-repository
[m*   ok 5: inside: is-inside-git-dir
[m*   ok 6: inside: is-inside-work-tree
[m*   ok 7: inside: prefix
[m*   ok 8: subdirectory: is-bare-repository
[m*   ok 9: subdirectory: is-inside-git-dir
[m*   ok 10: subdirectory: is-inside-work-tree
[m*   ok 11: subdirectory: prefix
[m[38;5;3m* core.worktree = absolute path
[m*   ok 12: outside: is-bare-repository
[m*   ok 13: outside: is-inside-git-dir
[m*   ok 14: outside: is-inside-work-tree
[m*   ok 15: inside: is-bare-repository
[m*   ok 16: inside: is-inside-git-dir
[m*   ok 17: inside: is-inside-work-tree
[m*   ok 18: inside: prefix
[m*   ok 19: subdirectory: is-bare-repository
[m*   ok 20: subdirectory: is-inside-git-dir
[m*   ok 21: subdirectory: is-inside-work-tree
[m*   ok 22: subdirectory: prefix
[m[38;5;3m* GIT_WORK_TREE=relative path (override core.worktree)
[m*   ok 23: outside: is-bare-repository
[m*   ok 24: outside: is-inside-git-dir
[m*   ok 25: outside: is-inside-work-tree
[m*   ok 26: inside: is-bare-repository
[m*   ok 27: inside: is-inside-git-dir
[m*   ok 28: inside: is-inside-work-tree
[m*   ok 29: inside: prefix
[m*   ok 30: subdirectory: is-bare-repository
[m*   ok 31: subdirectory: is-inside-git-dir
[m*   ok 32: subdirectory: is-inside-work-tree
[m*   ok 33: subdirectory: prefix
[m[38;5;3m* GIT_WORK_TREE=absolute path, work tree below git dir
[m*   ok 34: outside: is-bare-repository
[m*   ok 35: outside: is-inside-git-dir
[m*   ok 36: outside: is-inside-work-tree
[m*   ok 37: in repo.git: is-bare-repository
[m*   ok 38: in repo.git: is-inside-git-dir
[m*   ok 39: in repo.git: is-inside-work-tree
[m*   ok 40: in repo.git/objects: is-bare-repository
[m*   ok 41: in repo.git/objects: is-inside-git-dir
[m*   ok 42: in repo.git/objects: is-inside-work-tree
[m*   ok 43: in repo.git/work: is-bare-repository
[m*   ok 44: in repo.git/work: is-inside-git-dir
[m*   ok 45: in repo.git/work: is-inside-work-tree
[m*   ok 46: in repo.git/work: prefix
[m*   ok 47: in repo.git/sub/dir: is-bare-repository
[m*   ok 48: in repo.git/sub/dir: is-inside-git-dir
[m*   ok 49: in repo.git/sub/dir: is-inside-work-tree
[m*   ok 50: in repo.git/sub/dir: prefix
[m*   ok 51: repo finds its work tree
[m*   ok 52: repo finds its work tree from work tree, too
[m*   ok 53: _gently() groks relative GIT_DIR & GIT_WORK_TREE
[m[38;5;2m* passed all 53 test(s)
[m*** t1502-rev-parse-parseopt.sh ***
*   ok 1: test --parseopt help output
[m[38;5;2m* passed all 1 test(s)
[m*** t2000-checkout-cache-clash.sh ***
*   ok 1: git update-index --add various paths.
[m*   ok 2: git checkout-index without -f should fail on conflicting work tree.
[m*   ok 3: git checkout-index with -f should succeed.
[m*   ok 4: git checkout-index conflicting paths.
[m[38;5;2m* passed all 4 test(s)
[m*** t2001-checkout-cache-clash.sh ***
*   ok 1: git update-index --add path0/file0
[m*   ok 2: writing tree out with git write-tree
[m*   ok 3: git update-index --add path1/file1
[m*   ok 4: writing tree out with git write-tree
[m*   ok 5: read previously written tree and checkout.
[m*   ok 6: git update-index --add a symlink.
[m*   ok 7: writing tree out with git write-tree
[m*   ok 8: read previously written tree and checkout.
[m*   ok 9: checking out conflicting path with -f
[m[38;5;2m* passed all 9 test(s)
[m*** t2002-checkout-cache-u.sh ***
*   ok 1: preparation
[m*   ok 2: without -u, git checkout-index smudges stat information.
[m*   ok 3: with -u, git checkout-index picks up stat information from new files.
[m[38;5;2m* passed all 3 test(s)
[m*** t2003-checkout-cache-mkdir.sh ***
*   ok 1: setup
[m*   ok 2: have symlink in place where dir is expected.
[m*   ok 3: use --prefix=path2/
[m*   ok 4: use --prefix=tmp-
[m*   ok 5: use --prefix=tmp- but with a conflicting file and dir
[m*   ok 6: use --prefix=tmp/orary/ where tmp is a symlink
[m*   ok 7: use --prefix=tmp/orary- where tmp is a symlink
[m*   ok 8: use --prefix=tmp- where tmp-path1 is a symlink
[m[38;5;2m* passed all 8 test(s)
[m*** t2004-checkout-cache-temp.sh ***
*   ok 1: preparation
[m*   ok 2: checkout one stage 0 to temporary file
[m*   ok 3: checkout all stage 0 to temporary files
[m*   ok 4: prepare 3-way merge
[m*   ok 5: checkout one stage 2 to temporary file
[m*   ok 6: checkout all stage 2 to temporary files
[m*   ok 7: checkout all stages/one file to nothing
[m*   ok 8: checkout all stages/one file to temporary files
[m*   ok 9: checkout some stages/one file to temporary files
[m*   ok 10: checkout all stages/all files to temporary files
[m*   ok 11: -- path0: no entry
[m*   ok 12: -- path1: all 3 stages
[m*   ok 13: -- path2: no stage 1, have stage 2 and 3
[m*   ok 14: -- path3: no stage 2, have stage 1 and 3
[m*   ok 15: -- path4: no stage 3, have stage 1 and 3
[m*   ok 16: -- asubdir/path5: no stage 2 and 3 have stage 1
[m*   ok 17: checkout --temp within subdir
[m*   ok 18: checkout --temp symlink
[m[38;5;2m* passed all 18 test(s)
[m*** t2005-checkout-index-symlinks.sh ***
*   ok 1: preparation
[m*   ok 2: the checked-out symlink must be a file
[m*   ok 3: the file must be the blob we added during the setup
[m[38;5;2m* passed all 3 test(s)
[m*** t2007-checkout-symlink.sh ***
*   ok 1: setup
[m*   ok 2: switch from symlink to dir
[mAlready on "master"
*   ok 3: switch from dir to symlink
[m[38;5;2m* passed all 3 test(s)
[m*** t2008-checkout-subdir.sh ***
*   ok 1: setup
[m*   ok 2: remove and restore with relative path
[m*   ok 3: checkout with empty prefix
[m*   ok 4: checkout with simple prefix
[m*   ok 5: relative path outside tree should fail
[m*   ok 6: incorrect relative path to file should fail (1)
[m*   ok 7: incorrect relative path should fail (2)
[m*   ok 8: incorrect relative path should fail (3)
[m[38;5;2m* passed all 8 test(s)
[m*** t2009-checkout-statinfo.sh ***
*   ok 1: setup
[m*   ok 2: branch switching
[m*   ok 3: path checkout
[m[38;5;2m* passed all 3 test(s)
[m*** t2050-git-dir-relative.sh ***
*   ok 1: Setting up post-commit hook
[m*   ok 2: post-commit hook used ordinarily
[m*   ok 3: post-commit-hook created and used from top dir
[m*   ok 4: post-commit-hook from sub dir
[m[38;5;2m* passed all 4 test(s)
[m*** t2100-update-cache-badpath.sh ***
*   ok 1: git update-index --add to add various paths.
[m*   ok 2: git update-index to add conflicting path path0/file0 should fail.
[m*   ok 3: git update-index to add conflicting path path1/file1 should fail.
[m*   ok 4: git update-index to add conflicting path path2 should fail.
[m*   ok 5: git update-index to add conflicting path path3 should fail.
[m[38;5;2m* passed all 5 test(s)
[m*** t2101-update-index-reupdate.sh ***
*   ok 1: update-index --add
[m*   ok 2: update-index --again
[m*   ok 3: update-index --remove --again
[m*   ok 4: first commit
[m*   ok 5: update-index again
[m*   ok 6: update-index --update from subdir
[m*   ok 7: update-index --update with pathspec
[m[38;5;2m* passed all 7 test(s)
[m*** t2102-update-index-symlinks.sh ***
*   ok 1: preparation
[m*   ok 2: modify the symbolic link
[m*   ok 3: the index entry must still be a symbolic link
[m[38;5;2m* passed all 3 test(s)
[m*** t2200-add-update.sh ***
*   ok 1: setup
[m*   ok 2: update
[m*   ok 3: update noticed a removal
[m*   ok 4: update touched correct path
[m*   ok 5: update did not touch other tracked files
[m*   ok 6: update did not touch untracked files
[m*   ok 7: cache tree has not been corrupted
[m*   ok 8: update from a subdirectory
[m*   ok 9: change gets noticed
[m*   ok 10: replace a file with a symlink
[m*   ok 11: add everything changed
[m*   ok 12: touch and then add -u
[m*   ok 13: touch and then add explicitly
[m[38;5;2m* passed all 13 test(s)
[m*** t2201-add-update-typechange.sh ***
*   ok 1: setup
[m*   ok 2: modify
[m*   ok 3: diff-files
[m*   ok 4: diff-index
[m*   ok 5: add -u
[m*   ok 6: commit -a
[m[38;5;2m* passed all 6 test(s)
[m*** t3000-ls-files-others.sh ***
*   ok 1: git ls-files --others to show output.
[m*   ok 2: git ls-files --others should pick up symlinks.
[m*   ok 3: git ls-files --others --directory to show output.
[m*   ok 4: git ls-files --others --directory should not get confused.
[m[38;5;2m* passed all 4 test(s)
[m*** t3001-ls-files-others-exclude.sh ***
*   ok 1: git ls-files --others with various exclude options.
[m*   ok 2: git ls-files --others with \r\n line endings.
[m*   ok 3: git-status honours core.excludesfile
[m*   ok 4: trailing slash in exclude allows directory match(1)
[m*   ok 5: trailing slash in exclude allows directory match (2)
[m*   ok 6: trailing slash in exclude forces directory match (1)
[m*   ok 7: trailing slash in exclude forces directory match (2)
[m[38;5;2m* passed all 7 test(s)
[m*** t3002-ls-files-dashpath.sh ***
*   ok 1: setup
[m*   ok 2: git ls-files without path restriction.
[m*   ok 3: git ls-files with path restriction.
[m*   ok 4: git ls-files with path restriction with --.
[m*   ok 5: git ls-files with path restriction with -- --.
[m*   ok 6: git ls-files with no path restriction.
[m[38;5;2m* passed all 6 test(s)
[m*** t3010-ls-files-killed-modified.sh ***
*   ok 1: git update-index --add to add various paths.
[m*   ok 2: git ls-files -k to show killed files.
[m*   ok 3: validate git ls-files -k output.
[m*   ok 4: git ls-files -m to show modified files.
[m*   ok 5: validate git ls-files -m output.
[m[38;5;2m* passed all 5 test(s)
[m*** t3020-ls-files-error-unmatch.sh ***
Created initial commit a4163cb: add foo bar
 0 files changed, 0 insertions(+), 0 deletions(-)
 create mode 100644 bar
 create mode 100644 foo
*   ok 1: git ls-files --error-unmatch should fail with unmatched path.
[m*   ok 2: git ls-files --error-unmatch should succeed eith matched paths.
[m[38;5;2m* passed all 2 test(s)
[m*** t3030-merge-recursive.sh ***
*   ok 1: setup 1
[m*   ok 2: setup 2
[m*   ok 3: setup 3
[m*   ok 4: setup 4
[m*   ok 5: setup 5
[m*   ok 6: setup 6
[m*   ok 7: merge-recursive simple
[m*   ok 8: merge-recursive result
[m*   ok 9: merge-recursive remove conflict
[m*   ok 10: merge-recursive remove conflict
[m*   ok 11: merge-recursive d/f simple
[m*   ok 12: merge-recursive result
[m*   ok 13: merge-recursive d/f conflict
[m*   ok 14: merge-recursive d/f conflict result
[m*   ok 15: merge-recursive d/f conflict the other way
[m*   ok 16: merge-recursive d/f conflict result the other way
[m*   ok 17: merge-recursive d/f conflict
[m*   ok 18: merge-recursive d/f conflict result
[m*   ok 19: merge-recursive d/f conflict
[m*   ok 20: merge-recursive d/f conflict result
[m*   ok 21: reset and 3-way merge
[m*   ok 22: reset and bind merge
[m[38;5;2m* passed all 22 test(s)
[m*** t3040-subprojects-basic.sh ***
*   ok 1: Super project creation
[m*   ok 2: create subprojects
[m*   ok 3: check if fsck ignores the subprojects
[m*   ok 4: check if commit in a subproject detected
[m*   ok 5: check if a changed subproject HEAD can be committed
[m*   ok 6: check if diff-index works for subproject elements
[m*   ok 7: check if diff-tree works for subproject elements
[m*   ok 8: check if git diff works for subproject elements
[m*   ok 9: check if clone works
[m*   ok 10: removing and adding subproject
[m*   ok 11: checkout in superproject
[m[38;5;2m* passed all 11 test(s)
[m*** t3050-subprojects-fetch.sh ***
*   ok 1: setup
[m*   ok 2: clone
[m*   ok 3: advance
[m*   ok 4: fetch
[m[38;5;2m* passed all 4 test(s)
[m*** t3060-ls-files-with-tree.sh ***
*   ok 1: setup
[m*   ok 2: git -ls-files --with-tree should succeed from subdir
[m*   ok 3: git -ls-files --with-tree should add entries from named tree.
[m[38;5;2m* passed all 3 test(s)
[m*** t3100-ls-tree-restrict.sh ***
*   ok 1: setup
[m*   ok 2: ls-tree plain
[m*   ok 3: ls-tree recursive
[m*   ok 4: ls-tree recursive with -t
[m*   ok 5: ls-tree recursive with -d
[m*   ok 6: ls-tree filtered with path
[m*   ok 7: ls-tree filtered with path1 path0
[m*   ok 8: ls-tree filtered with path0/
[m*   ok 9: ls-tree filtered with path2
[m*   ok 10: ls-tree filtered with path2/
[m*   ok 11: ls-tree filtered with path2/baz
[m*   ok 12: ls-tree filtered with path2/bak
[m*   ok 13: ls-tree -t filtered with path2/bak
[m[38;5;2m* passed all 13 test(s)
[m*** t3101-ls-tree-dirname.sh ***
*   ok 1: setup
[m*   ok 2: ls-tree plain
[m*   ok 3: ls-tree recursive
[m*   ok 4: ls-tree filter 1.txt
[m*   ok 5: ls-tree filter path1/b/c/1.txt
[m*   ok 6: ls-tree filter all 1.txt files
[m*   ok 7: ls-tree filter directories
[m*   ok 8: ls-tree filter odd names
[m*   ok 9: ls-tree filter missing files and extra slashes
[m[38;5;2m* passed all 9 test(s)
[m*** t3200-branch.sh ***
*   ok 1: prepare a trivial repository
[m*   ok 2: git branch --help should not have created a bogus branch
[m*   ok 3: git branch abc should create a branch
[m*   ok 4: git branch a/b/c should create a branch
[m*   ok 5: git branch -l d/e/f should create a branch and a log
[m*   ok 6: git branch -d d/e/f should delete a branch and a log
[m*   ok 7: git branch j/k should work after branch j has been deleted
[m*   ok 8: git branch l should work after branch l/m has been deleted
[m*   ok 9: git branch -m m m/m should work
[m*   ok 10: git branch -m n/n n should work
[m*   ok 11: git branch -m o/o o should fail when o/p exists
[m*   ok 12: git branch -m q r/q should fail when r exists
[m*   ok 13: git branch -m q q2 without config should succeed
[m*   ok 14: git branch -m s/s s should work when s/t is deleted
[m*   ok 15: config information was renamed, too
[m*   ok 16: git branch -m u v should fail when the reflog for u is a symlink
[m*   ok 17: test tracking setup via --track
[m*   ok 18: test tracking setup (non-wildcard, matching)
[m*   ok 19: test tracking setup (non-wildcard, not matching)
[m*   ok 20: test tracking setup via config
[m*   ok 21: test overriding tracking setup via --no-track
[m*   ok 22: no tracking without .fetch entries
[m*   ok 23: test tracking setup via --track but deeper
[m*   ok 24: test deleting branch deletes branch config
[m*   ok 25: test deleting branch without config
[m*   ok 26: test --track without .fetch entries
[m*   ok 27: branch from non-branch HEAD w/autosetupmerge=always
[m*   ok 28: branch from non-branch HEAD w/--track causes failure
[m*   ok 29: git checkout -b g/h/i -l should create a branch and a log
[m*   ok 30: avoid ambiguous track
[m[38;5;2m* passed all 30 test(s)
[m*** t3201-branch-contains.sh ***
*   ok 1: setup
[m*   ok 2: branch --contains=master
[m*   ok 3: branch --contains master
[m*   ok 4: branch --contains=side
[m[38;5;2m* passed all 4 test(s)
[m*** t3210-pack-refs.sh ***
*   ok 1: prepare a trivial repository
[m*   ok 2: see if git show-ref works as expected
[m*   ok 3: see if a branch still exists when packed
[m*   ok 4: git branch c/d should barf if branch c exists
[m*   ok 5: see if a branch still exists after git pack-refs --prune
[m*   ok 6: see if git pack-refs --prune remove ref files
[m*   ok 7: git branch g should work when git branch g/h has been deleted
[m*   ok 8: git branch i/j/k should barf if branch i exists
[m*   ok 9: test git branch k after branch k/l/m and k/lm have been deleted
[m*   ok 10: test git branch n after some branch deletion and pruning
[m*   ok 11: pack, prune and repack
[m[38;5;2m* passed all 11 test(s)
[m*** t3300-funny-names.sh ***
*   ok 1: git ls-files no-funny
[m*   ok 2: git ls-files with-funny
[m*   ok 3: git ls-files -z with-funny
[m*   ok 4: git ls-tree with funny
[m*   ok 5: git diff-index with-funny
[m*   ok 6: git diff-tree with-funny
[m*   ok 7: git diff-index -z with-funny
[m*   ok 8: git diff-tree -z with-funny
[m*   ok 9: git diff-tree -C with-funny
[m*   ok 10: git diff-tree delete with-funny
[m*   ok 11: git diff-tree delete with-funny
[m*   ok 12: git diff-tree delete with-funny
[m*   ok 13: git diff-tree rename with-funny applied
[m*   ok 14: git diff-tree delete with-funny applied
[m*   ok 15: git apply non-git diff
[m[38;5;2m* passed all 15 test(s)
[m*** t3400-rebase.sh ***
*   ok 1: prepare repository with topic branches
[m*   ok 2: rebase against master
[m*   ok 3: the rebase operation should not have destroyed author information
[m*   ok 4: rebase after merge master
[m*   ok 5: rebase of history with merges is linearized
[m*   ok 6: rebase of history with merges after upstream merge is linearized
[m*   ok 7: rebase a single mode change
[m[38;5;2m* passed all 7 test(s)
[m*** t3401-rebase-partial.sh ***
*   ok 1: prepare repository with topic branch
[m*   ok 2: pick top patch from topic branch into master
[m*   ok 3: rebase topic branch against new master and check git-am did not get halted
[m*   ok 4: rebase --merge topic branch that was partially merged upstream
[m[38;5;2m* passed all 4 test(s)
[m*** t3402-rebase-merge.sh ***
*   ok 1: setup
[m*   ok 2: reference merge
[m*   ok 3: rebase
[m*   ok 4: test-rebase@{1} is pre rebase
[m*   ok 5: merge and rebase should match
[m*   ok 6: rebase the other way
[m*   ok 7: merge and rebase should match
[m*   ok 8: picking rebase
[m[38;5;2m* passed all 8 test(s)
[m*** t3403-rebase-skip.sh ***
*   ok 1: setup
[m*   ok 2: rebase with git am -3 (default)
[m*   ok 3: rebase --skip with am -3
[m*   ok 4: rebase moves back to skip-reference
[m*   ok 5: checkout skip-merge
[m*   ok 6: rebase with --merge
[m*   ok 7: rebase --skip with --merge
[m*   ok 8: merge and reference trees equal
[m*   ok 9: moved back to branch correctly
[m[38;5;2m* passed all 9 test(s)
[m*** t3404-rebase-interactive.sh ***
*   ok 1: setup
[m*   ok 2: no changes are a nop
[m*   ok 3: test the [branch] option
[m*   ok 4: rebase on top of a non-conflicting commit
[m*   ok 5: reflog for the branch shows state before rebase
[m*   ok 6: exchange two commits
[m*   ok 7: stop on conflicting pick
[m*   ok 8: abort
[m*   ok 9: retain authorship
[m*   ok 10: squash
[m*   ok 11: retain authorship when squashing
[m*   ok 12: -p handles "no changes" gracefully
[m*   ok 13: preserve merges with -p
[m*   ok 14: --continue tries to commit
[m*   ok 15: verbose flag is heeded, even after --continue
[m*   ok 16: multi-squash only fires up editor once
[m*   ok 17: squash works as expected
[m*   ok 18: interrupted squash works as expected
[m*   ok 19: interrupted squash works as expected (case 2)
[m*   ok 20: ignore patch if in upstream
[m*   ok 21: --continue tries to commit, even for "edit"
[m*   ok 22: rebase a detached HEAD
[m*   ok 23: rebase a commit violating pre-commit
[m*   ok 24: rebase with a file named HEAD in worktree
[m[38;5;2m* passed all 24 test(s)
[m*** t3405-rebase-malformed.sh ***
*   ok 1: setup
[m*   ok 2: rebase
[m[38;5;2m* passed all 2 test(s)
[m*** t3406-rebase-message.sh ***
*   ok 1: setup
[m*   ok 2: rebase -m
[m[38;5;2m* passed all 2 test(s)
[m*** t3407-rebase-abort.sh ***
*   ok 1: setup
[m*   ok 2: rebase --abort
[m*   ok 3: rebase --abort after --skip
[m*   ok 4: rebase --abort after --continue
[m*   ok 5: rebase --merge --abort
[m*   ok 6: rebase --merge --abort after --skip
[m*   ok 7: rebase --merge --abort after --continue
[m[38;5;2m* passed all 7 test(s)
[m*** t3408-rebase-multi-line.sh ***
*   ok 1: setup
[m*   ok 2: rebase
[m[38;5;2m* passed all 2 test(s)
[m*** t3500-cherry.sh ***
*   ok 1: prepare repository with topic branch, and check cherry finds the 2 patches from there
[m*   ok 2: check that cherry with limit returns only the top patch
[m*   ok 3: cherry-pick one of the 2 patches, and check cherry recognized one and only one as new
[m[38;5;2m* passed all 3 test(s)
[m*** t3501-revert-cherry-pick.sh ***
*   ok 1: setup
[m*   ok 2: cherry-pick after renaming branch
[m*   ok 3: revert after renaming branch
[m*   ok 4: revert forbidden on dirty working tree
[m[38;5;2m* passed all 4 test(s)
[m*** t3502-cherry-pick-merge.sh ***
*   ok 1: setup
[m*   ok 2: cherry-pick a non-merge with -m should fail
[m*   ok 3: cherry pick a merge without -m should fail
[m*   ok 4: cherry pick a merge (1)
[m*   ok 5: cherry pick a merge (2)
[m*   ok 6: cherry pick a merge relative to nonexistent parent should fail
[m*   ok 7: revert a non-merge with -m should fail
[m*   ok 8: revert a merge without -m should fail
[m*   ok 9: revert a merge (1)
[m*   ok 10: revert a merge (2)
[m*   ok 11: revert a merge relative to nonexistent parent should fail
[m[38;5;2m* passed all 11 test(s)
[m*** t3600-rm.sh ***
*   ok 1: Initialize test directory
[m*   ok 2: Determine rm behavior
[m*   ok 3: Pre-check that foo exists and is in index before git rm foo
[m*   ok 4: Test that git rm foo succeeds
[m*   ok 5: Test that git rm --cached foo succeeds if the index matches the file
[m*   ok 6: Test that git rm --cached foo succeeds if the index matches the file
[m*   ok 7: Test that git rm --cached foo fails if the index matches neither the file nor HEAD
[m*   ok 8: Test that git rm --cached -f foo works in case where --cached only did not
[m*   ok 9: Post-check that foo exists but is not in index after git rm foo
[m*   ok 10: Pre-check that bar exists and is in index before "git rm bar"
[m*   ok 11: Test that "git rm bar" succeeds
[m*   ok 12: Post-check that bar does not exist and is not in index after "git rm -f bar"
[m*   ok 13: Test that "git rm -- -q" succeeds (remove a file that looks like an option)
[m*   ok 14: Test that "git rm -f" succeeds with embedded space, tab, or newline characters.
[m*   ok 15: Test that "git rm -f" fails if its rm fails
[m*   ok 16: When the rm in "git rm -f" fails, it should not remove the file from the index
[m*   ok 17: Remove nonexistent file with --ignore-unmatch
[m*   ok 18: "rm" command printed
[m*   ok 19: "rm" command suppressed with --quiet
[m*   ok 20: Re-add foo and baz
[m*   ok 21: Modify foo -- rm should refuse
[m*   ok 22: Modified foo -- rm -f should work
[m*   ok 23: Re-add foo and baz for HEAD tests
[m*   ok 24: foo is different in index from HEAD -- rm should refuse
[m*   ok 25: but with -f it should work.
[m*   ok 26: Recursive test setup
[m*   ok 27: Recursive without -r fails
[m*   ok 28: Recursive with -r but dirty
[m*   ok 29: Recursive with -r -f
[m*   ok 30: Remove nonexistent file returns nonzero exit status
[m[38;5;2m* passed all 30 test(s)
[m*** t3700-add.sh ***
*   ok 1: Test of git add
[m*   ok 2: Post-check that foo is in the index
[m*   ok 3: Test that "git add -- -q" works
[m*   ok 4: git add: Test that executable bit is not used if core.filemode=0
[m*   ok 5: git add: filemode=0 should not get confused by symlink
[m*   ok 6: git update-index --add: Test that executable bit is not used...
[m*   ok 7: git add: filemode=0 should not get confused by symlink
[m*   ok 8: git update-index --add: Test that executable bit is not used...
[m*   ok 9: .gitignore test setup
[m*   ok 10: .gitignore is honored
[m*   ok 11: error out when attempting to add ignored ones without -f
[m*   ok 12: error out when attempting to add ignored ones without -f
[m*   ok 13: add ignored ones with -f
[m*   ok 14: add ignored ones with -f
[m*   ok 15: add ignored ones with -f
[m*   ok 16: .gitignore with subdirectory
[m*   ok 17: check correct prefix detection
[m*   ok 18: git add with filemode=0, symlinks=0, and unmerged entries
[m*   ok 19: git add with filemode=0, symlinks=0 prefers stage 2 over stage 1
[m*   ok 20: git add --refresh
[m[38;5;2m* passed all 20 test(s)
[m*** t3701-add-interactive.sh ***
*   ok 1: setup (initial)
[m[1m[38;5;1m* FAIL 2: status works (initial)
[m	
		git add -i </dev/null >output &&
		grep "+1/-0 *+2/-0 file" output
	
[1m[38;5;1m* FAIL 3: diff works (initial)
[m	
		(echo d; echo 1) | git add -i >output &&
		sed -ne "/new file/,/content/p" <output >diff &&
		test_cmp expected diff
	
[1m[38;5;1m* FAIL 4: revert works (initial)
[m	
		git add file &&
		(echo r; echo 1) | git add -i &&
		git ls-files >output &&
		! grep . output
	
*   ok 5: setup (commit)
[m[1m[38;5;1m* FAIL 6: status works (commit)
[m	
		git add -i </dev/null >output &&
		grep "+1/-0 *+2/-0 file" output
	
[1m[38;5;1m* FAIL 7: diff works (commit)
[m	
		(echo d; echo 1) | git add -i >output &&
		sed -ne "/^index/,/content/p" <output >diff &&
		test_cmp expected diff
	
[1m[38;5;1m* FAIL 8: revert works (commit)
[m	
		git add file &&
		(echo r; echo 1) | git add -i &&
		git add -i </dev/null >output &&
		grep "unchanged *+3/-0 file" output
	
[1m[38;5;1m* failed 6 among 8 test(s)
[mmake[1]: *** [t3701-add-interactive.sh] Error 1
make[1]: Leaving directory `/var/tmp/portage/dev-util/git-1.5.5.1/work/git-1.5.5.1/t'
make: *** [test] Error 2
 [31;01m*[0m 
 [31;01m*[0m ERROR: dev-util/git-1.5.5.1 failed.
 [31;01m*[0m Call stack:
 [31;01m*[0m               ebuild.sh, line   49:  Called src_test
 [31;01m*[0m             environment, line 2750:  Called die
 [31;01m*[0m The specific snippet of code:
 [31;01m*[0m       emake ${MY_MAKEOPTS} DESTDIR="${D}" prefix=/usr test || die "tests failed"
 [31;01m*[0m  The die message:
 [31;01m*[0m   tests failed
 [31;01m*[0m 
 [31;01m*[0m If you need support, post the topmost build error, and the call stack if relevant.
 [31;01m*[0m A complete build log is located at '/var/log/portage/dev-util:git-1.5.5.1:20080427-163928.log'.
 [31;01m*[0m The ebuild environment file is located at '/var/tmp/portage/dev-util/git-1.5.5.1/temp/environment'.
 [31;01m*[0m