* Package: dev-vcs/git-1.7.3.4-r1  * Repository: gentoo  * Maintainer: robbat2@gentoo.org ricmm@gentoo.org  * USE: bash-completion blksha1 curl elibc_glibc iconv kernel_linux perl subversion test threads userland_GNU webdav x86 >>> Unpacking source... >>> Unpacking git-1.7.3.4.tar.bz2 to /home/portage/dev-vcs/git-1.7.3.4-r1/work >>> Unpacking git-manpages-1.7.3.4.tar.bz2 to /home/portage/dev-vcs/git-1.7.3.4-r1/work/git-1.7.3.4 >>> Source unpacked in /home/portage/dev-vcs/git-1.7.3.4-r1/work >>> Preparing source in /home/portage/dev-vcs/git-1.7.3.4-r1/work/git-1.7.3.4 ... * Applying git-1.7.2-always-install-js.patch ...  [ ok ] * Applying git-1.7.3.4-avoid-shell-issues.patch ...  [ ok ] * Applying git-1.7.3.4-fix-perl-test-prereq.patch ...  [ ok ] * Applying git-1.7.3.2-interix.patch ...  [ ok ] >>> Source prepared. >>> Configuring source in /home/portage/dev-vcs/git-1.7.3.4-r1/work/git-1.7.3.4 ... >>> Source configured. >>> Compiling source in /home/portage/dev-vcs/git-1.7.3.4-r1/work/git-1.7.3.4 ... make -j6 BLK_SHA1=YesPlease NO_FINK=YesPlease NO_DARWIN_PORTS=YesPlease INSTALL=install TAR=tar SHELL_PATH=/bin/sh SANE_TOOL_PATH= OLD_ICONV= NO_EXTERNAL_GREP= NO_TCLTK=YesPlease INSTALLDIRS=vendor THREADED_DELTA_SEARCH=YesPlease ASCIIDOC_NO_ROFF=YesPlease DESTDIR=/home/portage/dev-vcs/git-1.7.3.4-r1/image/ 'OPTCFLAGS=-O2 -march=pentium-m -pipe -fomit-frame-pointer' 'OPTLDFLAGS=-Wl,-O1 -Wl,--as-needed -Wl,--hash-style=gnu' OPTCC=i686-pc-linux-gnu-gcc OPTAR=i686-pc-linux-gnu-ar prefix=/usr htmldir=/usr/share/doc/git-1.7.3.4-r1/html sysconfdir=/etc PYTHON_PATH=/usr/bin/python 'PERL_PATH=/usr/bin/env perl' PERL_MM_OPT= GIT_TEST_OPTS=--no-color GIT_VERSION = 1.7.3.4 * new build flags or prefix 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-pull GEN git-quiltimport GEN git-rebase--interactive GEN git-rebase GEN git-repack GEN git-request-pull GEN git-stash GEN git-submodule GEN git-web--browse SUBDIR perl GEN git-remote-testgit SUBDIR gitweb /usr/bin/env perl Makefile.PL PREFIX='/usr' INSTALL_BASE='' GEN git-mergetool--lib GEN git-parse-remote GEN git-sh-setup SUBDIR ../ CC builtin/add.o GEN common-cmds.h CC builtin/annotate.o CC builtin/apply.o CC builtin/archive.o make[2]: `GIT-VERSION-FILE' is up to date. GEN gitweb.cgi CC builtin/bisect--helper.o Writing perl.mak for Git 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-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/hash-object.o CC builtin/help.o CC builtin/index-pack.o CC builtin/init-db.o CC builtin/log.o CC builtin/ls-files.o CC builtin/ls-remote.o CC builtin/ls-tree.o CC builtin/mailinfo.o CC builtin/mailsplit.o CC builtin/merge.o builtin/log.c: In function ‘show_object’: builtin/log.c:361: warning: ignoring return value of ‘fwrite’, declared with attribute warn_unused_result CC builtin/merge-base.o CC builtin/merge-file.o CC builtin/merge-index.o builtin/mailinfo.c: In function ‘handle_patch’: builtin/mailinfo.c:833: warning: ignoring return value of ‘fwrite’, declared with attribute warn_unused_result CC builtin/merge-ours.o CC builtin/merge-recursive.o CC builtin/merge-tree.o CC builtin/mktag.o CC builtin/mktree.o CC builtin/mv.o CC builtin/name-rev.o CC builtin/notes.o CC builtin/pack-objects.o CC builtin/pack-redundant.o CC builtin/pack-refs.o builtin/name-rev.c: In function ‘name_rev_line’: builtin/name-rev.c:218: warning: ignoring return value of ‘fwrite’, declared with attribute warn_unused_result CC builtin/patch-id.o CC builtin/prune-packed.o CC builtin/prune.o CC builtin/push.o CC builtin/read-tree.o CC builtin/receive-pack.o CC builtin/reflog.o CC builtin/remote.o CC builtin/replace.o CC builtin/rerere.o CC builtin/reset.o CC builtin/rev-list.o CC builtin/rev-parse.o CC builtin/revert.o CC builtin/rm.o CC builtin/send-pack.o CC builtin/shortlog.o builtin/rev-list.c: In function ‘show_commit’: builtin/rev-list.c:151: warning: ignoring return value of ‘fwrite’, declared with attribute warn_unused_result CC builtin/show-branch.o CC builtin/show-ref.o CC builtin/stripspace.o builtin/shortlog.c: In function ‘shortlog_output’: builtin/shortlog.c:338: warning: ignoring return value of ‘fwrite’, declared with attribute warn_unused_result CC builtin/symbolic-ref.o CC builtin/tag.o CC builtin/tar-tree.o CC builtin/unpack-file.o CC builtin/unpack-objects.o builtin/tag.c: In function ‘show_reference’: builtin/tag.c:79: warning: ignoring return value of ‘fwrite’, declared with attribute warn_unused_result CC builtin/update-index.o CC builtin/update-ref.o CC builtin/update-server-info.o CC builtin/upload-archive.o CC builtin/var.o CC builtin/verify-pack.o CC builtin/verify-tag.o CC builtin/write-tree.o CC test-chmtime.o CC test-ctype.o CC test-date.o CC test-delta.o CC test-dump-cache-tree.o CC test-genrandom.o CC test-line-buffer.o CC vcs-svn/string_pool.o CC vcs-svn/line_buffer.o CC vcs-svn/repo_tree.o CC vcs-svn/fast_export.o CC vcs-svn/svndump.o vcs-svn/line_buffer.c: In function ‘buffer_copy_bytes’: vcs-svn/line_buffer.c:76: warning: ignoring return value of ‘fwrite’, declared with attribute warn_unused_result CC test-match-trees.o CC test-obj-pool.o CC test-parse-options.o CC test-path-utils.o CC test-run-command.o CC test-sha1.o CC test-sigchain.o CC test-string-pool.o CC test-svn-fe.o CC test-treap.o CC test-index-version.o GEN bin-wrappers/git GEN bin-wrappers/git-upload-pack GEN bin-wrappers/git-receive-pack GEN bin-wrappers/git-upload-archive GEN bin-wrappers/git-shell GEN bin-wrappers/git-cvsserver GEN bin-wrappers/test-chmtime GEN bin-wrappers/test-ctype GEN bin-wrappers/test-date GEN bin-wrappers/test-delta GEN bin-wrappers/test-dump-cache-tree GEN bin-wrappers/test-genrandom GEN bin-wrappers/test-line-buffer GEN bin-wrappers/test-match-trees GEN bin-wrappers/test-obj-pool GEN bin-wrappers/test-parse-options GEN bin-wrappers/test-path-utils GEN bin-wrappers/test-run-command GEN bin-wrappers/test-sha1 GEN bin-wrappers/test-sigchain GEN bin-wrappers/test-string-pool GEN bin-wrappers/test-svn-fe GEN bin-wrappers/test-treap GEN bin-wrappers/test-index-version CC fast-import.o CC abspath.o CC advice.o CC alias.o CC alloc.o CC archive.o CC archive-tar.o CC archive-zip.o CC attr.o CC base85.o fast-import.c: In function ‘parse_progress’: fast-import.c:2696: warning: ignoring return value of ‘fwrite’, declared with attribute warn_unused_result 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 hex.o diff.c: In function ‘emit_line_0’: diff.c:304: warning: ignoring return value of ‘fwrite’, declared with attribute warn_unused_result diff.c:326: warning: ignoring return value of ‘fwrite’, declared with attribute warn_unused_result CC ident.o graph.c: In function ‘graph_show_commit’: graph.c:1235: warning: ignoring return value of ‘fwrite’, declared with attribute warn_unused_result graph.c: In function ‘graph_show_oneline’: graph.c:1252: warning: ignoring return value of ‘fwrite’, declared with attribute warn_unused_result graph.c: In function ‘graph_show_padding’: graph.c:1264: warning: ignoring return value of ‘fwrite’, declared with attribute warn_unused_result graph.c: In function ‘graph_show_remainder’: graph.c:1281: warning: ignoring return value of ‘fwrite’, declared with attribute warn_unused_result graph.c: In function ‘graph_show_strbuf’: graph.c:1301: warning: ignoring return value of ‘fwrite’, declared with attribute warn_unused_result graph.c:1319: warning: ignoring return value of ‘fwrite’, declared with attribute warn_unused_result graph.c: In function ‘graph_show_commit_msg’: graph.c:1339: warning: ignoring return value of ‘fwrite’, declared with attribute warn_unused_result CC levenshtein.o grep.c: In function ‘std_output’: grep.c:798: warning: ignoring return value of ‘fwrite’, declared with attribute warn_unused_result 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 log-tree.c: In function ‘show_log’: log-tree.c:529: warning: ignoring return value of ‘fwrite’, declared with attribute warn_unused_result log-tree.c: In function ‘log_tree_diff_flush’: log-tree.c:568: warning: ignoring return value of ‘fwrite’, declared with attribute warn_unused_result CC merge-recursive.o CC name-hash.o CC notes.o CC notes-cache.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 replace_object.o CC rerere.o CC resolve-undo.o CC revision.o CC run-command.o CC server-info.o CC setup.o quote.c: In function ‘quote_c_style_counted’: quote.c:222: warning: ignoring return value of ‘fwrite’, declared with attribute warn_unused_result quote.c:237: warning: ignoring return value of ‘fwrite’, declared with attribute warn_unused_result quote.c: In function ‘write_name_quotedpfx’: quote.c:292: warning: ignoring return value of ‘fwrite’, declared with attribute warn_unused_result 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 submodule.o CC symlinks.o CC tag.o CC trace.o CC transport.o submodule.c: In function ‘show_submodule_summary’: submodule.c:207: warning: ignoring return value of ‘fwrite’, declared with attribute warn_unused_result CC transport-helper.o CC tree-diff.o CC tree.o CC tree-walk.o CC unpack-trees.o CC url.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 block-sha1/sha1.o ws.c: In function ‘ws_check_emit_1’: ws.c:190: warning: ignoring return value of ‘fwrite’, declared with attribute warn_unused_result ws.c:192: warning: ignoring return value of ‘fwrite’, declared with attribute warn_unused_result ws.c:197: warning: ignoring return value of ‘fwrite’, declared with attribute warn_unused_result ws.c:199: warning: ignoring return value of ‘fwrite’, declared with attribute warn_unused_result ws.c:203: warning: ignoring return value of ‘fwrite’, declared with attribute warn_unused_result ws.c:213: warning: ignoring return value of ‘fwrite’, declared with attribute warn_unused_result ws.c:228: warning: ignoring return value of ‘fwrite’, declared with attribute warn_unused_result ws.c:236: warning: ignoring return value of ‘fwrite’, declared with attribute warn_unused_result CC thread-utils.o CC compat/strlcpy.o CC xdiff/xdiffi.o CC xdiff/xprepare.o CC xdiff/xutils.o CC xdiff/xemit.o CC xdiff/xmerge.o CC xdiff/xpatience.o CC imap-send.o CC shell.o CC show-index.o CC upload-pack.o CC http-backend.o CC http.o CC http-walker.o CC http-fetch.o CC http-push.o CC daemon.o CC remote-curl.o 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 git-instaweb CC git.o AR vcs-svn/lib.a AR libgit.a AR xdiff/lib.a LINK git-fast-import LINK git-imap-send LINK git-shell LINK git-show-index LINK git-upload-pack LINK git-http-backend LINK git-daemon LINK git-remote-http LINK git LINK test-chmtime LINK test-ctype LINK test-date LINK test-delta LINK test-dump-cache-tree LINK test-genrandom LINK test-line-buffer LINK test-match-trees LINK test-obj-pool LINK test-parse-options LINK test-path-utils LINK test-run-command LINK test-sha1 LINK test-sigchain LINK test-string-pool LINK test-svn-fe LINK test-treap LINK test-index-version LINK git-http-fetch LN/CP git-remote-https LN/CP git-remote-ftp LN/CP git-remote-ftps BUILTIN git-add BUILTIN git-annotate BUILTIN git-apply BUILTIN git-archive BUILTIN git-bisect--helper BUILTIN git-blame BUILTIN git-branch BUILTIN git-bundle BUILTIN git-cat-file BUILTIN git-check-attr BUILTIN git-check-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-pack BUILTIN git-fetch BUILTIN git-fmt-merge-msg BUILTIN git-for-each-ref BUILTIN git-fsck BUILTIN git-gc BUILTIN git-grep BUILTIN git-hash-object BUILTIN git-help BUILTIN git-index-pack BUILTIN git-init-db BUILTIN git-log BUILTIN git-ls-files BUILTIN git-ls-remote BUILTIN git-ls-tree BUILTIN git-mailinfo BUILTIN git-mailsplit BUILTIN git-merge BUILTIN git-merge-base BUILTIN git-merge-file BUILTIN git-merge-index BUILTIN git-merge-ours BUILTIN git-merge-recursive BUILTIN git-merge-tree BUILTIN git-mktag BUILTIN git-mv BUILTIN git-mktree BUILTIN git-name-rev BUILTIN git-notes BUILTIN git-pack-objects BUILTIN git-pack-redundant BUILTIN git-pack-refs BUILTIN git-patch-id BUILTIN git-prune BUILTIN git-prune-packed BUILTIN git-push BUILTIN git-read-tree BUILTIN git-receive-pack BUILTIN git-reflog BUILTIN git-remote BUILTIN git-replace BUILTIN git-rerere BUILTIN git-reset BUILTIN git-rev-list BUILTIN git-rev-parse BUILTIN git-revert BUILTIN git-rm BUILTIN git-send-pack BUILTIN git-shortlog BUILTIN git-show-branch BUILTIN git-show-ref BUILTIN git-stripspace BUILTIN git-symbolic-ref BUILTIN git-tag BUILTIN git-tar-tree BUILTIN git-unpack-file BUILTIN git-unpack-objects BUILTIN git-update-index BUILTIN git-update-ref BUILTIN git-update-server-info BUILTIN git-upload-archive BUILTIN git-var BUILTIN git-verify-pack BUILTIN git-verify-tag BUILTIN git-write-tree 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 LINK git-http-push SUBDIR perl cp Git.pm blib/lib/Git.pm Manifying blib/man3/Git.3pm SUBDIR git_remote_helpers warning: build_py: byte-compiling is disabled, skipping. SUBDIR templates >>> Source compiled. * Skipping other tests that require being non-root * Disabled tests: * Disabled t0001-init.sh * Disabled t0004-unwritable.sh * Disabled t1004-read-tree-m-u-wf.sh * Disabled t3700-add.sh * Disabled t7300-clean.sh * Start test run make -j6 BLK_SHA1=YesPlease NO_FINK=YesPlease NO_DARWIN_PORTS=YesPlease INSTALL=install TAR=tar SHELL_PATH=/bin/sh SANE_TOOL_PATH= OLD_ICONV= NO_EXTERNAL_GREP= NO_TCLTK=YesPlease INSTALLDIRS=vendor THREADED_DELTA_SEARCH=YesPlease ASCIIDOC_NO_ROFF=YesPlease DESTDIR=/home/portage/dev-vcs/git-1.7.3.4-r1/image/ 'OPTCFLAGS=-O2 -march=pentium-m -pipe -fomit-frame-pointer' 'OPTLDFLAGS=-Wl,-O1 -Wl,--as-needed -Wl,--hash-style=gnu' OPTCC=i686-pc-linux-gnu-gcc OPTAR=i686-pc-linux-gnu-ar prefix=/usr htmldir=/usr/share/doc/git-1.7.3.4-r1/html sysconfdir=/etc PYTHON_PATH=/usr/bin/python 'PERL_PATH=/usr/bin/env perl' PERL_MM_OPT= GIT_TEST_OPTS=--no-color test SUBDIR perl SUBDIR git_remote_helpers warning: build_py: byte-compiling is disabled, skipping. SUBDIR templates make -C t/ all make[1]: Entering directory `/home/portage/dev-vcs/git-1.7.3.4-r1/work/git-1.7.3.4/t' rm -f -r test-results make aggregate-results-and-cleanup make[2]: Entering directory `/home/portage/dev-vcs/git-1.7.3.4-r1/work/git-1.7.3.4/t' *** t0000-basic.sh *** *** t0002-gitfile.sh *** *** t0003-attributes.sh *** *** t0005-signals.sh *** *** t0006-date.sh *** *** t0010-racy-git.sh *** ok 1 - .git/objects should be empty after git init in an empty repo. ok 1 - initial setup ok 1 - setup ok 2 - .git/objects should have 3 subdirectories. ok 3 - success is reported like this not ok 4 - pretend we have a known breakage # TODO known breakage ok 2 - bad setup: invalid .git file format ok 1 - sigchain works ok 1 - relative date (5 seconds ago) ok 3 - bad setup: invalid .git file path # passed all 1 test(s) 1..1 ok 4 - final setup + check rev-parse --git-dir ok 2 - relative date (5 minutes ago) ok 1 - Racy GIT trial #0 part A *** t0020-crlf.sh *** ok 3 - relative date (5 hours ago) ok 5 - check hash-object ok 4 - relative date (5 days ago) ok 6 - check cat-file ok 5 - relative date (3 weeks ago) ok 6 - relative date (5 months ago) ok 7 - check update-index ok 7 - relative date (1 year, 2 months ago) ok 5 - pretend we have fixed a known breakage (run in sub test-lib) ok 6 - test runs if prerequisite is satisfied ok 7 # skip unmet prerequisite causes test to be skipped (missing DONTHAVEIT) ok 8 - test runs if prerequisites are satisfied ok 9 # skip unmet prerequisites causes test to be skipped (missing DONTHAVEIT of HAVEIT,DONTHAVEIT) ok 10 # skip unmet prerequisites causes test to be skipped (missing DONTHAVEIT of DONTHAVEIT,HAVEIT) ok 11 - tests clean up after themselves ok 12 - tests clean up even after a failure ok 13 - failure to clean up causes the test to fail ok 8 - check write-tree ok 8 - relative date (1 year, 9 months ago) ok 14 - git update-index without --add should fail adding. ok 9 - relative date (20 years ago) ok 9 - check commit-tree ok 15 - git update-index with --add should succeed. ok 10 - relative date (12 months ago) ok 10 - check rev-list # passed all 10 test(s) 1..10 ok 16 - writing tree out with git write-tree ok 17 - validate object ID of a known tree. ok 11 - parse date (2008) ok 18 - git update-index without --remove should fail removing. ok 12 - parse date (2008-02) *** t0021-conversion.sh *** ok 19 - git update-index with --remove should be able to remove. ok 13 - parse date (2008-02-14) ok 2 - attribute test ok 20 - git write-tree should be able to write an empty tree. ok 21 - validate object ID of a known tree. ok 14 - parse date (2008-02-14 20:30:45) ok 2 - Racy GIT trial #0 part B ok 3 - attribute test: read paths from stdin ok 15 - parse date (2008-02-14 20:30:45 -0500) ok 16 - parse date (2008-02-14 20:30:45 TZ=EST5) ok 22 - adding various types of objects with git update-index --add. ok 3 - Racy GIT trial #1 part A ok 4 - root subdir attribute test ok 17 - parse approxidate (now) ok 23 - showing stage with git ls-files --stage ok 24 - validate git ls-files output for a known tree. ok 18 - parse approxidate (5 seconds ago) ok 19 - parse approxidate (5.seconds.ago) ok 1 - setup ok 5 - setup bare ok 25 - writing tree out with git write-tree. ok 26 - validate object ID for a known tree. ok 20 - parse approxidate (10.minutes.ago) ok 27 - showing tree with git ls-tree ok 28 - git ls-tree output for a known tree. ok 21 - parse approxidate (yesterday) ok 29 - showing tree with git ls-tree -r ok 22 - parse approxidate (3.days.ago) ok 2 - safecrlf: autocrlf=input, all CRLF ok 30 - git ls-tree -r output for a known tree. ok 23 - parse approxidate (3.weeks.ago) ok 31 - showing tree with git ls-tree -r -t ok 1 - setup ok 32 - git ls-tree -r output for a known tree. ok 24 - parse approxidate (3.months.ago) ok 6 - bare repository: check that .gitattribute is ignored ok 33 - writing partial tree out with git write-tree --prefix. ok 34 - validate object ID for a known tree. ok 3 - safecrlf: autocrlf=input, mixed LF/CRLF ok 25 - parse approxidate (2.years.3.months.ago) ok 4 - Racy GIT trial #1 part B ok 35 - writing partial tree out with git write-tree --prefix. ok 36 - validate object ID for a known tree. ok 26 - parse approxidate (6am yesterday) ok 27 - parse approxidate (6pm yesterday) ok 37 - put invalid objects into the index. ok 5 - Racy GIT trial #2 part A ok 2 - check ok 4 - safecrlf: autocrlf=true, all LF ok 38 - writing this tree without --missing-ok. ok 28 - parse approxidate (3:00) ok 29 - parse approxidate (15:00) ok 39 - writing this tree with --missing-ok. ok 7 - bare repository: test info/attributes ok 5 - safecrlf: autocrlf=true mixed LF/CRLF # passed all 7 test(s) 1..7 ok 30 - parse approxidate (noon today) ok 40 - git read-tree followed by write-tree should be idempotent. ok 31 - parse approxidate (noon yesterday) ok 32 - parse approxidate (last tuesday) ok 3 - expanded_in_repo *** t0022-crlf-rename.sh *** # passed all 3 test(s) 1..3 ok 41 - validate git diff-files output for a know cache/work tree state. ok 33 - parse approxidate (July 5th) ok 42 - git update-index --refresh should succeed. ok 34 - parse approxidate (06/05/2009) ok 43 - no diff after checkout and git update-index --refresh. *** t0023-crlf-am.sh *** ok 35 - parse approxidate (06.05.2009) ok 6 - safecrlf: print warning only once ok 36 - parse approxidate (Jun 6, 5AM) ok 44 - git commit-tree records the correct tree in a commit. ok 6 - Racy GIT trial #2 part B ok 37 - parse approxidate (5AM Jun 6) ok 7 - switch off autocrlf, safecrlf, reset HEAD ok 38 - parse approxidate (6AM, June 7, 2009) # passed all 38 test(s) 1..38 ok 45 - git commit-tree records the correct parent in a commit. ok 7 - Racy GIT trial #3 part A *** t0024-crlf-archive.sh *** ok 46 - git commit-tree omits duplicated parent in a commit. ok 1 - setup ok 1 - setup ok 8 - update with autocrlf=input ok 47 - update-index D/F conflict ok 2 - diff -M # passed all 2 test(s) 1..2 *** t0025-crlf-auto.sh *** ok 1 - setup ok 48 - absolute path works as expected ok 9 - update with autocrlf=true ok 2 - tar archive ok 49 - very long name in the index handled sanely # still have 1 known breakage(s) # passed all remaining 48 test(s) 1..49 ok 3 - zip archive # passed all 3 test(s) 1..3 *** t0026-eol-config.sh *** *** t0030-stripspace.sh *** ok 8 - Racy GIT trial #3 part B ok 10 - checkout with autocrlf=true ok 9 - Racy GIT trial #4 part A ok 1 - setup ok 2 - am # passed all 2 test(s) 1..2 ok 11 - checkout with autocrlf=input *** t0040-parse-options.sh *** ok 2 - default settings cause no changes ok 1 - setup ok 1 - long lines without spaces should be unchanged ok 3 - crlf=true causes a CRLF file to be normalized ok 12 - apply patch (autocrlf=input) ok 2 - lines with spaces at the beginning should be unchanged ok 4 - text=true causes a CRLF file to be normalized ok 2 - eol=lf puts LFs in normalized file ok 13 - apply patch --cached (autocrlf=input) ok 3 - lines with intermediate spaces should be unchanged ok 1 - test help ok 5 - eol=crlf gives a normalized file CRLFs with autocrlf=false ok 2 - short options ok 3 - long options ok 10 - Racy GIT trial #4 part B ok 3 - eol=crlf puts CRLFs in normalized file # passed all 10 test(s) 1..10 ok 14 - apply patch --index (autocrlf=input) ok 6 - eol=crlf gives a normalized file CRLFs with autocrlf=input ok 4 - missing required value *** t0050-filesystem.sh *** ok 5 - intermingled arguments ok 15 - apply patch (autocrlf=true) ok 6 - unambiguously abbreviated option ok 7 - eol=lf gives a normalized file LFs with autocrlf=true ok 7 - unambiguously abbreviated option with "=" ok 4 - autocrlf=true overrides eol=lf ok 8 - ambiguously abbreviated option ok 9 - non ambiguous option (after two options it abbreviates) ok 16 - apply patch --cached (autocrlf=true) ok 4 - consecutive blank lines should be unified ok 10 - detect possible typos ok 8 - autocrlf=true does not normalize CRLF files ok 11 - keep some options as arguments ok 1 - see what we expect ok 5 - autocrlf=true overrides unset eol # passed all 5 test(s) 1..5 ok 12 - OPT_DATE() and OPT_SET_PTR() work ok 2 - detection of case insensitive filesystem during repo init ok 3 - detection of filesystem w/o symlink support during repo init ok 13 - OPT_CALLBACK() and OPT_BIT() work ok 17 - apply patch --index (autocrlf=true) *** t0055-beyond-symlinks.sh *** ok 14 - OPT_CALLBACK() and callback errors work ok 15 - OPT_BIT() and OPT_SET_INT() work ok 9 - text=auto, autocrlf=true _does_ normalize CRLF files ok 18 - .gitattributes says two is binary ok 5 - only consecutive blank lines should be completely removed ok 16 - OPT_NEGBIT() and OPT_SET_INT() work ok 19 - .gitattributes says two is input ok 17 - OPT_BIT() works ok 18 - OPT_NEGBIT() works ok 10 - text=auto, autocrlf=true does not normalize binary files ok 20 - .gitattributes says two and three are text ok 19 - OPT_BOOLEAN() with PARSE_OPT_NODASH works ok 1 - setup ok 20 - OPT_NUMBER_CALLBACK() works ok 11 - eol=crlf _does_ normalize binary files # passed all 11 test(s) 1..11 ok 4 - setup case tests ok 21 - negation of OPT_NONEG flags is not ambiguous # passed all 21 test(s) 1..21 ok 2 - update-index --add beyond symlinks ok 21 - in-tree .gitattributes (1) *** t0060-path-utils.sh *** ok 3 - add beyond symlinks ok 5 - rename (case change) # passed all 3 test(s) 1..3 *** t0061-run-command.sh *** *** t0070-fundamental.sh *** ok 22 - in-tree .gitattributes (2) ok 6 - consecutive blank lines at the beginning should be removed ok 6 - merge (case change) ok 23 - in-tree .gitattributes (3) ok 1 - start_command reports ENOENT # passed all 1 test(s) 1..1 ok 1 - normalize path: => not ok 7 - add (with different case) # TODO known breakage ok 2 - normalize path: . => ok 1 - character classes (isspace, isalpha etc.) ok 3 - normalize path: ./ => # passed all 1 test(s) 1..1 *** t0080-vcs-svn.sh *** ok 24 - in-tree .gitattributes (4) ok 4 - normalize path: ./. => ok 5 - normalize path: ./.. => ++failed++ *** t0100-previous.sh *** ok 6 - normalize path: ../. => ++failed++ ok 7 - normalize path: ./../.// => ++failed++ ok 8 - normalize path: dir/.. => ok 9 - normalize path: dir/sub/../.. => ok 7 - consecutive blank lines at the end should be removed ok 10 - normalize path: dir/sub/../../.. => ++failed++ ok 11 - normalize path: dir => dir ok 12 - normalize path: dir// => dir/ ok 1 - obj pool: store data ok 8 - text without newline at end should end with newline ok 13 - normalize path: ./dir => dir ok 2 - obj pool: NULL is offset ~0 ok 14 - normalize path: dir/. => dir/ ok 8 - setup unicode normalization tests ok 15 - normalize path: dir///./ => dir/ ok 3 - obj pool: out-of-bounds access ok 16 - normalize path: dir//sub/.. => dir/ ok 25 - checkout with existing .gitattributes ok 17 - normalize path: dir/sub/../ => dir/ ok 4 - obj pool: high-water mark ok 9 - rename (silent unicode normalization) ok 18 - normalize path: dir/sub/../. => dir/ ok 19 - normalize path: dir/s1/../s2/ => dir/s2/ ok 9 - text plus spaces without newline at end should end with newline ok 20 - normalize path: d1/s1///s2/..//../s3/ => d1/s3/ ok 10 - merge (silent unicode normalization) ok 21 - normalize path: d1/s1//../s2/../../d2 => d2 # still have 1 known breakage(s) # passed all remaining 9 test(s) 1..10 ok 22 - normalize path: d1/.../d2 => d1/.../d2 ok 23 - normalize path: d1/..././../d2 => d1/d2 ok 1 - branch -d @{-1} ok 24 - normalize path: / => / ok 26 - checkout when deleting .gitattributes ok 10 - text plus spaces without newline at end should not show spaces *** t0101-at-syntax.sh *** ok 5 - line buffer ok 25 - normalize path: // => / ok 27 - invalid .gitattributes (must not crash) ok 26 - normalize path: /// => / ok 27 - normalize path: /. => / ok 28 - normalize path: /./ => / ok 29 - normalize path: /./.. => ++failed++ ok 30 - normalize path: /../. => ++failed++ ok 6 - string pool ok 2 - branch -d @{-12} when there is not enough switches yet ok 31 - normalize path: /./../.// => ++failed++ ok 7 - treap sort ok 32 - normalize path: /dir/.. => / # passed all 7 test(s) 1..7 ok 11 - text plus spaces without newline should show the correct lines ok 28 - setting up for new autocrlf tests ok 33 - normalize path: /dir/sub/../.. => / ok 34 - normalize path: /dir/sub/../../.. => ++failed++ *** t1000-read-tree-m-3way.sh *** ok 35 - normalize path: /dir => /dir ok 29 - report no change after setting autocrlf ok 36 - normalize path: /dir// => /dir/ ok 37 - normalize path: /./dir => /dir ok 12 - text plus spaces at end should not show spaces ok 38 - normalize path: /dir/. => /dir/ ok 30 - files are clean after checkout ok 31 - LF only file gets CRLF with autocrlf ok 39 - normalize path: /dir///./ => /dir/ ok 32 - Mixed file is still mixed with autocrlf ok 40 - normalize path: /dir//sub/.. => /dir/ ok 33 - CRLF only file has CRLF with autocrlf ok 1 - setup ok 41 - normalize path: /dir/sub/../ => /dir/ ok 42 - normalize path: //dir/sub/../. => /dir/ ok 2 - @{0} shows current ok 43 - normalize path: /dir/s1/../s2/ => /dir/s2/ ok 3 - @{1} shows old ok 44 - normalize path: /d1/s1///s2/..//../s3/ => /d1/s3/ ok 4 - @{now} shows current ok 45 - normalize path: /d1/s1//../s2/../../d2 => /d2 ok 1 - adding test file NN and Z/NN ok 13 - text plus spaces at end should be cleaned and newline must remain ok 46 - normalize path: /d1/.../d2 => /d1/.../d2 ok 34 - New CRLF file gets LF in repo ok 5 - @{2001-09-17} (before the first commit) shows old # passed all 34 test(s) 1..34 ok 47 - normalize path: /d1/..././../d2 => /d1/d2 ok 2 - adding test file ND and Z/ND ok 6 - silly approxidates work ok 48 - longest ancestor: / => -1 ok 7 - notice misspelled upstream ok 49 - longest ancestor: / / => -1 ok 3 - merge @{-1} ok 3 - adding test file NM and Z/NM ok 8 - complain about total nonsense ok 50 - longest ancestor: /foo => -1 # passed all 8 test(s) 1..8 *** t1001-read-tree-m-2way.sh *** ok 51 - longest ancestor: /foo : => -1 ok 14 - spaces with newline at end should be replaced with empty string ok 4 - adding test file DN and Z/DN ok 52 - longest ancestor: /foo ::. => -1 ok 53 - longest ancestor: /foo ::..:: => -1 *** t1002-read-tree-m-u-2way.sh *** ok 5 - adding test file DD and Z/DD ok 54 - longest ancestor: /foo / => 0 ok 55 - longest ancestor: /foo /fo => -1 ok 56 - longest ancestor: /foo /foo => -1 ok 15 - spaces without newline at end should not show spaces ok 6 - adding test file DM and Z/DM ok 57 - longest ancestor: /foo /foo/ => -1 ok 58 - longest ancestor: /foo /bar => -1 ok 4 - merge @{-1} when there is not enough switches yet ok 7 - adding test file MN and Z/MN # passed all 4 test(s) 1..4 ok 59 - longest ancestor: /foo /bar/ => -1 ok 60 - longest ancestor: /foo /foo/bar => -1 ok 16 - spaces without newline at end should be replaced with empty string ok 61 - longest ancestor: /foo /foo:/bar/ => -1 ok 8 - adding test file MD and Z/MD *** t1003-read-tree-prefix.sh *** ok 62 - longest ancestor: /foo /foo/:/bar/ => -1 ok 63 - longest ancestor: /foo /foo::/bar/ => -1 ok 9 - adding test file MM and Z/MM ok 64 - longest ancestor: /foo /:/foo:/bar/ => 0 ok 65 - longest ancestor: /foo /foo:/:/bar/ => 0 ok 10 - adding test file SS ok 66 - longest ancestor: /foo /:/bar/:/foo => 0 ok 11 - adding test file TT ok 67 - longest ancestor: /foo/bar => -1 ok 12 - prepare initial tree ok 68 - longest ancestor: /foo/bar / => 0 ok 17 - consecutive text lines should be unchanged ok 1 - setup ok 69 - longest ancestor: /foo/bar /fo => -1 ok 13 - change in branch A (removal) ok 70 - longest ancestor: /foo/bar foo => -1 ok 18 - strip comments, too ok 14 - change in branch A (modification) # passed all 18 test(s) 1..18 ok 71 - longest ancestor: /foo/bar /foo => 4 ok 1 - setup ok 15 - change in branch A (modification) ok 1 - setup ok 72 - longest ancestor: /foo/bar /foo/ => 4 ok 16 - change in branch A (modification) ok 73 - longest ancestor: /foo/bar /foo/ba => -1 *** t1005-read-tree-reset.sh *** ok 74 - longest ancestor: /foo/bar /:/fo => 0 ok 17 - change in branch A (modification) ok 2 - read-tree --prefix # passed all 2 test(s) 1..2 ok 75 - longest ancestor: /foo/bar /foo:/foo/ba => 4 ok 18 - change in branch A (modification) ok 2 - 1, 2, 3 - no carry forward ok 76 - longest ancestor: /foo/bar /bar => -1 ok 19 - change in branch A (modification) ok 77 - longest ancestor: /foo/bar /bar/ => -1 *** t1006-cat-file.sh *** ok 20 - change in branch A (addition) ok 78 - longest ancestor: /foo/bar /fo: => -1 ok 79 - longest ancestor: /foo/bar :/fo => -1 ok 21 - change in branch A (addition) ok 2 - 1, 2, 3 - no carry forward ok 80 - longest ancestor: /foo/bar /foo:/bar/ => 4 ok 22 - change in branch A (addition) ok 81 - longest ancestor: /foo/bar /:/foo:/bar/ => 4 ok 23 - change in branch A (addition) ok 82 - longest ancestor: /foo/bar /foo:/:/bar/ => 4 ok 83 - longest ancestor: /foo/bar /:/bar/:/fo => 0 ok 24 - change in branch A (addition) ok 84 - longest ancestor: /foo/bar /:/bar/ => 0 ok 85 - longest ancestor: /foo/bar .:/foo/. => 4 ok 25 - change in branch A (edit) ok 3 - 4 - carry forward local addition. ok 86 - longest ancestor: /foo/bar .:/foo/.:.: => 4 ok 87 - longest ancestor: /foo/bar /foo/./:.:/bar => 4 ok 26 - change in branch A (change file to directory) ok 1 - setup ok 88 - longest ancestor: /foo/bar .:/bar => -1 ok 2 - blob exists ok 3 - 4 - carry forward local addition. ok 27 - recording branch A tree ok 89 - strip_path_suffix ok 3 - Type of blob is correct # passed all 89 test(s) 1..89 ok 1 - setup ok 4 - Size of blob is correct ok 28 - reading original tree and checking out *** t1007-hash-object.sh *** ok 5 - Content of blob is correct ok 2 - reset should work ok 29 - change in branch B (removal) ok 6 - Pretty content of blob is correct ok 30 - change in branch B (modification) ok 7 - --batch output of blob is correct ok 4 - 5 - carry forward local addition. ok 31 - change in branch B (modification) ok 8 - --batch-check output of blob is correct ok 32 - change in branch B (modification) ok 33 - change in branch B (modification) ok 9 - tree exists ok 4 - 5 - carry forward local addition. ok 34 - change in branch B (modification) ok 10 - Type of tree is correct ok 3 - reset should remove remnants from a failed merge ok 35 - change in branch B (modification) ok 1 - multiple '--stdin's are rejected ok 11 - Size of tree is correct ok 36 - change in branch B (addition) ok 12 - Pretty content of tree is correct ok 2 - Can't use --stdin and --stdin-paths together ok 37 - change in branch B (addition) ok 5 - 6 - local addition already has the same. ok 13 - --batch-check output of tree is correct ok 3 - Can't pass filenames as arguments with --stdin-paths ok 38 - change in branch B (addition) ok 4 - Can't use --path with --stdin-paths ok 39 - change in branch B (addition) ok 5 - Can't use --path with --no-filters ok 14 - commit exists ok 5 - 6 - local addition already has the same. ok 15 - Type of commit is correct ok 4 - Porcelain reset should remove remnants too ok 40 - change in branch B (addition and modification) ok 16 - Size of commit is correct ok 6 - hash a file ok 7 - blob does not exist in database ok 41 - change in branch B (modification) ok 17 - Content of commit is correct ok 8 - hash from stdin ok 42 - change in branch B (addition of a file to conflict with directory) ok 6 - 7 - local addition already has the same. ok 9 - blob does not exist in database ok 43 - recording branch B tree ok 18 - Pretty content of commit is correct ok 10 - hash a file and write to database ok 6 - 7 - local addition already has the same. ok 11 - blob exists in database ok 5 - Porcelain checkout -f should remove remnants too ok 19 - --batch output of commit is correct ok 7 - 8 - conflicting addition. ok 20 - --batch-check output of commit is correct ok 7 - 8 - conflicting addition. ok 12 - git hash-object --stdin file1 with --batch fails ok 15 - check that --no-filters option works with --stdin-paths ok 49 - 2 - matching B alone is OK in !O && !A && B case. ok 38 - Passing --batch with fails ok 12 - 13 - unmatching local changes being removed. ok 39 - Passing sha1 with --batch fails ok 40 - Passing -t with --batch-check fails ok 16 - hash from stdin and write to database (-w --stdin) ok 41 - Passing --batch-check with -t fails ok 1 - setup ok 50 - 3 - must match A in !O && A && !B case. ok 42 - Passing -s with --batch-check fails ok 17 - blob exists in database ok 43 - Passing --batch-check with -s fails ok 2 - multi-read ok 44 - Passing -e with --batch-check fails # passed all 2 test(s) 1..2 ok 51 - 3 - matching A alone is OK in !O && A && !B case. ok 45 - Passing --batch-check with -e fails ok 13 - 14 - unchanged in two heads. ok 18 - hash from stdin and write to database (--stdin -w) ok 46 - Passing -p with --batch-check fails ok 19 - blob exists in database ok 47 - Passing --batch-check with -p fails *** t1009-read-tree-new-index.sh *** ok 52 - 3 (fail) - must match A in !O && A && !B case. ok 48 - Passing with --batch-check fails ok 13 - 14 - unchanged in two heads. ok 20 - hash two files with names on stdin ok 49 - Passing --batch-check with fails ok 50 - Passing sha1 with --batch-check fails ok 51 - --batch-check for a non-existent named object ok 53 - 4 - must match and be up-to-date in !O && A && B && A!=B case. ok 21 - hash two files with names on stdin and write to database (-w --stdin-paths) ok 52 - --batch-check for a non-existent hash ok 22 - blob exists in database ok 53 - --batch for an existent and a non-existent hash ok 23 - blob exists in database ok 54 - 4 (fail) - must match and be up-to-date in !O && A && B && A!=B case. ok 54 - --batch-check for an emtpy line ok 14 - 15 - unchanged in two heads. ok 1 - setup ok 55 - --batch with multiple sha1s gives correct format ok 55 - 4 (fail) - must match and be up-to-date in !O && A && B && A!=B case. ok 24 - hash two files with names on stdin and write to database (--stdin-paths -w) ok 14 - 15 - unchanged in two heads. ok 56 - --batch-check with multiple sha1s gives correct format ok 2 - non-existent index file # passed all 56 test(s) 1..56 ok 15 - 16 - conflicting local change. ok 25 - blob exists in database ok 3 - empty index file ok 26 - blob exists in database # passed all 3 test(s) 1..3 # passed all 26 test(s) 1..26 *** t1010-mktree.sh *** ok 56 - 5 - must match in !O && A && B && A==B case. ok 16 - 17 - conflicting local change. *** t1011-read-tree-sparse-checkout.sh *** ok 15 - 16 - conflicting local change. *** t1012-read-tree-df.sh *** ok 57 - 5 - must match in !O && A && B && A==B case. ok 16 - 17 - conflicting local change. ok 58 - 5 (fail) - must match A in !O && A && B && A==B case. ok 17 - 18 - local change already having a good result. 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 17 - 18 - local change already having a good result. ok 61 - 8 - must not exist in O && !A && B && O==B case ok 18 - 19 - local change already having a good result, further modified. ok 62 - 9 - must match and be up-to-date in O && A && !B && O!=A case ok 18 - 19 - local change already having a good result, further modified. ok 19 - 20 - no local change, use new tree. ok 63 - 9 (fail) - must match and be up-to-date in O && A && !B && O!=A case ok 1 - setup ok 64 - 9 (fail) - must match and be up-to-date in O && A && !B && O!=A case ok 20 - 21 - no local change, dirty cache. ok 2 - read-tree without .git/info/sparse-checkout ok 65 - 10 - must match and be up-to-date in O && A && !B && O==A case ok 3 - read-tree with .git/info/sparse-checkout but disabled ok 1 - setup ok 19 - 20 - no local change, use new tree. ok 2 - ls-tree piped to mktree (1) ok 66 - 10 (fail) - must match and be up-to-date in O && A && !B && O==A case ok 3 - ls-tree piped to mktree (2) ok 4 - read-tree --no-sparse-checkout with empty .git/info/sparse-checkout and enabled ok 21 - DF vs DF/DF case setup. ok 4 - ls-tree output in wrong order given to mktree (1) ok 20 - 21 - no local change, dirty cache. ok 67 - 10 (fail) - must match and be up-to-date in O && A && !B && O==A case ok 5 - ls-tree output in wrong order given to mktree (2) ok 6 - allow missing object with --missing ok 5 - read-tree with empty .git/info/sparse-checkout ok 7 - mktree refuses to read ls-tree -r output (1) ok 22 - DF vs DF/DF case test. ok 8 - mktree refuses to read ls-tree -r output (2) # passed all 22 test(s) 1..22 ok 68 - 11 - must match and be up-to-date in O && A && B && O!=A && O!=B && A!=B case # passed all 8 test(s) 1..8 ok 21 - 22 - local change cache updated. ok 6 - match directories with trailing slash ok 69 - 11 (fail) - must match and be up-to-date in O && A && B && O!=A && O!=B && A!=B case *** t1020-subdirectory.sh *** not ok 7 - match directories without trailing slash # TODO known breakage *** t1100-commit-tree-options.sh *** ok 70 - 11 (fail) - must match and be up-to-date in O && A && B && O!=A && O!=B && A!=B case ok 8 - checkout area changes ok 9 - read-tree updates worktree, absent case ok 22 - DF vs DF/DF case setup. ok 71 - 12 - must match A in O && A && B && O!=A && A==B case ok 1 - setup ok 10 - read-tree updates worktree, dirty case ok 1 - test preparation: write empty tree ok 2 - construct commit ok 72 - 12 - must match A in O && A && B && O!=A && A==B case ok 11 - read-tree removes worktree, dirty case ok 23 - DF vs DF/DF case test. ok 3 - read commit ok 4 - compare commit # passed all 4 test(s) 1..4 ok 73 - 12 (fail) - must match A in O && A && B && O!=A && A==B case ok 2 - update-index and ls-files ok 12 - read-tree adds to worktree, absent case *** t1200-tutorial.sh *** ok 13 - read-tree adds to worktree, dirty case ok 74 - 13 - must match A in O && A && B && O!=A && O==B case ok 3 - cat-file ok 24 - a/b (untracked) vs a case setup. ok 14 - index removal and worktree narrowing at the same time ok 25 - a/b (untracked) vs a, plus c/d case test. ok 4 - diff-files ok 75 - 13 - must match A in O && A && B && O!=A && O==B case ok 5 - write-tree ok 15 - read-tree --reset removes outside worktree ok 1 - blob # still have 1 known breakage(s) # passed all remaining 14 test(s) 1..15 ok 2 - blob 557db03 ok 76 - 14 - must match and be up-to-date in O && A && B && O==A && O!=B case ok 6 - checkout-index ok 3 - git diff-files -p *** t1300-repo-config.sh *** ok 4 - git diff ok 26 - a/b vs a, plus c/d case setup. ok 5 - tree ok 77 - 14 - may match B in O && A && B && O==A && O!=B case ok 7 - read-tree ok 27 - a/b vs a, plus c/d case test. ok 78 - 14 (fail) - must match and be up-to-date in O && A && B && O==A && O!=B case ok 8 - no file/rev ambiguity check inside .git ok 6 - git diff-index -p HEAD ok 79 - 14 (fail) - must match and be up-to-date in O && A && B && O==A && O!=B case ok 7 - git diff HEAD ok 1 - initial ok 8 - git whatchanged -p --root ok 2 - mixed case ok 9 - git tag my-first-tag ok 3 - similar section ok 80 - 15 - must match A in O && A && B && O==A && O==B case ok 9 - no file/rev ambiguity check inside a bare repo ok 10 - git checkout -b mybranch ok 4 - similar section ok 5 - replace with non-match ok 11 - git branch ok 6 - replace with non-match (actually matching) ok 81 - 15 - must match A in O && A && B && O==A && O==B case ok 7 - non-match result ok 28 - -m references the correct modified tree # passed all 28 test(s) 1..28 ok 8 - unset with cont. lines ok 9 - unset with cont. lines is correct ok 10 - detection should not be fooled by a symlink # passed all 10 test(s) 1..10 ok 82 - 15 (fail) - must match A in O && A && B && O==A && O==B case ok 10 - multiple unset ok 11 - multiple unset is correct ok 12 - git resolve now fails ok 12 - --replace-all missing value *** t1301-shared-repo.sh *** ok 13 - --replace-all *** t1302-repo-version.sh *** ok 14 - all replaced ok 13 - git show-branch ok 15 - really mean test ok 1 - setup ok 83 - 16 - A matches in one and B matches in another. ok 16 - really really mean test # passed all 83 test(s) 1..83 ok 17 - get value ok 14 - git resolve ok 18 - unset ok 15 - git show-branch (part 2) ok 19 - multivar ok 20 - non-match *** t1303-wacky-config.sh *** ok 16 - git show-branch (part 3) ok 1 - shared = 0400 (faulty permission u-w) ok 2 - 3-way (1) ok 21 - non-match value ok 22 - ambiguous get ok 23 - get multivar ok 1 - setup ok 2 - shared=1 does not clear bits preset by umask 002 ok 24 - multivar replace ok 25 - ambiguous value ok 17 - rewind to "Some fun." and "Some work." ok 2 - gitdir selection on normal repos ok 26 - ambiguous unset ok 27 - invalid unset ok 3 - gitdir selection on unsupported repo ok 18 - git show-branch (part 4) ok 3 - 3-way (2) ok 3 - shared=1 does not clear bits preset by umask 022 ok 28 - multivar unset ok 1 - modify same key ok 29 - invalid key ok 4 - gitdir not required mode ok 30 - correct key ok 19 - manual merge ok 31 - hierarchical section ok 4 - shared=all ok 32 - hierarchical section value ok 2 - add key in same section ok 20 - git ls-files --stage ok 5 - gitdir required mode # passed all 5 test(s) 1..5 ok 33 - working --list ok 21 - git ls-files --unmerged ok 4 - 3-way (3) ok 34 - --get-regexp ok 3 - add key in different section ok 5 - update-server-info honors core.sharedRepository *** t1304-default-acl.sh *** ok 35 - --add ok 4 - make sure git config escapes section names properly ok 22 - git-merge-index ok 36 - get variable with no value ok 37 - get variable with empty value ok 23 - git ls-files --stage (part 2) ok 6 - shared = 0660 (r--r-----) ro ok 5 - do not crash on special long config line ok 38 - get-regexp variable with no value # passed all 5 test(s) 1..5 ok 5 - 2-way (1) ok 7 - shared = 0660 (rw-rw----) rw # passed all 5 test(s) 1..5 ok 39 - get-regexp variable with empty value ok 40 - get bool variable with no value *** t1400-update-ref.sh *** Unable to use setfacl (output: 'setfacl: .: Operation not supported'; return code: '1') ok 1 # skip Setup test repo (missing SETFACL) ok 2 # skip Objects creation does not break ACLs with restrictive umask (missing SETFACL) ok 3 # skip git gc does not break ACLs with restrictive umask (missing SETFACL) ok 41 - get bool variable with empty value # passed all 3 test(s) 1..3 ok 8 - shared = 0640 (r--r-----) ro *** t1401-symbolic-ref.sh *** ok 42 - no arguments, but no crash *** t1402-check-ref-format.sh *** ok 9 - shared = 0640 (rw-r-----) rw ok 43 - new section is partial match of another ok 24 - git repack ok 44 - new variable inserts into proper section ok 10 - shared = 0600 (r--------) ro ok 45 - alternative GIT_CONFIG (non-existing file should fail) ok 46 - alternative GIT_CONFIG ok 25 - git prune-packed ok 11 - shared = 0600 (rw-------) rw ok 1 - symbolic-ref writes HEAD ok 47 - alternative GIT_CONFIG (--file) ok 1 - ref name 'heads/foo' is valid ok 2 - symbolic-ref reads HEAD ok 2 - ref name 'foo' is not valid ok 3 - symbolic-ref refuses non-ref for HEAD ok 48 - refer config from subdirectory ok 3 - ref name 'foo/bar/baz' is valid ok 4 - ref name 'refs///heads/foo' is valid ok 12 - shared = 0666 (r--r--r--) ro ok 5 - ref name 'heads/foo/' is not valid ok 49 - --set in alternative GIT_CONFIG ok 6 - ref name './foo' is not valid ok 26 - -> only packed objects # passed all 26 test(s) 1..26 ok 13 - shared = 0666 (rw-rw-rw-) rw ok 7 - ref name '.refs/foo' is not valid ok 50 - rename section ok 8 - ref name 'heads/foo..bar' is not valid ok 51 - rename succeeded ok 4 - symbolic-ref refuses bare sha1 ok 9 - ref name 'heads/foo?bar' is not valid # passed all 4 test(s) 1..4 ok 52 - rename non-existing section ok 53 - rename succeeded ok 10 - ref name 'foo./bar' is valid *** t1410-reflog.sh *** ok 54 - rename another section ok 11 - ref name 'heads/foo.lock' is not valid ok 55 - rename succeeded ok 14 - shared = 0664 (r--r--r--) ro ok 12 - ref name 'heads/foo@bar' is valid *** t1411-reflog-show.sh *** ok 1 - setup ok 13 - ref name 'heads/v@{ation' is not valid ok 56 - rename a section with a var on the same line ok 57 - rename succeeded ok 15 - shared = 0664 (rw-rw-r--) rw ok 14 - ref name 'heads/foo\bar' is not valid ok 2 - create refs/heads/master ok 58 - remove section ok 59 - section was removed properly ok 3 - create refs/heads/master ok 16 - git reflog expire honors core.sharedRepository ok 4 - fail to delete refs/heads/master with stale ref ok 5 - delete refs/heads/master ok 60 - section ending ok 6 - delete refs/heads/master without oldvalue verification ok 1 - setup ok 7 - fail to create refs/heads/gu/fixes ok 61 - numbers ok 2 - log -g shows reflog headers ok 15 - check-ref-format --branch @{-1} ok 8 - create refs/heads/master (by HEAD) ok 3 - oneline reflog format ok 9 - create refs/heads/master (by HEAD) ok 62 - invalid unit ok 10 - fail to delete refs/heads/master (by HEAD) with stale ref ok 4 - using @{now} syntax shows reflog date (multiline) ok 11 - delete refs/heads/master (by HEAD) ok 5 - using @{now} syntax shows reflog date (oneline) ok 12 - delete symref without dereference ok 6 - using --date= shows reflog date (multiline) ok 16 - check-ref-format --branch from subdir ok 7 - using --date= shows reflog date (oneline) ok 17 - ref name 'heads/foo' simplifies to 'heads/foo' ok 18 - ref name 'refs///heads/foo' simplifies to 'refs/heads/foo' ok 17 - forced modes # passed all 17 test(s) 1..17 ok 19 - check-ref-format --print rejects 'foo' ok 13 - delete symref without dereference when the referred ref is packed ok 8 - empty reflog file ok 20 - check-ref-format --print rejects 'heads/foo/../bar' # passed all 8 test(s) 1..8 ok 21 - check-ref-format --print rejects 'heads/./foo' ok 22 - check-ref-format --print rejects 'heads\foo' ok 14 - (not) create HEAD with old sha1 ok 15 - (not) prior created .git/refs/heads/master # passed all 22 test(s) 1..22 *** t1412-reflog-loop.sh *** ok 16 - create HEAD *** t1420-lost-found.sh *** *** t1450-fsck.sh *** ok 17 - (not) change HEAD with wrong SHA1 ok 18 - (not) changed .git/refs/heads/master ok 63 - bool ok 19 - create refs/heads/master (logged by touch) ok 64 - invalid bool (--get) ok 20 - update refs/heads/master (logged by touch) ok 65 - invalid bool (set) ok 21 - set refs/heads/master (logged by touch) ok 22 - verifying refs/heads/master's log ok 23 - enable core.logAllRefUpdates ok 24 - create refs/heads/master (logged by config) ok 25 - update refs/heads/master (logged by config) ok 1 - setup commits ok 66 - set --bool ok 1 - setup ok 26 - set refs/heads/master (logged by config) ok 27 - verifying refs/heads/master's log ok 67 - set --int ok 28 - Query "master@{May 25 2005}" (before history) ok 2 - setup reflog with alternating commits ok 1 - setup ok 29 - Query master@{2005-05-25} (before history) ok 3 - reflog shows all entries # passed all 3 test(s) ok 2 - lost and found something 1..3 # passed all 2 test(s) 1..2 ok 30 - Query "master@{May 26 2005 23:31:59}" (1 second before history) ok 68 - get --bool-or-int *** t1500-rev-parse.sh *** *** t1501-worktree.sh *** ok 31 - Query "master@{May 26 2005 23:32:00}" (exactly history start) ok 32 - Query "master@{May 26 2005 23:32:30}" (first non-creation change) ok 33 - Query "master@{2005-05-26 23:33:01}" (middle of history with gap) ok 69 - set --bool-or-int ok 34 - Query "master@{2005-05-26 23:38:00}" (middle of history) ok 2 - loose objects borrowed from alternate are not missing ok 1 - toplevel: is-bare-repository ok 2 - toplevel: is-inside-git-dir ok 35 - Query "master@{2005-05-26 23:43:00}" (exact end of history) ok 3 - toplevel: is-inside-work-tree ok 70 - set --path ok 3 - HEAD is part of refs, valid objects appear valid ok 4 - setup: helpers for corruption tests ok 4 - toplevel: prefix ok 36 - Query "master@{2005-05-28}" (past end of history) ok 1 - setup ok 2 - setup: helper for testing rev-parse ok 5 - toplevel: git-dir ok 3 - setup: core.worktree = relative path ok 6 - .git/: is-bare-repository ok 71 - get --path ok 7 - .git/: is-inside-git-dir ok 8 - .git/: is-inside-work-tree ok 9 - .git/: prefix ok 4 - outside ok 10 - .git/: git-dir ok 72 - get --path copes with unset $HOME ok 11 - .git/objects/: is-bare-repository ok 12 - .git/objects/: is-inside-git-dir ok 13 - .git/objects/: is-inside-work-tree ok 1 - setup ok 5 - inside work tree ok 14 - .git/objects/: prefix ok 73 - quoting ok 15 - .git/objects/: git-dir ok 74 - key with newline ok 37 - creating initial files not ok 6 - empty prefix is actually written out # TODO known breakage ok 38 - git commit logged updates ok 75 - value with newline ok 16 - subdirectory: is-bare-repository ok 39 - git cat-file blob master:F (expect OTHER) ok 17 - subdirectory: is-inside-git-dir ok 5 - object with bad sha1 ok 76 - value continued on next line ok 40 - git cat-file blob master@{2005-05-26 23:30}:F (expect TEST) ok 18 - subdirectory: is-inside-work-tree ok 19 - subdirectory: prefix ok 41 - git cat-file blob master@{2005-05-26 23:42}:F (expect OTHER) # passed all 41 test(s) 1..41 ok 77 - --null --list ok 20 - subdirectory: git-dir ok 7 - subdir of work tree ok 78 - --null --get-regexp ok 21 - core.bare = true: is-bare-repository ok 8 - setup: core.worktree = absolute path ok 6 - branch pointing to non-commit *** t1502-rev-parse-parseopt.sh *** ok 79 - inner whitespace kept verbatim ok 22 - core.bare = true: is-inside-git-dir ok 23 - core.bare = true: is-inside-work-tree ok 24 - core.bare undefined: is-bare-repository ok 25 - core.bare undefined: is-inside-git-dir ok 26 - core.bare undefined: is-inside-work-tree ok 80 - symlinked configuration ok 9 - outside ok 27 - GIT_DIR=../.git, core.bare = false: is-bare-repository ok 7 - email without @ is okay ok 28 - GIT_DIR=../.git, core.bare = false: is-inside-git-dir ok 1 - test --parseopt help output ok 29 - GIT_DIR=../.git, core.bare = false: is-inside-work-tree ok 30 - GIT_DIR=../.git, core.bare = false: prefix ok 2 - test --parseopt ok 3 - test --parseopt with mixed options and arguments ok 81 - check split_cmdline return ok 10 - inside work tree ok 31 - GIT_DIR=../.git, core.bare = true: is-bare-repository ok 4 - test --parseopt with -- ok 32 - GIT_DIR=../.git, core.bare = true: is-inside-git-dir ok 5 - test --parseopt --stop-at-non-option ok 33 - GIT_DIR=../.git, core.bare = true: is-inside-work-tree ok 34 - GIT_DIR=../.git, core.bare = true: prefix ok 6 - test --parseopt --keep-dashdash ok 82 - git -c "key=value" support ok 8 - email with embedded > is not okay # passed all 82 test(s) 1..82 ok 7 - test --parseopt --keep-dashdash --stop-at-non-option with -- ok 11 - subdir of work tree ok 35 - GIT_DIR=../.git, core.bare undefined: is-bare-repository ok 2 - rewind ok 12 - setup: GIT_WORK_TREE=relative (override core.worktree) ok 36 - GIT_DIR=../.git, core.bare undefined: is-inside-git-dir ok 8 - test --parseopt --keep-dashdash --stop-at-non-option without -- # passed all 8 test(s) 1..8 ok 37 - GIT_DIR=../.git, core.bare undefined: is-inside-work-tree *** t1503-rev-parse-verify.sh *** ok 38 - GIT_DIR=../.git, core.bare undefined: prefix *** t1504-ceiling-dirs.sh *** ok 3 - corrupt and check ok 39 - GIT_DIR=../repo.git, core.bare = false: is-bare-repository ok 9 - tag pointing to nonexistent ok 40 - GIT_DIR=../repo.git, core.bare = false: is-inside-git-dir ok 41 - GIT_DIR=../repo.git, core.bare = false: is-inside-work-tree ok 13 - outside ok 42 - GIT_DIR=../repo.git, core.bare = false: prefix ok 4 - reflog expire --dry-run should not touch reflog ok 43 - GIT_DIR=../repo.git, core.bare = true: is-bare-repository ok 44 - GIT_DIR=../repo.git, core.bare = true: is-inside-git-dir ok 1 - no_ceil ok 45 - GIT_DIR=../repo.git, core.bare = true: is-inside-work-tree ok 14 - inside work tree ok 2 - ceil_empty ok 46 - GIT_DIR=../repo.git, core.bare = true: prefix ok 3 - ceil_at_parent ok 5 - reflog expire ok 10 - tag pointing to something else than its type ok 4 - ceil_at_parent_slash ok 47 - GIT_DIR=../repo.git, core.bare undefined: is-bare-repository ok 5 - ceil_at_trash ok 48 - GIT_DIR=../repo.git, core.bare undefined: is-inside-git-dir ok 6 - ceil_at_trash_slash ok 49 - GIT_DIR=../repo.git, core.bare undefined: is-inside-work-tree ok 11 - cleaned up ok 15 - subdir of work tree # passed all 11 test(s) 1..11 ok 7 - ceil_at_sub ok 50 - GIT_DIR=../repo.git, core.bare undefined: prefix # passed all 50 test(s) 1..50 ok 16 - setup: GIT_WORK_TREE=absolute, below git dir ok 8 - ceil_at_sub_slash ok 1 - set up basic repo with 1 file (hello) and 4 commits ok 9 - subdir_no_ceil *** t1505-rev-parse-last.sh *** *** t1506-rev-parse-diagnosis.sh *** ok 10 - subdir_ceil_empty ok 11 - subdir_ceil_at_trash: prefix ok 17 - outside ok 12 - subdir_ceil_at_trash_slash: prefix ok 13 - subdir_ceil_at_sub: prefix ok 14 - subdir_ceil_at_sub_slash: prefix ok 2 - works with one good rev ok 15 - subdir_ceil_at_subdir ok 16 - subdir_ceil_at_subdir_slash ok 17 - subdir_ceil_at_su ok 18 - subdir_ceil_at_su_slash ok 19 - subdir_ceil_at_sub_di ok 20 - subdir_ceil_at_sub_di_slash ok 3 - fails with any bad rev or many good revs ok 6 - prune and fsck ok 1 - set up basic repo ok 21 - subdir_ceil_at_subdi ok 18 - in repo.git ok 22 - subdir_ceil_at_subdi_slash ok 23 - second_of_two: prefix ok 24 - first_of_two: prefix ok 7 - recover and check ok 25 - second_of_three: prefix ok 26 - git_dir_specified ok 19 - inside work tree ok 27 - sd_no_ceil ok 4 - fails silently when using -q ok 2 - correct file objects ok 28 - sd_ceil_empty ok 29 - sd_ceil_at_trash: prefix ok 30 - sd_ceil_at_trash_slash: prefix ok 3 - incorrect revision id ok 31 - sd_ceil_at_s: prefix ok 1 - setup ok 20 - subdir of work tree ok 32 - sd_ceil_at_s_slash: prefix ok 5 - no stdout output on error ok 33 - sd_ceil_at_sd ok 21 - find work tree from repo ok 2 - @{-1} works ok 34 - sd_ceil_at_sd_slash ok 4 - incorrect file in sha1:path ok 35 - sd_ceil_at_su ok 22 - find work tree from work tree ok 3 - @{-1}~2 works ok 36 - sd_ceil_at_su_slash ok 37 - sd_ceil_at_s_di ok 38 - sd_ceil_at_s_di_slash ok 4 - @{-1}^2 works ok 23 - _gently() groks relative GIT_DIR & GIT_WORK_TREE ok 39 - sd_ceil_at_sdi ok 40 - sd_ceil_at_sdi_slash ok 5 - @{-1}@{1} works # passed all 40 test(s) 1..40 ok 6 - use --default ok 24 - diff-index respects work tree under .git dir ok 6 - @{-2} works *** t1507-rev-parse-upstream.sh *** ok 25 - diff-files respects work tree under .git dir ok 7 - @{-3} fails ok 8 - delete # passed all 7 test(s) 1..7 ok 5 - incorrect file in :path and :N:path ok 9 - rewind2 ok 7 - master@{n} for various n *** t1508-at-combinations.sh *** # passed all 7 test(s) 1..7 ok 10 - --expire=never ok 6 - invalid @{n} reference # passed all 6 test(s) 1..6 ok 26 - git diff respects work tree under .git dir *** t1509-root-worktree.sh *** ok 27 - git grep *** t2000-checkout-cache-clash.sh *** ok 11 - gc.reflogexpire=never ok 28 - git commit ok 29 - absolute pathspec should fail gracefully ok 12 - gc.reflogexpire=false # passed all 12 test(s) 1..12 ok 30 - make_relative_path handles double slashes in GIT_DIR # still have 1 known breakage(s) # passed all remaining 29 test(s) 1..30 # passed all 0 test(s) 1..0 # SKIP You must set env var IKNOWWHATIAMDOING=YES in order to run this test *** t2001-checkout-cache-clash.sh *** ok 1 - git update-index --add various paths. *** t2002-checkout-cache-u.sh *** *** t2003-checkout-cache-mkdir.sh *** ok 2 - git checkout-index without -f should fail on conflicting work tree. ok 3 - git checkout-index with -f should succeed. ok 4 - git checkout-index conflicting paths. ok 5 - checkout-index -f twice with --prefix # passed all 5 test(s) 1..5 ok 1 - git update-index --add path0/file0 *** t2004-checkout-cache-temp.sh *** ok 1 - preparation ok 1 - setup ok 2 - writing tree out with git write-tree ok 3 - git update-index --add path1/file1 ok 2 - have symlink in place where dir is expected. ok 2 - without -u, git checkout-index smudges stat information. ok 4 - writing tree out with git write-tree ok 1 - setup ok 3 - use --prefix=path2/ ok 2 - @{upstream} resolves to correct full name ok 4 - use --prefix=tmp- ok 5 - read previously written tree and checkout. ok 3 - with -u, git checkout-index picks up stat information from new files. # passed all 3 test(s) 1..3 ok 3 - @{u} resolves to correct full name ok 6 - git update-index --add a symlink. ok 5 - use --prefix=tmp- but with a conflicting file and dir ok 4 - my-side@{upstream} resolves to correct full name ok 7 - writing tree out with git write-tree *** t2005-checkout-index-symlinks.sh *** ok 6 - use --prefix=tmp/orary/ where tmp is a symlink ok 8 - read previously written tree and checkout. ok 9 - checking out conflicting path with -f # passed all 9 test(s) 1..9 ok 7 - use --prefix=tmp/orary- where tmp is a symlink ok 8 - use --prefix=tmp- where tmp-path1 is a symlink *** t2007-checkout-symlink.sh *** # passed all 8 test(s) 1..8 ok 1 - preparation *** t2008-checkout-subdir.sh *** ok 1 - preparation ok 2 - checkout one stage 0 to temporary file ok 2 - the checked-out symlink must be a file ok 1 - setup ok 3 - the file must be the blob we added during the setup ok 5 - my-side@{u} resolves to correct commit # passed all 3 test(s) 1..3 ok 2 - HEAD = new-two ok 3 - @{1} = new-one *** t2009-checkout-statinfo.sh *** ok 6 - not-tracking@{u} fails ok 4 - @{-1} = old-two ok 5 - @{-1}@{1} = old-one ok 6 - @{u} = upstream-two ok 1 - setup ok 3 - checkout all stage 0 to temporary files ok 7 - @{u}@{1} = upstream-one ok 4 - prepare 3-way merge ok 8 - @{-1}@{u} = master-two ok 9 - @{-1}@{u}@{1} = master-one ok 1 - setup ok 10 - @{u}@{-1} is nonsensical ok 5 - checkout one stage 2 to temporary file ok 2 - switch from symlink to dir ok 11 - @{1}@{u} is nonsensical # passed all 11 test(s) 1..11 ok 7 - @{u}@{1} resolves correctly ok 2 - remove and restore with relative path ok 3 - Remove temporary directories & switch to master ok 1 - setup ok 3 - checkout with empty prefix ok 8 - @{u} without specifying branch fails on a detached HEAD ok 4 - switch from dir to symlink # passed all 4 test(s) 1..4 *** t2010-checkout-ambiguous.sh *** ok 6 - checkout all stage 2 to temporary files ok 4 - checkout with simple prefix *** t2011-checkout-invalid-head.sh *** ok 9 - checkout -b new my-side@{u} forks from the same ok 7 - checkout all stages/one file to nothing ok 5 - relative path outside tree should fail ok 6 - incorrect relative path to file should fail (1) ok 7 - incorrect relative path should fail (2) ok 8 - incorrect relative path should fail (3) ok 8 - checkout all stages/one file to temporary files # passed all 8 test(s) 1..8 ok 2 - branch switching *** t2012-checkout-last.sh *** ok 1 - setup ok 9 - checkout some stages/one file to temporary files ok 10 - merge my-side@{u} records the correct name ok 1 - setup ok 10 - checkout all stages/all files to temporary files ok 2 - reference must be a tree ok 11 - -- path0: no entry ok 2 - checkout should not start branch from a tree ok 3 - checkout master from invalid HEAD ok 11 - branch -d other@{u} # passed all 3 test(s) 1..3 ok 12 - -- path1: all 3 stages ok 3 - branch switching ok 3 - path checkout ok 13 - -- path2: no stage 1, have stage 2 and 3 # passed all 3 test(s) 1..3 *** t2013-checkout-submodule.sh *** ok 4 - checkout world from the index ok 14 - -- path3: no stage 2, have stage 1 and 3 ok 5 - non ambiguous call *** t2014-switch.sh *** ok 12 - checkout other@{u} ok 15 - -- path4: no stage 3, have stage 1 and 3 ok 6 - allow the most common case ok 16 - -- asubdir/path5: no stage 2 and 3 have stage 1 ok 13 - log -g other@{u} ok 7 - check ambiguity ok 1 - setup ok 14 - log -g other@{u}@{now} # passed all 14 test(s) 1..14 ok 17 - checkout --temp within subdir ok 2 - "checkout -" does not work initially ok 8 - disambiguate checking out from a tree-ish # passed all 8 test(s) 1..8 ok 3 - first branch switch *** t2015-checkout-unborn.sh *** ok 4 - "checkout -" switches back *** t2016-checkout-patch.sh *** ok 5 - "checkout -" switches forth ok 18 - checkout --temp symlink # passed all 18 test(s) 1..18 ok 1 - setup ok 6 - detach HEAD ok 2 - check all changes are staged *** t2017-checkout-orphan.sh *** ok 3 - second commit ok 7 - "checkout -" attaches again ok 4 - check # passed all 4 test(s) 1..4 ok 1 - setup *** t2018-checkout-branch.sh *** ok 8 - "checkout -" detaches again ok 1 - setup ok 2 - checkout from unborn preserves untracked files ok 1 - setup ok 2 - "reset " updates the index ok 1 - Setup ok 3 - checkout from unborn preserves index contents ok 4 - checkout from unborn merges identical index contents # passed all 4 test(s) 1..4 *** t2030-unresolve-info.sh *** ok 2 - --orphan creates a new orphan branch from HEAD ok 3 - "checkout " updates the index only ok 4 - "checkout " honors diff.ignoreSubmodules ok 1 - setup ok 5 - "checkout " honors submodule.*.ignore from .gitmodules ok 2 - checkout -b to a new branch, set to HEAD ok 9 - more switches ok 3 - --orphan creates a new orphan branch from ok 6 - "checkout " honors submodule.*.ignore from .git/config ok 4 - --orphan must be rejected with -b # passed all 6 test(s) 1..6 ok 3 - checkout -b to a new branch, set to an explicit ref ok 5 - --orphan must be rejected with -t *** t2050-git-dir-relative.sh *** ok 4 - checkout -b to a new branch with unmergeable changes fails ok 6 - --orphan ignores branch.autosetupmerge ok 2 - saying "n" does nothing ok 5 - checkout -f -b to a new branch with unmergeable changes discards changes ok 1 - Setting up post-commit hook ok 2 - post-commit hook used ordinarily ok 7 - --orphan makes reflog by default ok 1 - setup ok 6 - checkout -b to a new branch preserves mergeable changes ok 10 - switch to the last ok 3 - post-commit-hook created and used from top dir ok 8 - --orphan does not make reflog when core.logAllRefUpdates = false ok 4 - post-commit-hook from sub dir # passed all 4 test(s) 1..4 *** t2100-update-cache-badpath.sh *** ok 7 - checkout -f -b to a new branch with mergeable changes discards changes ok 9 - --orphan with -l makes reflog when core.logAllRefUpdates = false ok 8 - checkout -b to an existing branch fails ok 3 - git checkout -p ok 10 - giving up --orphan not committed when -l and core.logAllRefUpdates = false deletes reflog ok 9 - checkout -B to an existing branch resets branch to HEAD ok 1 - git update-index --add to add various paths. ok 2 - add records switch clears ok 11 - --orphan is rejected with an existing name ok 2 - git update-index to add conflicting path path0/file0 should fail. ok 3 - git update-index to add conflicting path path1/file1 should fail. ok 4 - git update-index to add conflicting path path2 should fail. ok 11 - switch to second from the last ok 5 - git update-index to add conflicting path path3 should fail. ok 10 - checkout -B to an existing branch from detached HEAD resets branch to HEAD # passed all 5 test(s) 1..5 ok 12 - --orphan refuses to switch if a merge is needed *** t2101-update-index-reupdate.sh *** # passed all 12 test(s) 1..12 ok 11 - checkout -B to an existing branch with an explicit ref resets branch to that ref *** t2102-update-index-symlinks.sh *** ok 12 - checkout -B to an existing branch with unmergeable changes fails ok 13 - checkout -f -B to an existing branch with unmergeable changes discards changes ok 1 - update-index --add ok 2 - update-index --again ok 1 - preparation ok 4 - git checkout -p with staged changes ok 2 - modify the symbolic link ok 3 - update-index --remove --again ok 3 - the index entry must still be a symbolic link # passed all 3 test(s) 1..3 ok 14 - checkout -B to an existing branch preserves mergeable changes ok 4 - first commit *** t2103-update-index-ignore-missing.sh *** ok 3 - rm records reset clears ok 12 - switch to third from the last ok 5 - update-index again ok 6 - update-index --update from subdir ok 15 - checkout -f -B to an existing branch with mergeable changes discards changes # passed all 15 test(s) 1..15 ok 7 - update-index --update with pathspec # passed all 7 test(s) 1..7 *** t2104-update-index-skip-worktree.sh *** *** t2105-update-index-gitfile.sh *** ok 1 - setup ok 4 - plumbing clears ok 2 - index is at version 2 ok 3 - update-index --skip-worktree ok 1 - basics ok 5 - git checkout -p HEAD with NO staged changes: abort ok 4 - index is at version 3 after having some skip-worktree entries ok 5 - ls-files -t ok 13 - switch to fourth from the last ok 1 - submodule with absolute .git file ok 6 - update-index --no-skip-worktree ok 2 - add gitlink to absolute .git file ok 7 - index version is back to 2 when there is no skip-worktree entry # passed all 7 test(s) 1..7 ok 2 - --ignore-missing --refresh *** t2106-update-index-assume-unchanged.sh *** ok 3 - submodule with relative .git file ok 4 - add gitlink to relative .git file # passed all 4 test(s) 1..4 ok 5 - add records checkout -m undoes ok 3 - --unmerged --refresh *** t2200-add-update.sh *** ok 4 - --ignore-submodules --refresh (1) ok 1 - setup ok 5 - --ignore-submodules --refresh (2) # passed all 5 test(s) 1..5 ok 6 - git checkout -p HEAD with NO staged changes: apply ok 2 - do not switch branches with dirty file ok 14 - switch to twelfth from the last # passed all 2 test(s) 1..2 *** t2201-add-update-typechange.sh *** ok 1 - setup ok 6 - unmerge with plumbing ok 2 - update *** t2202-add-addremove.sh *** ok 3 - update noticed a removal ok 4 - update touched correct path ok 15 - merge base test setup ok 5 - update did not touch other tracked files ok 6 - update did not touch untracked files ok 16 - another...master ok 7 - cache tree has not been corrupted ok 1 - setup ok 8 - update from a subdirectory ok 9 - change gets noticed ok 1 - setup ok 17 - ...master ok 10 - replace a file with a symlink ok 11 - add everything changed ok 2 - git add --all # passed all 2 test(s) 1..2 ok 18 - master... ok 12 - touch and then add -u # passed all 18 test(s) 1..18 *** t2203-add-intent.sh *** ok 13 - touch and then add explicitly *** t2204-add-ignored.sh *** ok 7 - rerere and rerere forget ok 7 - git checkout -p HEAD with change already staged ok 14 - add -n -u should not add but just report ok 2 - modify ok 1 - setup ok 1 - intent to add ok 3 - diff-files ok 2 - no complaints for unignored file ok 4 - diff-index ok 2 - check result of "add -N" ok 3 - no complaints for unignored dir/file ok 5 - add -u ok 3 - intent to add is just an ordinary empty blob ok 4 - no complaints for unignored dir ok 4 - intent to add does not clobber existing paths ok 5 - no complaints for unignored d* ok 15 - add -u resolves unmerged paths ok 6 - commit -a ok 6 - complaints for ignored ign # passed all 6 test(s) 1..6 ok 16 - "add -u non-existent" should fail # passed all 16 test(s) 1..16 ok 7 - complaints for ignored ign with unignored file ok 5 - cannot commit with i-t-a entry *** t2300-cd-to-toplevel.sh *** *** t3000-ls-files-others.sh *** ok 8 - complaints for ignored dir/ign ok 8 - git checkout -p HEAD^ ok 6 - can commit with an unrelated i-t-a entry in index ok 8 - rerere and rerere forget (subdirectory) ok 9 - complaints for ignored dir/ign with unignored file # passed all 8 test(s) 1..8 ok 10 - complaints for ignored dir/sub ok 7 - can "commit -a" with an i-t-a entry # passed all 7 test(s) 1..7 *** t3001-ls-files-others-exclude.sh *** ok 11 - complaints for ignored dir/sub with unignored file ok 1 - setup *** t3002-ls-files-dashpath.sh *** ok 2 - setup: expected output ok 1 - at physical root ok 3 - ls-files --others ok 12 - complaints for ignored dir/sub/ign ok 4 - ls-files --others --directory ok 5 - --no-empty-directory hides empty directory ok 13 - complaints for ignored dir/sub/ign with unignored file # passed all 5 test(s) 1..5 ok 2 - at physical subdir ok 1 - setup *** t3003-ls-files-exclude.sh *** ok 14 - complaints for ignored sub/file ok 1 - git ls-files --others with various exclude options. ok 2 - git ls-files without path restriction. ok 2 - git ls-files --others with \r\n line endings. ok 3 - git ls-files with path restriction. ok 3 - at symbolic root ok 15 - complaints for ignored sub/file with unignored file ok 4 - git ls-files with path restriction with --. ok 3 - setup skip-worktree gitignore ok 5 - git ls-files with path restriction with -- --. ok 16 - complaints for ignored sub ok 4 - git ls-files --others with various exclude options. ok 6 - git ls-files with no path restriction. # passed all 6 test(s) 1..6 ok 5 - restore gitignore ok 4 - at symbolic subdir ok 17 - complaints for ignored sub with unignored file *** t3010-ls-files-killed-modified.sh *** ok 1 - create repo with file ok 9 - git checkout -p handles deletion ok 6 - git status honors core.excludesfile ok 2 - ls-files output contains file (cached) ok 18 - complaints for ignored sub/file ok 7 - trailing slash in exclude allows directory match(1) ok 5 - at internal symbolic subdir ok 3 - ls-files output contains file (modified) ok 4 - add file to gitignore # passed all 5 test(s) 1..5 ok 8 - trailing slash in exclude allows directory match (2) ok 5 - ls-files output contains file (cached) ok 19 - complaints for ignored sub/file with unignored file ok 9 - trailing slash in exclude forces directory match (1) ok 6 - ls-files output contains file (modified) *** t3020-ls-files-error-unmatch.sh *** ok 10 - trailing slash in exclude forces directory match (2) ok 20 - complaints for ignored sub/ign ok 7 - ls-files -i lists only tracked-but-ignored files ok 11 - negated exclude matches can override previous ones # passed all 7 test(s) 1..7 ok 12 - subdirectory ignore (setup) ok 1 - git update-index --add to add various paths. ok 21 - complaints for ignored sub/ign with unignored file *** t3030-merge-recursive.sh *** ok 13 - subdirectory ignore (toplevel) ok 14 - subdirectory ignore (l1/l2) ok 22 - complaints for ignored sub in dir ok 2 - git ls-files -k to show killed files. ok 15 - subdirectory ignore (l1) # passed all 15 test(s) 1..15 ok 3 - validate git ls-files -k output. ok 1 - setup ok 4 - git ls-files -m to show modified files. ok 23 - complaints for ignored sub/file in dir ok 5 - validate git ls-files -m output. ok 2 - git ls-files --error-unmatch should fail with unmatched path. # passed all 5 test(s) 1..5 ok 3 - git ls-files --error-unmatch should succeed eith matched paths. *** t3031-merge-criscross.sh *** # passed all 3 test(s) 1..3 ok 24 - complaints for ignored sub/ign in dir *** t3040-subprojects-basic.sh *** *** t3050-subprojects-fetch.sh *** ok 25 - complaints for ignored ign in sub ok 10 - path limiting works: dir ok 26 - complaints for ignored file in sub # passed all 26 test(s) 1..26 *** t3060-ls-files-with-tree.sh *** ok 1 - Super project creation ok 1 - setup ok 1 - setup 1 ok 2 - create subprojects ok 1 - setup ok 2 - git -ls-files --with-tree should succeed from subdir ok 3 - git -ls-files --with-tree should add entries from named tree. # passed all 3 test(s) 1..3 ok 11 - path limiting works: -- dir ok 3 - check if fsck ignores the subprojects ok 2 - clone *** t3100-ls-tree-restrict.sh *** ok 4 - check if commit in a subproject detected ok 2 - setup 2 ok 3 - advance ok 5 - check if a changed subproject HEAD can be committed ok 6 - check if diff-index works for subproject elements ok 7 - check if diff-tree works for subproject elements ok 8 - check if git diff works for subproject elements ok 1 - setup ok 2 - ls-tree plain ok 9 - check if clone works ok 1 - setup repo with criss-cross history ok 3 - setup 3 ok 3 - ls-tree recursive ok 2 - recursive merge between F and G, causes segfault ok 4 - ls-tree recursive with -t # passed all 2 test(s) 1..2 ok 10 - removing and adding subproject ok 5 - ls-tree recursive with -d ok 4 - fetch # passed all 4 test(s) 1..4 ok 6 - ls-tree filtered with path ok 12 - path limiting works: HEAD^ -- dir ok 11 - checkout in superproject # passed all 11 test(s) *** t3101-ls-tree-dirname.sh *** 1..11 ok 7 - ls-tree filtered with path1 path0 *** t3200-branch.sh *** ok 8 - ls-tree filtered with path0/ *** t3201-branch-contains.sh *** ok 9 - ls-tree filtered with path2 ok 4 - setup 4 ok 10 - ls-tree filtered with path2/ ok 11 - ls-tree filtered with path2/baz ok 1 - setup ok 12 - ls-tree filtered with path2/bak ok 13 - ls-tree -t filtered with path2/bak ok 2 - ls-tree plain ok 14 - ls-tree with one path a prefix of the other ok 3 - ls-tree recursive # passed all 14 test(s) 1..14 ok 1 - prepare a trivial repository ok 4 - ls-tree filter 1.txt *** t3202-show-branch-octopus.sh *** ok 5 - setup 5 ok 5 - ls-tree filter path1/b/c/1.txt ok 6 - ls-tree filter all 1.txt files ok 1 - setup ok 7 - ls-tree filter directories ok 13 - path limiting works: foo inside dir ok 2 - branch --contains=master ok 3 - branch --contains master ok 14 - none of this moved HEAD ok 8 - ls-tree filter odd names # passed all 14 test(s) 1..14 ok 4 - branch --contains=side ok 9 - ls-tree filter missing files and extra slashes ok 5 - side: branch --merged *** t3203-branch-output.sh *** ok 10 - ls-tree filter is leading path match ok 6 - side: branch --no-merged ok 11 - ls-tree --full-name ok 6 - setup 6 ok 7 - master: branch --merged ok 8 - master: branch --no-merged # passed all 8 test(s) 1..8 ok 12 - ls-tree --full-tree ok 2 - git branch --help should not have created a bogus branch ok 3 - git branch abc should create a branch ok 13 - ls-tree --full-tree -r *** t3210-pack-refs.sh *** ok 4 - git branch a/b/c should create a branch ok 14 - ls-tree --abbrev=5 ok 5 - git branch -l d/e/f should create a branch and a log ok 7 - setup 7 ok 1 - make commits ok 6 - git branch -d d/e/f should delete a branch and a log ok 15 - ls-tree --name-only ok 2 - make branches ok 16 - ls-tree --name-only -r # passed all 16 test(s) 1..16 ok 7 - git branch j/k should work after branch j has been deleted ok 8 - setup 8 ok 3 - make remote branches *** t3300-funny-names.sh *** ok 8 - git branch l should work after branch l/m has been deleted ok 4 - git branch shows local branches ok 1 - prepare a trivial repository ok 9 - setup 9 ok 5 - git branch -r shows remote branches ok 9 - git branch -m m m/m should work ok 2 - see if git show-ref works as expected ok 6 - git branch -a shows local and remote branches ok 10 - merge-recursive simple ok 10 - git branch -m n/n n should work ok 7 - git branch -v shows branch summaries ok 11 - merge-recursive result ok 1 - setup expect ok 3 - see if a branch still exists when packed ok 11 - git branch -m o/o o should fail when o/p exists ok 8 - git branch shows detached HEAD properly # passed all 8 test(s) 1..8 ok 2 - git ls-files no-funny ok 3 - setup expect ok 12 - git branch -m q r/q should fail when r exists *** t3301-notes.sh *** ok 4 - git branch c/d should barf if branch c exists ok 4 - git ls-files with-funny ok 5 - setup expect ok 13 - git branch -m q q2 without config should succeed ok 6 - git ls-files -z with-funny ok 12 - fail if the index has unresolved entries ok 7 - setup expect ok 5 - see if a branch still exists after git pack-refs --prune ok 8 - git ls-tree with funny ok 9 - setup expect ok 13 - merge-recursive remove conflict ok 10 - git diff-index with-funny ok 14 - merge-recursive remove conflict ok 6 - see if git pack-refs --prune remove ref files ok 14 - git branch -m s/s s should work when s/t is deleted ok 1 - setup ok 1 - cannot annotate non-existing HEAD ok 11 - git diff-tree with-funny ok 12 - setup expect ok 15 - config information was renamed, too ok 13 - git diff-index -z with-funny ok 2 - show-branch with more than 8 branches ok 7 - see if git pack-refs --prune removes empty dirs ok 15 - merge-recursive d/f simple ok 14 - git diff-tree -z with-funny ok 15 - setup expect ok 16 - renaming a symref is not allowed ok 16 - merge-recursive result ok 16 - git diff-tree -C with-funny ok 17 - setup expect ok 2 - setup ok 17 - git branch -m u v should fail when the reflog for u is a symlink ok 3 - need valid notes ref ok 18 - git diff-tree delete with-funny ok 19 - setup expect ok 4 - refusing to add notes in refs/heads/ ok 17 - merge-recursive d/f conflict ok 20 - git diff-tree delete with-funny ok 5 - refusing to edit notes in refs/remotes/ ok 21 - setup expect ok 18 - merge-recursive d/f conflict result ok 8 - git branch g should work when git branch g/h has been deleted ok 6 - handle empty notes gracefully ok 22 - git diff-tree delete with-funny ok 23 - setup expect ok 3 - show-branch with showbranch.default ok 7 - show non-existent notes entry with %N # passed all 3 test(s) 1..3 ok 24 - git diff-tree rename with-funny applied ok 25 - setup expect ok 9 - git branch i/j/k should barf if branch i exists ok 19 - merge-recursive d/f conflict the other way ok 26 - git diff-tree delete with-funny applied *** t3302-notes-index-expensive.sh *** ok 20 - merge-recursive d/f conflict result the other way ok 27 - git apply non-git diff # passed all 27 test(s) 1..27 ok 18 - test tracking setup via --track *** t3303-notes-subtrees.sh *** ok 8 - create notes ok 21 - merge-recursive d/f conflict ok 9 - show notes entry with %N ok 22 - merge-recursive d/f conflict result ok 10 - test git branch k after branch k/l/m and k/lm have been deleted ok 1 - setup / mkdir ok 10 - create reflog entry ok 19 - test tracking setup (non-wildcard, matching) ok 23 - merge-recursive d/f conflict ok 24 - merge-recursive d/f conflict result ok 11 - edit existing notes ok 25 - reset and 3-way merge ok 2 - setup 10 ok 20 - test tracking setup (non-wildcard, not matching) ok 11 - test git branch n after some branch deletion and pruning ok 12 - cannot add note where one exists ok 3 - notes work ok 4 # skip notes timing with /usr/bin/time (missing USR_BIN_TIME of USR_BIN_TIME,NOT_EXPENSIVE) ok 5 - teardown / cd .. ok 6 # skip setup / mkdir (missing EXPENSIVE) ok 7 # skip setup 100 (missing EXPENSIVE) ok 8 # skip notes work (missing EXPENSIVE) ok 9 # skip notes timing with /usr/bin/time (missing EXPENSIVE,USR_BIN_TIME of USR_BIN_TIME,EXPENSIVE) ok 10 # skip teardown / cd .. (missing EXPENSIVE) ok 11 # skip setup / mkdir (missing EXPENSIVE) ok 12 # skip setup 1000 (missing EXPENSIVE) ok 13 # skip notes work (missing EXPENSIVE) ok 14 # skip notes timing with /usr/bin/time (missing EXPENSIVE,USR_BIN_TIME of USR_BIN_TIME,EXPENSIVE) ok 15 # skip teardown / cd .. (missing EXPENSIVE) ok 16 # skip setup / mkdir (missing EXPENSIVE) ok 17 # skip setup 10000 (missing EXPENSIVE) ok 18 # skip notes work (missing EXPENSIVE) ok 19 # skip notes timing with /usr/bin/time (missing EXPENSIVE,USR_BIN_TIME of USR_BIN_TIME,EXPENSIVE) ok 20 # skip teardown / cd .. (missing EXPENSIVE) # passed all 20 test(s) 1..20 ok 12 - see if up-to-date packed refs are preserved *** t3304-notes-mixed.sh *** ok 21 - test tracking setup via config ok 26 - reset and bind merge ok 13 - can overwrite existing note with "git notes add -f" ok 14 - show notes ok 13 - pack, prune and repack # passed all 13 test(s) 1..13 *** t3305-notes-fanout.sh *** ok 22 - test overriding tracking setup via --no-track ok 27 - merge removes empty directories ok 15 - create multi-line notes (setup) not ok 28 - merge-recursive simple w/submodule # TODO known breakage ok 1 - setup: create a couple of commits ok 16 - show multi-line notes not ok 29 - merge-recursive simple w/submodule result # TODO known breakage ok 23 - no tracking without .fetch entries ok 17 - create -F notes (setup) ok 18 - show -F notes ok 30 - merge-recursive copy vs. rename # still have 2 known breakage(s) # passed all remaining 28 test(s) 1..30 ok 24 - test tracking setup via --track but deeper ok 19 - git log --pretty=raw does not show notes ok 2 - create a notes tree with both notes and non-notes ok 20 - git log --show-notes ok 3 - verify contents of notes ok 1 - setup: create 100 commits *** t3306-notes-prune.sh *** ok 25 - test deleting branch deletes branch config ok 21 - git log --no-notes ok 22 - git format-patch does not show notes ok 23 - git format-patch --show-notes does show notes ok 26 - test deleting branch without config ok 24 - git show does show notes ok 4 - verify contents of non-notes ok 25 - git show --pretty does not show notes ok 5 - git-notes preserves non-notes ok 27 - test --track without .fetch entries ok 26 - git show --pretty=raw does not show notes ok 27 - git show --pretty=short does not show notes ok 28 - branch from non-branch HEAD w/autosetupmerge=always ok 28 - git show --pretty=medium does not show notes ok 29 - branch from non-branch HEAD w/--track causes failure ok 29 - git show --pretty=full does not show notes ok 6 - verify contents of non-notes after git-notes # passed all 6 test(s) 1..6 ok 30 - git show --pretty=fuller does not show notes ok 30 - git checkout -b g/h/i -l should create a branch and a log ok 31 - git show --pretty=format:%s does not show notes *** t3307-notes-man.sh *** ok 32 - git show --oneline does not show notes ok 1 - setup: create a few commits with notes ok 31 - checkout -b makes reflog by default ok 2 - verify commits and notes ok 33 - create -m notes (setup) ok 34 - show -m notes ok 32 - checkout -b does not make reflog when core.logAllRefUpdates = false ok 35 - remove note with add -f -F /dev/null (setup) ok 36 - verify note removal with -F /dev/null ok 33 - checkout -b with -l makes reflog when core.logAllRefUpdates = false ok 37 - do not create empty note with -m "" (setup) ok 38 - verify non-creation of note with -m "" ok 39 - create note with combination of -m and -F ok 1 - setup ok 34 - avoid ambiguous track ok 40 - remove note with "git notes remove" (setup) ok 2 - example 1: notes to add an Acked-by line ok 41 - verify note removal with "git notes remove" ok 42 - removing non-existing note should not create new commit ok 3 - remove some commits ok 43 - list notes with "git notes list" ok 3 - example 2: binary notes # passed all 3 test(s) 1..3 ok 44 - list notes with "git notes" ok 4 - verify that commits are gone ok 45 - list specific note with "git notes list " *** t3400-rebase.sh *** ok 46 - listing non-existing notes fails ok 5 - verify that notes are still present ok 35 - autosetuprebase local on a tracked local branch ok 6 - prune -n does not remove notes ok 47 - append to existing note with "git notes append" ok 7 - prune -n lists prunable notes ok 48 - "git notes list" does not expand to "git notes list HEAD" ok 8 - prune notes ok 49 - appending empty string does not change existing note ok 9 - verify that notes are gone ok 50 - git notes append == add when there is no existing note ok 51 - appending empty string to non-existing note does not create note ok 36 - autosetuprebase always on a tracked local branch ok 52 - create other note on a different notes ref (setup) ok 53 - Do not show note on other ref by default ok 2 - test notes in 2/38-fanout ok 54 - Do show note when ref is given in GIT_NOTES_REF ok 3 - verify notes in 2/38-fanout ok 55 - Do show note when ref is given in core.notesRef config ok 56 - Do not show note when core.notesRef is overridden ok 10 - remove some commits ok 11 - prune -v notes ok 57 - Show all notes when notes.displayRef=refs/notes/* ok 12 - verify that notes are gone # passed all 12 test(s) 1..12 ok 37 - autosetuprebase remote on a tracked local branch ok 58 - core.notesRef is implicitly in notes.displayRef *** t3401-rebase-partial.sh *** ok 1 - prepare repository with topic branches ok 59 - notes.displayRef can be given more than once ok 2 - rebase on dirty worktree ok 60 - notes.displayRef respects order ok 61 - GIT_NOTES_DISPLAY_REF works ok 3 - rebase on dirty cache ok 62 - GIT_NOTES_DISPLAY_REF overrides config ok 63 - --show-notes=* adds to GIT_NOTES_DISPLAY_REF ok 38 - autosetuprebase never on a tracked local branch ok 64 - --no-standard-notes ok 65 - --standard-notes ok 1 - prepare repository with topic branch ok 66 - --show-notes=ref accumulates ok 2 - pick top patch from topic branch into master ok 39 - autosetuprebase local on a tracked remote branch ok 67 - Allow notes on non-commits (trees, blobs, tags) ok 40 - autosetuprebase never on a tracked remote branch ok 68 - create note from other note with "git notes add -C" ok 41 - autosetuprebase remote on a tracked remote branch ok 69 - create note from non-existing note with "git notes add -C" fails ok 4 - rebase against master ok 42 - autosetuprebase always on a tracked remote branch ok 70 - create note from other note with "git notes add -c" ok 3 - rebase topic branch against new master and check git am did not get halted ok 5 - rebase against master twice ok 71 - create note from non-existing note with "git notes add -c" fails ok 43 - autosetuprebase unconfigured on a tracked remote branch ok 4 - test notes in 2/2/36-fanout ok 72 - append to note from other note with "git notes append -C" ok 5 - verify notes in 2/2/36-fanout ok 73 - create note from other note with "git notes append -c" ok 74 - append to note from other note with "git notes append -c" ok 44 - autosetuprebase unconfigured on a tracked local branch ok 75 - copy note with "git notes copy" ok 4 - rebase --merge topic branch that was partially merged upstream # passed all 4 test(s) 1..4 *** t3402-rebase-merge.sh *** ok 76 - prevent overwrite with "git notes copy" ok 45 - autosetuprebase unconfigured on untracked local branch ok 6 - rebase against master twice with --force ok 77 - allow overwrite with "git notes copy -f" ok 46 - autosetuprebase unconfigured on untracked remote branch ok 78 - cannot copy note from object without notes ok 7 - rebase against master twice from another branch ok 47 - autosetuprebase never on an untracked local branch ok 79 - git notes copy --stdin ok 8 - rebase fast-forward to master ok 1 - setup ok 48 - autosetuprebase local on an untracked local branch ok 9 - the rebase operation should not have destroyed author information ok 10 - the rebase operation should not have destroyed author information (2) ok 2 - reference merge ok 11 - HEAD was detached during rebase ok 80 - git notes copy --for-rewrite (unconfigured) ok 49 - autosetuprebase remote on an untracked local branch ok 81 - git notes copy --for-rewrite (enabled) ok 50 - autosetuprebase always on an untracked local branch ok 82 - git notes copy --for-rewrite (disabled) ok 83 - git notes copy --for-rewrite (overwrite) ok 6 - test notes in 2/2/2/34-fanout ok 51 - autosetuprebase never on an untracked remote branch ok 7 - verify notes in 2/2/2/34-fanout ok 84 - git notes copy --for-rewrite (ignore) ok 52 - autosetuprebase local on an untracked remote branch ok 85 - git notes copy --for-rewrite (append) ok 3 - rebase ok 12 - rebase after merge master ok 4 - test-rebase@{1} is pre rebase ok 5 - merge and rebase should match ok 53 - autosetuprebase remote on an untracked remote branch ok 86 - git notes copy --for-rewrite (append two to one) ok 87 - git notes copy --for-rewrite (append empty) ok 54 - autosetuprebase always on an untracked remote branch ok 55 - detect misconfigured autosetuprebase (bad value) ok 88 - GIT_NOTES_REWRITE_MODE works ok 56 - detect misconfigured autosetuprebase (no value) ok 57 - attempt to delete a branch without base and unmerged to HEAD ok 89 - GIT_NOTES_REWRITE_REF works ok 58 - attempt to delete a branch merged to its base ok 6 - rebase the other way ok 90 - GIT_NOTES_REWRITE_REF overrides config ok 91 - git notes copy diagnoses too many or too few parameters # passed all 91 test(s) 1..91 ok 59 - attempt to delete a branch merged to its base # passed all 59 test(s) 1..59 *** t3403-rebase-skip.sh *** *** t3404-rebase-interactive.sh *** ok 13 - rebase of history with merges is linearized ok 7 - rebase -Xtheirs ok 8 - merge and rebase should match ok 1 - setup ok 9 - picking rebase ok 2 - rebase with git am -3 (default) ok 8 - test same notes in no fanout and 2/38-fanout ok 9 - verify same notes in no fanout and 2/38-fanout ok 14 - rebase of history with merges after upstream merge is linearized ok 10 - rebase -s funny -Xopt # passed all 10 test(s) 1..10 *** t3405-rebase-malformed.sh *** ok 3 - rebase --skip with am -3 ok 1 - setup ok 1 - setup ok 15 - rebase a single mode change ok 2 - rebase # passed all 2 test(s) 1..2 *** t3406-rebase-message.sh *** ok 16 - rebase is not broken by diff.renames ok 4 - rebase moves back to skip-reference ok 5 - checkout skip-merge ok 17 - setup: recover ok 1 - setup ok 18 - Show verbose error when HEAD could not be detached ok 6 - rebase with --merge ok 10 - test same notes in no fanout and 2/2/36-fanout ok 11 - verify same notes in no fanout and 2/2/36-fanout ok 2 - rebase -i with the exec command ok 19 - dump usage when upstream arg is missing ok 2 - rebase -m ok 7 - rebase --skip with --merge ok 8 - merge and reference trees equal ok 9 - moved back to branch correctly # passed all 9 test(s) 1..9 *** t3407-rebase-abort.sh *** ok 3 - rebase -i with the exec command runs from tree root ok 20 - rebase -q is quiet ok 1 - setup ok 3 - rebase --stat ok 21 - Rebase a commit that sprinkles CRs in ok 4 - rebase -i with the exec command checks tree cleanness ok 2 - rebase --abort ok 4 - rebase w/config rebase.stat ok 12 - test same notes in 2/38-fanout and 2/2/36-fanout ok 5 - no changes are a nop ok 13 - verify same notes in 2/38-fanout and 2/2/36-fanout ok 5 - rebase -n overrides config rebase.stat config # passed all 5 test(s) 1..5 ok 22 - rebase can copy notes *** t3408-rebase-multi-line.sh *** ok 1 - setup ok 23 - rebase -m can copy notes # passed all 23 test(s) 1..23 ok 6 - test the [branch] option *** t3409-rebase-preserve-merges.sh *** ok 3 - rebase --abort after --skip ok 2 - rebase # passed all 2 test(s) 1..2 *** t3410-rebase-preserve-dropped-merges.sh *** ok 1 - setup for merge-preserving rebase ok 7 - test --onto ok 1 - setup ok 14 - test same notes in 2/2/2/34-fanout and 2/2/36-fanout ok 15 - verify same notes in 2/2/2/34-fanout and 2/2/36-fanout ok 4 - rebase --abort after --continue ok 2 - rebase -p fakes interactive rebase ok 8 - rebase on top of a non-conflicting commit ok 9 - reflog for the branch shows state before rebase ok 5 - rebase --abort does not update reflog ok 6 - rebase --merge --abort ok 10 - exchange two commits ok 2 - skip same-resolution merges with -p ok 16 - test notes in no fanout concatenated with 2/38-fanout ok 7 - rebase --merge --abort after --skip ok 17 - verify notes in no fanout concatenated with 2/38-fanout ok 11 - stop on conflicting pick ok 3 - --continue works after a conflict # passed all 3 test(s) 1..3 *** t3411-rebase-preserve-around-merges.sh *** ok 12 - abort ok 8 - rebase --merge --abort after --continue ok 13 - abort with error when new base cannot be checked out ok 9 - rebase --merge --abort does not update reflog # passed all 9 test(s) 1..9 ok 1 - setup *** t3412-rebase-root.sh *** ok 1 - prepare repository ok 2 - rebase --root expects --onto ok 3 - setup pre-rebase hook ok 18 - test notes in no fanout concatenated with 2/2/36-fanout ok 19 - verify notes in no fanout concatenated with 2/2/36-fanout ok 14 - retain authorship ok 3 - keep different-resolution merges with -p # passed all 3 test(s) 1..3 *** t3413-rebase-hook.sh *** ok 2 - squash F1 into D1 ok 4 - rebase --root --onto ok 5 - pre-rebase got correct input (1) ok 1 - setup ok 15 - squash ok 16 - retain authorship when squashing ok 6 - rebase --root --onto ok 7 - pre-rebase got correct input (2) ok 2 - rebase ok 20 - test notes in 2/38-fanout concatenated with 2/2/36-fanout ok 21 - verify notes in 2/38-fanout concatenated with 2/2/36-fanout ok 17 - -p handles "no changes" gracefully ok 3 - rebase -i ok 4 - setup pre-rebase hook ok 8 - rebase -i --root --onto ok 9 - pre-rebase got correct input (3) ok 5 - pre-rebase hook gets correct input (1) not ok 18 - exchange two commits with -p # TODO known breakage ok 3 - rebase two levels of merge # passed all 3 test(s) 1..3 *** t3414-rebase-preserve-onto.sh *** ok 6 - pre-rebase hook gets correct input (2) ok 10 - rebase -i --root --onto ok 11 - pre-rebase got correct input (4) ok 1 - setup ok 22 - test notes in 2/2/36-fanout concatenated with 2/2/2/34-fanout ok 23 - verify notes in 2/2/36-fanout concatenated with 2/2/2/34-fanout # passed all 23 test(s) 1..23 *** t3415-rebase-autosquash.sh *** ok 7 - pre-rebase hook gets correct input (3) ok 1 - setup ok 1 - creating many notes with git-notes ok 2 - many notes created correctly with git-notes ok 3 - many notes created with git-notes triggers fanout ok 12 - rebase -i -p with linear history ok 13 - pre-rebase got correct input (5) ok 14 - set up merge history ok 8 - pre-rebase hook gets correct input (4) ok 2 - auto fixup (option) ok 19 - preserve merges with -p ok 2 - rebase from B1 onto H1 ok 9 - pre-rebase hook gets correct input (5) ok 15 - rebase -i -p with merge ok 16 - set up second root and merge ok 20 - edit ancestor with -p ok 10 - pre-rebase hook gets correct input (6) ok 11 - setup pre-rebase hook that fails ok 3 - rebase from E1 onto H1 ok 12 - pre-rebase hook stops rebase (1) ok 13 - pre-rebase hook stops rebase (2) ok 3 - auto fixup (config) ok 14 - rebase --no-verify overrides pre-rebase (1) ok 21 - --continue tries to commit ok 4 - rebase from C1 onto H1 # passed all 4 test(s) 1..4 *** t3416-rebase-onto-threedots.sh *** ok 17 - rebase -i -p with two roots ok 18 - setup pre-rebase hook that fails ok 4 - auto squash (option) ok 19 - pre-rebase hook stops rebase ok 15 - rebase --no-verify overrides pre-rebase (2) # passed all 15 test(s) 1..15 *** t3417-rebase-whitespace-fix.sh *** ok 20 - pre-rebase hook stops rebase -i ok 21 - remove pre-rebase hook ok 22 - set up a conflict ok 1 - setup ok 22 - verbose flag is heeded, even after --continue ok 23 - rebase --root with conflict (first part) ok 24 - fix the conflict ok 4 - deleting most notes with git-notes ok 1 - blank line at end of file; extend at end of file ok 2 - rebase --onto master...topic ok 5 - most notes deleted correctly with git-notes ok 6 - deleting most notes triggers fanout consolidation # passed all 6 test(s) 1..6 ok 25 - rebase --root with conflict (second part) ok 23 - multi-squash only fires up editor once ok 3 - rebase --onto master... *** t3418-rebase-continue.sh *** ok 2 - two blanks line at end of file; extend at end of file ok 4 - rebase --onto master...side ok 26 - rebase -i --root with conflict (first part) ok 27 - fix the conflict ok 1 - setup ok 5 - auto squash (config) ok 3 - same, but do not remove trailing spaces ok 24 - multi-fixup does not fire up editor ok 6 - misspelled auto squash ok 5 - rebase -i --onto master...topic # passed all 6 test(s) 1..6 ok 2 - interactive rebase --continue works with touched file *** t3419-rebase-patch-id.sh *** ok 1 - setup ok 28 - rebase -i --root with conflict (second part) ok 4 - at beginning of file # passed all 4 test(s) 1..4 *** t3500-cherry.sh *** ok 2 - setup: 500 lines ok 3 - setup attributes ok 1 - prepare repository with topic branch, and check cherry finds the 2 patches from there ok 2 - check that cherry with limit returns only the top patch ok 3 - cherry-pick one of the 2 patches, and check cherry recognized one and only one as new ok 29 - rebase -i -p --root with conflict (first part) # passed all 3 test(s) 1..3 ok 30 - fix the conflict *** t3501-revert-cherry-pick.sh *** ok 3 - non-interactive rebase --continue works with touched file # passed all 3 test(s) 1..3 ok 25 - commit message used after conflict *** t3502-cherry-pick-merge.sh *** ok 6 - rebase -i --onto master... ok 4 - detect upstream patch ok 7 - rebase -i --onto master...side # passed all 7 test(s) 1..7 ok 1 - setup *** t3503-cherry-pick-root.sh *** ok 2 - cherry-pick --nonsense ok 1 - setup ok 3 - revert --nonsense ok 2 - cherry-pick a non-merge with -m should fail ok 3 - cherry pick a merge without -m should fail ok 4 - cherry-pick after renaming branch ok 1 - setup ok 2 - cherry-pick a root commit # passed all 2 test(s) 1..2 ok 4 - cherry pick a merge (1) *** t3504-cherry-pick-rerere.sh *** ok 5 - revert after renaming branch ok 5 - cherry pick a merge (2) ok 6 - cherry pick a merge relative to nonexistent parent should fail ok 6 - cherry-pick on stat-dirty working tree ok 7 - revert a non-merge with -m should fail ok 7 - revert forbidden on dirty working tree # passed all 7 test(s) 1..7 ok 1 - setup ok 5 - do not drop patch ok 8 - revert a merge without -m should fail ok 6 # skip setup: 50000 lines (missing EXPENSIVE) ok 7 # skip setup attributes (missing EXPENSIVE) ok 8 # skip detect upstream patch (missing EXPENSIVE) ok 9 # skip do not drop patch (missing EXPENSIVE) # passed all 9 test(s) 1..9 *** t3505-cherry-pick-empty.sh *** ok 2 - conflicting merge *** t3506-cherry-pick-ff.sh *** ok 3 - fixup ok 9 - revert a merge (1) ok 4 - cherry-pick conflict ok 5 - reconfigure ok 6 - cherry-pick conflict without rerere # passed all 6 test(s) 1..6 ok 10 - revert a merge (2) *** t3507-cherry-pick-conflict.sh *** ok 26 - commit message retained after conflict ok 11 - revert a merge relative to nonexistent parent should fail # passed all 11 test(s) 1..11 ok 1 - setup ok 1 - setup *** t3508-cherry-pick-many-commits.sh *** ok 2 - cherry-pick an empty commit ok 3 - index lockfile was removed ok 4 - cherry-pick a commit with an empty message ok 5 - index lockfile was removed # passed all 5 test(s) 1..5 ok 2 - cherry-pick using --ff fast forwards *** t3509-cherry-pick-merge-df.sh *** ok 3 - cherry-pick not using --ff does not fast forwards ok 1 - setup ok 2 - failed cherry-pick does not advance HEAD ok 1 - setup ok 31 - rebase -i -p --root with conflict (second part) # passed all 31 test(s) 1..31 ok 1 - Setup rename across paths each below D/F conflicts ok 4 - merge setup *** t3600-rm.sh *** ok 3 - advice from failed cherry-pick ok 5 - cherry-pick a non-merge with --ff and -m should fail ok 2 - Cherry-pick succeeds with rename across D/F conflicts # passed all 2 test(s) 1..2 ok 2 - cherry-pick first..fourth works ok 6 - cherry pick a merge with --ff but without -m should fail *** t3701-add-interactive.sh *** ok 1 - Initialize test directory ok 4 - failed cherry-pick produces dirty index ok 7 - cherry pick with --ff a merge (1) ok 2 - add files with funny names ok 3 - Pre-check that foo exists and is in index before git rm foo ok 4 - Test that git rm foo succeeds ok 1 - setup (initial) ok 5 - Test that git rm --cached foo succeeds if the index matches the file ok 8 - cherry pick with --ff a merge (2) ok 9 - cherry pick a merge relative to nonexistent parent with --ff should fail ok 6 - Test that git rm --cached foo succeeds if the index matches the file ok 5 - failed cherry-pick registers participants in index ok 3 - cherry-pick --strategy resolve first..fourth works ok 7 - Test that git rm --cached foo fails if the index matches neither the file nor HEAD ok 10 - cherry pick a root commit with --ff # passed all 10 test(s) 1..10 ok 8 - Test that git rm --cached -f foo works in case where --cached only did not ok 9 - Post-check that foo exists but is not in index after git rm foo ok 27 - squash and fixup generate correct log messages ok 10 - Pre-check that bar exists and is in index before "git rm bar" ok 6 - failed cherry-pick describes conflict in work tree *** t3702-add-edit.sh *** ok 11 - Test that "git rm bar" succeeds ok 2 - status works (initial) ok 4 - cherry-pick --ff first..fourth works ok 3 - setup expected ok 12 - Post-check that bar does not exist and is not in index after "git rm -f bar" ok 13 - Test that "git rm -- -q" succeeds (remove a file that looks like an option) ok 14 - Test that "git rm -f" succeeds with embedded space, tab, or newline characters. ok 15 # skip Test that "git rm -f" fails if its rm fails (missing RO_DIR) ok 16 - When the rm in "git rm -f" fails, it should not remove the file from the index ok 17 - Remove nonexistent file with --ignore-unmatch ok 5 - cherry-pick -n first..fourth works ok 7 - diff3 -m style ok 1 - setup ok 18 - "rm" command printed ok 19 - "rm" command suppressed with --quiet ok 2 - add -e # passed all 2 test(s) 1..2 ok 6 - revert first..fourth works ok 4 - diff works (initial) ok 20 - Re-add foo and baz *** t3800-mktag.sh *** ok 21 - Modify foo -- rm should refuse ok 22 - Modified foo -- rm -f should work ok 23 - Re-add foo and baz for HEAD tests ok 8 - revert also handles conflicts sanely ok 7 - revert ^first fourth works ok 24 - foo is different in index from HEAD -- rm should refuse ok 1 - setup ok 2 - Tag object length check ok 25 - but with -f it should work. ok 3 - "object" line label check ok 26 - refuse to remove cached empty file with modifications ok 4 - "object" line SHA1 check ok 27 - remove intent-to-add file without --force ok 9 - revert conflict, diff3 -m style ok 5 - "type" line label check # passed all 9 test(s) 1..9 ok 6 - "type" line eol check ok 8 - revert fourth fourth~1 fourth~2 works ok 7 - "tag" line label check #1 ok 28 - Recursive test setup *** t3900-i18n-commit.sh *** ok 5 - revert works (initial) ok 29 - Recursive without -r fails ok 8 - "tag" line label check #2 ok 30 - Recursive with -r but dirty ok 9 - "type" line type-name length check ok 31 - Recursive with -r -f ok 6 - setup (commit) ok 32 - Remove nonexistent file returns nonzero exit status ok 10 - verify object (SHA1/type) check ok 11 - verify tag-name check ok 12 - "tagger" line label check #1 ok 13 - "tagger" line label check #2 ok 9 - cherry-pick -3 fourth works ok 33 - Call "rm" from outside the work tree ok 14 - disallow missing tag author name ok 1 - setup ok 2 - no encoding header for base case ok 15 - disallow malformed tagger ok 34 - refresh index before checking if it is up-to-date ok 16 - allow empty tag email ok 17 - disallow spaces in tag email ok 3 - ISO8859-1 setup ok 18 - disallow missing tag timestamp ok 19 - detect invalid tag timestamp1 ok 4 - eucJP setup ok 20 - detect invalid tag timestamp2 ok 7 - status works (commit) ok 8 - setup expected ok 10 - cherry-pick --stdin works # passed all 10 test(s) 1..10 ok 21 - detect invalid tag timezone1 ok 22 - detect invalid tag timezone2 ok 5 - ISO-2022-JP setup ok 6 - check encoding header for ISO8859-1 *** t3901-i18n-patch.sh *** ok 23 - detect invalid tag timezone3 ok 7 - check encoding header for eucJP ok 24 - detect invalid header entry ok 8 - check encoding header for ISO-2022-JP ok 25 - create valid tag ok 28 - squash ignores comments ok 26 - check mytag # passed all 26 test(s) 1..26 ok 9 - config to remove customization ok 10 - ISO8859-1 should be shown in UTF-8 now *** t3902-quoted.sh *** ok 11 - eucJP should be shown in UTF-8 now ok 12 - ISO-2022-JP should be shown in UTF-8 now ok 13 - config to add customization ok 9 - diff works (commit) ok 14 - ISO8859-1 should be shown in itself now ok 15 - eucJP should be shown in itself now ok 16 - ISO-2022-JP should be shown in itself now ok 1 - setup ok 2 - setup expected files ok 17 - config to tweak customization ok 1 - setup ok 18 - ISO8859-1 should be shown in UTF-8 now ok 3 - check fully quoted output from ls-files ok 4 - check fully quoted output from diff-files ok 19 - eucJP should be shown in UTF-8 now ok 5 - check fully quoted output from diff-index ok 20 - ISO-2022-JP should be shown in UTF-8 now ok 6 - check fully quoted output from diff-tree ok 2 - format-patch output (ISO-8859-1) ok 21 - eucJP should be shown in eucJP now ok 7 - check fully quoted output from ls-tree ok 8 - setting core.quotepath ok 22 - ISO-2022-JP should be shown in eucJP now ok 9 - check fully quoted output from ls-files ok 3 - format-patch output (UTF-8) ok 10 - check fully quoted output from diff-files ok 23 - eucJP should be shown in ISO-2022-JP now ok 11 - check fully quoted output from diff-index ok 24 - ISO-2022-JP should be shown in ISO-2022-JP now ok 12 - check fully quoted output from diff-tree ok 25 - No conversion with ISO8859-1 ok 13 - check fully quoted output from ls-tree # passed all 13 test(s) 1..13 ok 26 - No conversion with eucJP ok 27 - No conversion with ISO-2022-JP # passed all 27 test(s) 1..27 *** t3903-stash.sh *** *** t3904-stash-patch.sh *** ok 10 - revert works (commit) ok 11 - setup expected ok 12 - setup fake editor ok 1 - setup ok 1 - stash some dirty working directory ok 2 - parents of stash ok 13 - dummy edit works ok 14 - setup patch ok 15 - setup fake editor ok 29 - squash ignores blank lines ok 4 - rebase (U/U) ok 3 - apply needs clean working directory ok 2 - saying "n" does nothing ok 16 - bad edit rejected ok 17 - setup patch ok 4 - apply stashed changes ok 18 - garbage edit rejected ok 19 - setup patch ok 20 - setup expected ok 5 - apply stashed changes (including index) ok 5 - rebase (U/L) ok 30 - squash works as expected ok 6 - unstashing in a subdirectory ok 21 - real edit works ok 3 - git stash -p ok 22 - skip files similarly as commit -a ok 6 - rebase (L/L) ok 23 - patch does not affect mode ok 7 - drop top stash ok 4 - git stash -p --no-keep-index ok 5 - none of this moved HEAD # passed all 5 test(s) 1..5 ok 24 - stage mode but not hunk *** t4000-diff-format.sh *** ok 31 - interrupted squash works as expected ok 35 - choking "git rm" should not let it die with cruft ok 1 - update-index --add two files with and without +x. ok 36 - rm removes subdirectories recursively # passed all 36 test(s) 1..36 ok 2 - git diff-files -p after editing work tree. ok 3 - validate git diff-files -p output. # passed all 3 test(s) 1..3 *** t4001-diff-rename.sh *** *** t4002-diff-basic.sh *** ok 7 - rebase (L/U) ok 25 - stage mode and hunk ok 1 - update-index --add a file. ok 2 - write that tree. ok 26 - setup again ok 1 - adding test file NN and Z/NN ok 27 - setup patch ok 28 - setup expected ok 3 - renamed and edited the file. ok 2 - adding test file ND and Z/ND ok 4 - git diff-index -p -M after rename and editing. ok 5 - validate the output. ok 3 - adding test file NM and Z/NM ok 4 - adding test file DN and Z/DN ok 8 - cherry-pick(U/U) ok 5 - adding test file DD and Z/DD ok 6 - favour same basenames over different ones ok 6 - adding test file DM and Z/DM ok 7 - favour same basenames even with minor differences # passed all 7 test(s) 1..7 ok 7 - adding test file MN and Z/MN ok 8 - adding test file MD and Z/MD *** t4003-diff-rename-1.sh *** 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 29 - add first line works ok 30 - setup expected ok 14 - change in branch A (modification) ok 9 - cherry-pick(L/L) ok 1 - prepare reference tree ok 15 - change in branch A (modification) ok 16 - change in branch A (modification) ok 2 - prepare work tree ok 17 - change in branch A (modification) ok 18 - change in branch A (modification) ok 19 - change in branch A (modification) ok 3 - validate output from rename/copy detection (#1) ok 20 - change in branch A (addition) ok 4 - prepare work tree again ok 21 - change in branch A (addition) ok 5 - validate output from rename/copy detection (#2) ok 22 - change in branch A (addition) ok 6 - prepare work tree once again ok 23 - change in branch A (addition) ok 24 - change in branch A (addition) ok 7 - validate output from rename/copy detection (#3) # passed all 7 test(s) 1..7 ok 31 - deleting a non-empty file ok 25 - change in branch A (edit) ok 32 - setup expected *** t4004-diff-rename-symlink.sh *** ok 26 - change in branch A (change file to directory) ok 10 - cherry-pick(U/L) ok 8 - drop middle stash 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 1 - prepare reference tree ok 32 - change in branch B (modification) ok 33 - change in branch B (modification) ok 2 - prepare work tree ok 34 - change in branch B (modification) ok 3 - setup diff output ok 35 - change in branch B (modification) ok 4 - validate diff output # passed all 4 test(s) 1..4 ok 36 - change in branch B (addition) ok 37 - change in branch B (addition) ok 11 - cherry-pick(L/U) *** t4005-diff-rename-2.sh *** 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 33 - deleting an empty file # passed all 33 test(s) 1..33 ok 43 - recording branch B tree ok 9 - stash pop ok 1 - prepare reference tree *** t4006-diff-mode.sh *** ok 2 - prepare work tree ok 3 - validate output from rename/copy detection (#1) ok 4 - prepare work tree again ok 44 - keep contents of 3 trees for easy access ok 1 - setup ok 5 - validate output from rename/copy detection (#2) ok 45 - diff-tree of known trees. ok 6 - prepare work tree once again ok 46 - diff-tree of known trees. ok 2 - chmod ok 3 - verify ok 47 - diff-tree of known trees. # passed all 3 test(s) 1..3 ok 7 - validate output from rename/copy detection (#3) ok 48 - diff-tree of known trees. # passed all 7 test(s) 1..7 *** t4007-rename-3.sh *** ok 49 - diff-tree of known trees. *** t4008-diff-break-rewrite.sh *** ok 50 - diff-tree of known trees. ok 51 - diff-tree --stdin of known trees. ok 52 - diff-tree --stdin of known trees. ok 32 - interrupted squash works as expected (case 2) ok 53 - diff-cache O with A in cache ok 12 - rebase --merge (U/U) ok 1 - prepare reference tree ok 54 - diff-cache O with B in cache ok 2 - prepare work tree ok 1 - setup ok 55 - diff-cache A with B in cache ok 2 - change file1 with copy-edit of file0 and remove file0 ok 3 - copy detection ok 3 - run diff with -B ok 4 - validate result of -B (#1) ok 4 - copy detection, cached ok 5 - run diff with -B and -M ok 6 - validate result of -B -M (#2) ok 5 - copy, limited to a subtree ok 56 - diff-files with O in cache and A checked out ok 6 - tweak work tree ok 7 - rename detection ok 7 - swap file0 and file1 ok 8 - run diff with -B ok 8 - rename, limited to a subtree ok 57 - diff-files with O in cache and B checked out # passed all 8 test(s) 1..8 ok 9 - validate result of -B (#3) ok 10 - run diff with -B and -M *** t4009-diff-rename-4.sh *** ok 11 - validate result of -B -M (#4) ok 12 - make file0 into something completely different ok 13 - run diff with -B ok 58 - diff-files with A in cache and B checked out ok 14 - validate result of -B (#5) ok 59 - diff-tree O A == diff-tree -R A O ok 15 - run diff with -B -M ok 10 - stash branch ok 16 - validate result of -B -M (#6) ok 60 - diff-tree -r O A == diff-tree -r -R A O ok 1 - prepare reference tree ok 17 - run diff with -M ok 61 - diff-tree B A == diff-tree -R A B ok 18 - validate result of -M (#7) ok 2 - prepare work tree ok 62 - diff-tree -r B A == diff-tree -r -R A B ok 13 - rebase --merge (U/L) ok 3 - validate output from rename/copy detection (#1) ok 19 - file1 edited to look like file0 and file0 rename-edited to file2 ok 63 - diff can read from stdin # passed all 63 test(s) 1..63 ok 20 - run diff with -B ok 4 - prepare work tree again ok 21 - validate result of -B (#8) ok 22 - run diff with -B -M ok 5 - validate output from rename/copy detection (#2) ok 23 - validate result of -B -M (#9) *** t4010-diff-pathspec.sh *** # passed all 23 test(s) 1..23 ok 6 - prepare work tree once again *** t4011-diff-symlink.sh *** ok 7 - validate output from rename/copy detection (#3) # passed all 7 test(s) 1..7 *** t4012-diff-binary.sh *** ok 1 - setup ok 2 - limit to path should show nothing ok 1 - diff new symlink ok 1 - prepare repository ok 3 - limit to path1 should show path1/file1 ok 11 - apply -q is quiet ok 2 - diff without --binary ok 4 - limit to path1/ should show path1/file1 ok 2 - diff unchanged symlink ok 3 - diff with --binary ok 5 - limit to file0 should show file0 ok 3 - diff removed symlink ok 33 - ignore patch if in upstream ok 6 - limit to file0/ should emit nothing. ok 4 - apply detecting corrupt patch correctly ok 4 - diff identical, but newly created symlink ok 7 - diff-tree pathspec # passed all 7 test(s) 1..7 ok 5 - apply detecting corrupt patch correctly ok 5 - diff different symlink ok 14 - rebase --merge (L/L) *** t4013-diff-various.sh *** ok 6 - initial commit ok 6 - diff symlinks with non-existing targets ok 12 - save -q is quiet ok 7 - setup symlinks with attributes ok 8 - symlinks do not respect userdiff config by path # passed all 8 test(s) 1..8 ok 7 - diff-index with --binary *** t4014-format-patch.sh *** ok 8 - apply binary patch ok 9 - diff --no-index with binary creation # passed all 9 test(s) 1..9 *** t4015-diff-whitespace.sh *** ok 13 - pop -q is quiet ok 1 - Ray's example without options ok 2 - Ray's example with -w ok 3 - Ray's example with -b ok 1 - setup ok 4 - another test, without options ok 15 - rebase --merge (L/U) # passed all 15 test(s) 1..15 ok 2 - format-patch --ignore-if-in-upstream ok 5 - another test, with -w ok 3 - format-patch --ignore-if-in-upstream ok 6 - another test, with -w -b *** t4016-diff-quote.sh *** ok 7 - another test, with -w --ignore-space-at-eol ok 8 - another test, with -w -b --ignore-space-at-eol ok 9 - another test, with -b ok 10 - another test, with -b --ignore-space-at-eol ok 11 - another test, with --ignore-space-at-eol ok 1 - setup ok 12 - check mixed spaces and tabs in indent ok 13 - check mixed tabs and spaces in indent ok 2 - git diff-tree initial ok 14 - check with no whitespace errors ok 15 - check with trailing whitespace ok 3 - git diff-tree -r initial ok 16 - check with space before tab in indent ok 34 - --continue tries to commit, even for "edit" ok 14 - pop -q --index works and is quiet ok 17 - --check and --exit-code are not exclusive ok 4 - git diff-tree -r --abbrev initial ok 1 - setup ok 18 - --check and --quiet are not exclusive ok 2 - setup expected files ok 3 - git diff --summary -M HEAD ok 5 - git diff-tree -r --abbrev=4 initial ok 19 - check staged with no whitespace errors ok 4 - setup expected files ok 5 - git diff --stat -M HEAD ok 6 - git diff-tree --root initial # passed all 5 test(s) 1..5 ok 20 - check staged with trailing whitespace ok 7 - git diff-tree --root --abbrev initial ok 21 - check staged with space before tab in indent *** t4017-diff-retval.sh *** ok 8 - git diff-tree --root -r initial ok 22 - check with no whitespace errors (diff-index) ok 9 - git diff-tree --root -r --abbrev initial ok 23 - check with trailing whitespace (diff-index) ok 10 - git diff-tree --root -r --abbrev=4 initial ok 24 - check with space before tab in indent (diff-index) ok 11 - git diff-tree -p initial ok 25 - check staged with no whitespace errors (diff-index) ok 12 - git diff-tree --root -p initial ok 26 - check staged with trailing whitespace (diff-index) ok 13 - git diff-tree --patch-with-stat initial ok 27 - check staged with space before tab in indent (diff-index) ok 4 - format-patch result applies ok 1 - setup ok 15 - drop -q is quiet ok 14 - git diff-tree --root --patch-with-stat initial ok 2 - git diff --quiet -w HEAD^^ HEAD^ ok 28 - check with no whitespace errors (diff-tree) ok 3 - git diff --quiet HEAD^^ HEAD^ ok 15 - git diff-tree --patch-with-raw initial ok 4 - git diff --quiet -w HEAD^ HEAD ok 29 - check with trailing whitespace (diff-tree) ok 5 - git diff-tree HEAD^ HEAD ok 16 - git diff-tree --root --patch-with-raw initial ok 6 - git diff-tree HEAD^ HEAD -- a ok 7 - git diff-tree HEAD^ HEAD -- b ok 30 - check with space before tab in indent (diff-tree) ok 17 - git diff-tree --pretty initial ok 8 - echo HEAD | git diff-tree --stdin ok 31 - check trailing whitespace (trailing-space: off) ok 9 - git diff-tree HEAD HEAD ok 18 - git diff-tree --pretty --root initial ok 10 - git diff-files ok 11 - git diff-index --cached HEAD ok 32 - check trailing whitespace (trailing-space: on) ok 19 - git diff-tree --pretty -p initial ok 12 - git diff-index --cached HEAD^ ok 33 - check space before tab in indent (space-before-tab: off) ok 20 - git diff-tree --pretty --stat initial ok 13 - git diff-index --cached HEAD^ ok 34 - check space before tab in indent (space-before-tab: on) ok 21 - git diff-tree --pretty --summary initial ok 14 - git diff-tree -Stext HEAD^ HEAD -- b ok 35 - check spaces as indentation (indent-with-non-tab: off) ok 16 - stash -k ok 15 - git diff-tree -Snot-found HEAD^ HEAD -- b ok 22 - git diff-tree --pretty --stat --summary initial ok 16 - git diff-files ok 36 - check spaces as indentation (indent-with-non-tab: on) ok 23 - git diff-tree --pretty --root -p initial ok 17 - git diff-index --cached HEAD ok 37 - check tabs and spaces as indentation (indent-with-non-tab: on) ok 18 - --check --exit-code returns 0 for no difference ok 38 - check tabs as indentation (tab-in-indent: off) ok 24 - git diff-tree --pretty --root --stat initial ok 19 - --check --exit-code returns 1 for a clean difference ok 20 - --check --exit-code returns 3 for a dirty difference ok 39 - check tabs as indentation (tab-in-indent: on) ok 21 - --check with --no-pager returns 2 for dirty difference ok 25 - git diff-tree --pretty --root --summary initial ok 22 - check should test not just the last line ok 5 - format-patch --ignore-if-in-upstream result applies ok 40 - check tabs and spaces as indentation (tab-in-indent: on) ok 6 - commit did not screw up the log message ok 26 - git diff-tree --pretty --root --summary -r initial ok 7 - format-patch did not screw up the log message ok 41 - check tab-in-indent and indent-with-non-tab conflict ok 35 - aborted --continue does not squash commits after "edit" ok 8 - replay did not screw up the log message ok 27 - git diff-tree --pretty --root --stat --summary initial ok 42 - check tab-in-indent excluded from wildcard whitespace attribute ok 28 - git diff-tree --pretty --patch-with-stat initial ok 43 - line numbers in --check output are correct ok 44 - checkdiff detects new trailing blank lines (1) ok 9 - extra headers ok 29 - git diff-tree --pretty --root --patch-with-stat initial ok 45 - checkdiff detects new trailing blank lines (2) ok 23 - check detects leftover conflict markers ok 30 - git diff-tree --pretty --patch-with-raw initial ok 10 - extra headers without newlines ok 46 - checkdiff allows new blank lines ok 31 - git diff-tree --pretty --root --patch-with-raw initial ok 32 - git diff-tree --pretty=oneline initial ok 11 - extra headers with multiple To:s ok 33 - git diff-tree --pretty=oneline --root initial ok 47 - whitespace-only changes not reported ok 17 - stash --invalid-option ok 24 - check honors conflict marker length # passed all 24 test(s) 1..24 ok 12 - additional command line cc ok 34 - git diff-tree --pretty=oneline -p initial ok 13 - command line headers ok 35 - git diff-tree --pretty=oneline --root -p initial *** t4018-diff-funcname.sh *** ok 36 - git diff-tree --pretty=oneline --patch-with-stat initial ok 14 - configuration headers and command line headers ok 48 - whitespace-only changes reported across renames ok 37 - git diff-tree --pretty=oneline --root --patch-with-stat initial ok 15 - command line To: header ok 38 - git diff-tree --pretty=oneline --patch-with-raw initial ok 16 - configuration To: header ok 1 - builtin bibtex pattern compiles ok 39 - git diff-tree --pretty=oneline --root --patch-with-raw initial ok 2 - builtin bibtex wordRegex pattern compiles ok 49 - rename empty ok 17 - --no-to overrides config.to ok 3 - builtin cpp pattern compiles ok 40 - git diff-tree --pretty side ok 4 - builtin cpp wordRegex pattern compiles ok 5 - builtin csharp pattern compiles ok 18 - --no-to and --to replaces config.to ok 41 - git diff-tree --pretty -p side ok 6 - builtin csharp wordRegex pattern compiles ok 7 - builtin fortran pattern compiles ok 19 - --no-cc overrides config.cc ok 42 - git diff-tree --pretty --patch-with-stat side ok 8 - builtin fortran wordRegex pattern compiles ok 9 - builtin html pattern compiles ok 20 - --no-add-headers overrides config.headers ok 43 - git diff-tree master ok 10 - builtin html wordRegex pattern compiles ok 11 - builtin java pattern compiles ok 50 - combined diff with autocrlf conversion ok 44 - git diff-tree -p master ok 12 - builtin java wordRegex pattern compiles ok 21 - multiple files ok 13 - builtin objc pattern compiles ok 14 - builtin objc wordRegex pattern compiles ok 45 - git diff-tree -p -m master ok 15 - builtin pascal pattern compiles ok 16 - builtin pascal wordRegex pattern compiles ok 22 - no threading ok 46 - git diff-tree -c master ok 18 - stash an added file ok 17 - builtin php pattern compiles ok 18 - builtin php wordRegex pattern compiles ok 47 - git diff-tree -c --abbrev master ok 23 - thread ok 19 - builtin python pattern compiles ok 51 - setup diff colors ok 20 - builtin python wordRegex pattern compiles ok 48 - git diff-tree --cc master ok 24 - thread in-reply-to ok 21 - builtin ruby pattern compiles ok 22 - builtin ruby wordRegex pattern compiles ok 49 - git diff-tree -c --stat master ok 23 - builtin tex pattern compiles ok 25 - thread cover-letter ok 24 - builtin tex wordRegex pattern compiles ok 52 - diff that introduces a line with only tabs # passed all 52 test(s) 1..52 ok 36 - auto-amend only edited commits after "edit" ok 50 - git diff-tree --cc --stat master ok 25 - default behaviour ok 26 - thread cover-letter in-reply-to ok 26 - preset java pattern ok 51 - git diff-tree -c --stat --summary master ok 27 - thread explicit shallow *** t4019-diff-wserror.sh *** ok 27 - custom pattern ok 52 - git diff-tree --cc --stat --summary master ok 28 - last regexp must not be negated ok 28 - thread deep ok 53 - git diff-tree -c --stat --summary side ok 29 - pattern which matches to end of line ok 29 - thread deep in-reply-to ok 30 - alternation in pattern # passed all 30 test(s) ok 54 - git diff-tree --cc --stat --summary side 1..30 ok 30 - thread deep cover-letter *** t4020-diff-external.sh *** ok 55 - git diff-tree --cc --patch-with-stat master ok 1 - setup ok 31 - thread deep cover-letter in-reply-to ok 56 - git diff-tree --cc --patch-with-stat --summary master ok 2 - default ok 57 - git diff-tree --cc --patch-with-stat --summary side ok 32 - thread via config ok 58 - git log master ok 33 - thread deep via config ok 3 - without -trail ok 19 - stash rm then recreate ok 59 - git log -p master ok 34 - thread config + override ok 1 - setup ok 60 - git log --root master ok 4 - without -trail (attribute) ok 2 - GIT_EXTERNAL_DIFF environment ok 35 - thread config + --no-thread ok 3 - GIT_EXTERNAL_DIFF environment should apply only to diff ok 61 - git log --root -p master ok 4 - GIT_EXTERNAL_DIFF environment and --no-ext-diff ok 5 - without -space ok 62 - git log --patch-with-stat master ok 5 - diff attribute ok 36 - excessive subject ok 6 - diff attribute should apply only to diff ok 6 - without -space (attribute) ok 63 - git log --root --patch-with-stat master ok 7 - diff attribute and --no-ext-diff ok 64 - git log --root --patch-with-stat --summary master ok 7 - with indent-non-tab only ok 8 - diff attribute ok 37 - cover-letter inherits diff options ok 9 - diff attribute should apply only to diff ok 65 - git log --root -c --patch-with-stat --summary master ok 37 - rebase a detached HEAD ok 10 - diff attribute and --no-ext-diff ok 38 - shortlog of cover-letter wraps overly-long onelines ok 11 - no diff with -diff ok 8 - with indent-non-tab only (attribute) ok 66 - git log --root --cc --patch-with-stat --summary master ok 12 - force diff with "diff" ok 39 - format-patch respects -U ok 40 - format-patch -p suppresses stat ok 67 - git log -p --first-parent master ok 9 - with cr-at-eol ok 41 - format-patch from a subdirectory (1) ok 13 - GIT_EXTERNAL_DIFF with more than one changed files ok 68 - git log -m -p --first-parent master ok 42 - format-patch from a subdirectory (2) ok 20 - stash rm and ignore ok 10 - with cr-at-eol (attribute) ok 14 - GIT_EXTERNAL_DIFF generates pretty paths ok 69 - git log -m -p master ok 11 - trailing empty lines (1) ok 43 - format-patch from a subdirectory (3) ok 12 - trailing empty lines (2) ok 70 - git log -SF master ok 44 - format-patch --in-reply-to ok 13 - checkdiff shows correct line number for trailing blank lines ok 15 - external diff with autocrlf = true ok 45 - format-patch --signoff ok 71 - git log -S F master ok 72 - git log -SF -p master ok 16 - diff --cached ok 14 - do not color trailing cr in context # passed all 16 test(s) 1..16 ok 46 - options no longer allowed for format-patch ok 73 - git log --decorate --all ok 15 - color new trailing blank lines ok 47 - format-patch --numstat should produce a patch *** t4021-format-patch-numbered.sh *** # passed all 15 test(s) 1..15 ok 74 - git log --decorate=full --all ok 48 - format-patch -- *** t4022-diff-rewrite.sh *** ok 49 - format-patch --ignore-if-in-upstream HEAD ok 75 - git rev-list --parents HEAD ok 50 - format-patch --signature ok 76 - git rev-list --children HEAD ok 51 - format-patch with format.signature config ok 77 - git whatchanged master ok 1 - setup ok 52 - format-patch --signature overrides format.signature ok 38 - rebase a commit violating pre-commit ok 78 - git whatchanged -p master ok 2 - detect rewrite # passed all 2 test(s) 1..2 ok 1 - setup ok 53 - format-patch --no-signature ignores format.signature ok 79 - git whatchanged --root master *** t4023-diff-rename-typechange.sh *** ok 2 - single patch defaults to no numbers ok 3 - multiple patch defaults to numbered ok 54 - format-patch --signature --cover-letter ok 80 - git whatchanged --root -p master ok 21 - stash rm and ignore (stage .gitignore) ok 4 - Use --numbered ok 55 - format.signature="" supresses signatures ok 81 - git whatchanged --patch-with-stat master ok 5 - format.numbered = true ok 56 - format-patch --no-signature supresses signatures ok 6 - format.numbered && single patch ok 82 - git whatchanged --root --patch-with-stat master ok 57 - format-patch --signature="" supresses signatures # passed all 57 test(s) 1..57 ok 7 - format.numbered && --no-numbered ok 8 - format.numbered && --keep-subject ok 83 - git whatchanged --root --patch-with-stat --summary master *** t4024-diff-optimize-common.sh *** ok 9 - format.numbered = auto ok 84 - git whatchanged --root -c --patch-with-stat --summary master ok 10 - format.numbered = auto && single patch ok 11 - format.numbered = auto && --no-numbered ok 85 - git whatchanged --root --cc --patch-with-stat --summary master ok 12 - --start-number && --numbered # passed all 12 test(s) 1..12 ok 86 - git whatchanged -SF master *** t4025-hunk-header.sh *** ok 87 - git whatchanged -SF -p master ok 88 - git log --patch-with-stat master -- dir/ ok 89 - git whatchanged --patch-with-stat master -- dir/ ok 1 - setup ok 90 - git log --patch-with-stat --summary master -- dir/ ok 22 - stash file to symlink ok 2 - hunk header truncation with an overly long line # passed all 2 test(s) 1..2 ok 91 - git whatchanged --patch-with-stat --summary master -- dir/ *** t4026-color.sh *** ok 1 - setup ok 92 - git show initial ok 2 - cross renames to be detected for regular files ok 1 - setup ok 93 - git show --root initial ok 3 - cross renames to be detected for typechange ok 4 - moves and renames ok 94 - git show side # passed all 4 test(s) 1..4 ok 1 - reset ok 2 - attribute before color name ok 95 - git show master *** t4027-diff-submodule.sh *** ok 3 - color name before attribute ok 2 - diff -U0 # passed all 2 test(s) 1..2 ok 4 - attr fg bg ok 96 - git show -c master ok 5 - fg attr bg ok 39 - rebase with a file named HEAD in worktree ok 6 - fg bg attr *** t4028-format-patch-mime-headers.sh *** ok 7 - fg bg attr... ok 97 - git show -m master ok 8 - long color specification ok 9 - 256 colors ok 98 - git show --first-parent master ok 10 - color too small ok 11 - color too big ok 12 - extra character after color number ok 99 - git show --stat side ok 13 - extra character after color name ok 14 - extra character after attribute ok 100 - git show --stat --summary side ok 15 - unknown color slots are ignored (diff) ok 101 - git show --patch-with-stat side ok 1 - create commit with utf-8 body ok 16 - unknown color slots are ignored (branch) ok 2 - patch has mime headers ok 102 - git show --patch-with-raw side ok 1 - setup ok 17 - unknown color slots are ignored (status) # passed all 17 test(s) 1..17 ok 23 - stash file to symlink (stage rm) ok 2 - git diff --raw HEAD ok 103 - git show --patch-with-stat --summary side ok 3 - patch has mime and extra headers # passed all 3 test(s) 1..3 ok 3 - git diff-index --raw HEAD *** t4029-diff-trailing-space.sh *** ok 4 - git diff-files --raw ok 104 - git format-patch --stdout initial..side *** t4030-diff-textconv.sh *** ok 5 - git diff HEAD ok 105 - git format-patch --stdout initial..master^ ok 6 - git diff HEAD with dirty submodule (work tree) ok 106 - git format-patch --stdout initial..master ok 107 - git format-patch --stdout --no-numbered initial..master ok 7 - git diff HEAD with dirty submodule (index) ok 108 - git format-patch --stdout --numbered initial..master ok 8 - git diff HEAD with dirty submodule (untracked) ok 109 - git format-patch --attach --stdout initial..side ok 1 - setup binary file with history ok 1 - diff honors config option, diff.suppressBlankEmpty # passed all 1 test(s) ok 2 - file is considered binary by porcelain 1..1 ok 110 - git format-patch --attach --stdout --suffix=.diff initial..side ok 3 - file is considered binary by plumbing *** t4031-diff-rewrite-binary.sh *** ok 111 - git format-patch --attach --stdout initial..master^ ok 4 - setup textconv filters ok 9 - git diff HEAD with dirty submodule (work tree, refs match) ok 112 - git format-patch --attach --stdout initial..master ok 113 - git format-patch --inline --stdout initial..side ok 5 - diff produces text ok 6 - diff-tree produces binary ok 114 - git format-patch --inline --stdout initial..master^ ok 1 - create binary file with changes ok 24 - stash file to symlink (full stage) ok 2 - vanilla diff is binary ok 115 - git format-patch --inline --stdout --numbered-files initial..master ok 3 - rewrite diff is binary ok 7 - log produces text ok 116 - git format-patch --inline --stdout initial..master ok 4 - rewrite diff can show binary patch ok 8 - format-patch produces binary ok 5 - setup textconv ok 117 - git format-patch --inline --stdout --subject-prefix=TESTCASE initial..master ok 118 - git config format.subjectprefix DIFFERENT_PREFIX ok 10 - git diff HEAD with dirty submodule (work tree, refs match) [.git/config] ok 119 - git format-patch --inline --stdout initial..master^^ ok 9 - status -v produces text ok 6 - rewrite diff respects textconv # passed all 6 test(s) 1..6 ok 40 - do "noop" when there is nothing to cherry-pick ok 10 - diffstat does not run textconv ok 120 - git format-patch --stdout --cover-letter -n initial..master^ *** t4032-diff-inter-hunk-context.sh *** ok 121 - git diff --abbrev initial..side ok 122 - git diff -r initial..side ok 11 - textconv does not act on symlinks # passed all 11 test(s) 1..11 ok 123 - git diff --stat initial..side ok 124 - git diff -r --stat initial..side *** t4033-diff-patience.sh *** ok 41 - submodule rebase setup ok 125 - git diff initial..side ok 1 - diff -U0, 1 common line: count hunks (2) ok 2 - diff -U0, 1 common line: check output ok 126 - git diff --patch-with-stat initial..side ok 3 - diff -U0 --inter-hunk-context=0, 1 common line: count hunks (2) ok 4 - diff -U0 --inter-hunk-context=0, 1 common line: check output ok 127 - git diff --patch-with-raw initial..side ok 11 - git diff HEAD with dirty submodule (work tree, refs match) [.gitmodules] ok 5 - diff -U0 --inter-hunk-context=1, 1 common line: count hunks (1) ok 1 - patience diff ok 25 - stash symlink to file ok 128 - git diff --patch-with-stat -r initial..side ok 6 - diff -U0 --inter-hunk-context=1, 1 common line: check output ok 7 - diff -U0 --inter-hunk-context=2, 1 common line: count hunks (1) ok 2 - patience diff output is valid ok 12 - git diff HEAD with dirty submodule (index, refs match) ok 129 - git diff --patch-with-raw -r initial..side ok 8 - diff -U0 --inter-hunk-context=2, 1 common line: check output ok 3 - completely different files # passed all 3 test(s) 1..3 ok 9 - diff -U1, 1 common line: count hunks (1) ok 130 - git diff --name-status dir2 dir *** t4034-diff-words.sh *** ok 131 - git diff --no-index --name-status dir2 dir ok 132 - git diff --no-index --name-status -- dir2 dir ok 10 - diff -U0, 2 common lines: count hunks (2) ok 11 - diff -U0 --inter-hunk-context=0, 2 common lines: count hunks (2) ok 133 - git diff --no-index dir dir3 ok 13 - git diff HEAD with dirty submodule (untracked, refs match) ok 12 - diff -U0 --inter-hunk-context=1, 2 common lines: count hunks (2) ok 13 - diff -U0 --inter-hunk-context=2, 2 common lines: count hunks (1) ok 134 - git diff master master^ side ok 14 - diff -U1, 2 common lines: count hunks (1) ok 1 - setup ok 135 - git diff --dirstat master~1 master~2 ok 136 - log -S requires an argument # passed all 136 test(s) 1..136 ok 2 - word diff with runs of whitespace ok 3 - --word-diff=color ok 15 - diff -U1, 3 common lines: count hunks (2) *** t4035-diff-quiet.sh *** ok 4 - --color --word-diff=color ok 16 - diff -U1 --inter-hunk-context=0, 3 common lines: count hunks (2) ok 14 - git diff HEAD with dirty submodule (untracked, refs match) [.git/config] ok 17 - diff -U1 --inter-hunk-context=1, 3 common lines: count hunks (1) ok 5 - --word-diff=porcelain ok 18 - diff -U1 --inter-hunk-context=2, 3 common lines: count hunks (1) ok 6 - --word-diff=plain ok 7 - --word-diff=plain --no-color ok 8 - --word-diff=plain --color ok 26 - stash symlink to file (stage rm) ok 9 - word diff without context ok 1 - setup ok 19 - diff -U3, 9 common lines: count hunks (2) ok 10 - word diff with a regular expression ok 2 - git diff-tree HEAD^ HEAD ok 20 - diff -U3 --inter-hunk-context=2, 9 common lines: count hunks (2) ok 11 - set a diff driver ok 3 - git diff-tree HEAD^ HEAD -- a ok 21 - diff -U3 --inter-hunk-context=3, 9 common lines: count hunks (1) # passed all 21 test(s) 1..21 ok 12 - option overrides .gitattributes ok 42 - submodule rebase -i ok 15 - git diff HEAD with dirty submodule (untracked, refs match) [.gitmodules] ok 4 - git diff-tree HEAD^ HEAD -- b ok 13 - use regex supplied by driver ok 5 - echo HEAD | git diff-tree --stdin *** t4036-format-patch-signer-mime.sh *** ok 14 - set diff.wordRegex option ok 6 - git diff-tree HEAD HEAD ok 15 - command-line overrides config ok 7 - git diff-files ok 16 - git diff between submodule commits ok 8 - git diff-index --cached HEAD ok 16 - command-line overrides config: --word-diff-regex ok 9 - git diff-index --cached HEAD^ ok 17 - .gitattributes override config ok 18 - remove diff driver regex ok 10 - git diff-index --cached HEAD^ ok 19 - use configured regex ok 1 - setup ok 11 - git diff-tree -Stext HEAD^ HEAD -- b ok 20 - test parsing words for newline ok 2 - format normally ok 12 - git diff-tree -Snot-found HEAD^ HEAD -- b ok 17 - git diff between submodule commits [.git/config] ok 13 - git diff-files ok 21 - test when words are only removed at the end ok 3 - format with signoff without funny signer name ok 22 - --word-diff=none ok 4 - format with non ASCII signer name # passed all 22 test(s) 1..22 ok 14 - git diff-index --cached HEAD # passed all 14 test(s) 1..14 ok 5 - attach and signoff do not duplicate mime headers # passed all 5 test(s) 1..5 *** t4037-diff-r-t-dirs.sh *** *** t4038-diff-combined.sh *** *** t4039-diff-assume-unchanged.sh *** ok 27 - stash symlink to file (full stage) ok 18 - git diff between submodule commits [.gitmodules] ok 19 - git diff (empty submodule dir) ok 43 - avoid unnecessary reset ok 20 - conflicted submodule setup ok 21 - combined (empty submodule) ok 1 - setup ok 1 - setup ok 2 - verify # passed all 2 test(s) 1..2 ok 2 - diff-index does not examine assume-unchanged entries ok 3 - diff-files does not examine assume-unchanged entries # passed all 3 test(s) 1..3 *** t4040-whitespace-status.sh *** ok 22 - combined (with submodule) *** t4041-diff-submodule-option.sh *** # passed all 22 test(s) 1..22 *** t4042-diff-textconv-caching.sh *** ok 1 - setup ok 2 - diff-tree --exit-code ok 3 - diff-tree -b --exit-code ok 1 - setup ok 1 - setup not ok 28 - stash directory to file # TODO known breakage ok 4 - diff-index --cached --exit-code ok 1 - added submodule ok 5 - diff-index -b -p --cached --exit-code ok 2 - check combined output (1) ok 6 - diff-index --exit-code ok 2 - first textconv works ok 7 - diff-index -b -p --exit-code ok 3 - cached textconv produces same output ok 3 - check combined output (2) ok 8 - diff-files --exit-code ok 4 - cached textconv does not run helper ok 2 - modified submodule(forward) ok 9 - diff-files -b -p --exit-code # passed all 9 test(s) 1..9 ok 3 - modified submodule(forward) ok 4 - diagnose truncated file # passed all 4 test(s) 1..4 *** t4043-diff-rename-binary.sh *** ok 4 - modified submodule(forward) --submodule *** t4044-diff-index-unique-abbrev.sh *** ok 5 - modified submodule(forward) --submodule=short ok 5 - changing textconv invalidates cache ok 6 - modified submodule(backward) ok 1 - prepare repository ok 6 - switching diff driver produces correct results # passed all 6 test(s) 1..6 ok 2 - move the files into a "sub" directory *** t4045-diff-relative.sh *** not ok 29 - stash file to directory # TODO known breakage ok 3 - git show -C -C report renames # passed all 3 test(s) 1..3 ok 1 - setup ok 2 - diff does not produce ambiguous index line # passed all 2 test(s) 1..2 *** t4100-apply-stat.sh *** ok 7 - modified submodule(backward and forward) *** t4101-apply-nonl.sh *** ok 1 - setup ok 8 - typechanged submodule(submodule->blob), --cached ok 2 - -p --relative=subdir/ ok 9 - typechanged submodule(submodule->blob) ok 3 - -p --relative=subdir ok 1 - rename ok 4 - -p --relative=sub ok 1 - apply diff between 0 and 1 ok 2 - rename with recount ok 10 - typechanged submodule(submodule->blob) ok 5 - --stat --relative=subdir/ ok 3 - copy ok 2 - apply diff between 0 and 2 ok 4 - copy with recount ok 3 - apply diff between 0 and 3 ok 6 - --stat --relative=subdir ok 5 - rewrite ok 4 - apply diff between 1 and 0 ok 7 - --stat --relative=sub ok 6 - rewrite with recount ok 5 - apply diff between 1 and 2 ok 8 - --raw --relative=subdir/ ok 7 - mode ok 6 - apply diff between 1 and 3 ok 8 - mode with recount ok 9 - --raw --relative=subdir ok 9 - non git (1) ok 7 - apply diff between 2 and 0 ok 10 - --raw --relative=sub # passed all 10 test(s) 1..10 ok 10 - non git (1) with recount ok 8 - apply diff between 2 and 1 ok 11 - non git (2) ok 11 - nonexistent commit *** t4102-apply-rename.sh *** ok 9 - apply diff between 2 and 3 ok 12 - non git (2) with recount ok 10 - apply diff between 3 and 0 ok 13 - non git (3) ok 12 - typechanged submodule(blob->submodule) ok 14 - non git (3) with recount ok 11 - apply diff between 3 and 1 ok 15 - incomplete (1) ok 12 - apply diff between 3 and 2 # passed all 12 test(s) 1..12 ok 13 - submodule is up to date ok 16 - incomplete (1) with recount ok 17 - incomplete (2) *** t4103-apply-binary.sh *** ok 14 - submodule contains untracked content ok 18 - incomplete (2) with recount # passed all 18 test(s) 1..18 ok 1 - setup ok 15 - submodule contains untracked content (untracked ignored) ok 2 - apply ok 3 - validate ok 16 - submodule contains untracked content (dirty ignored) *** t4104-apply-boundary.sh *** ok 4 - apply reverse ok 17 - submodule contains untracked content (all ignored) ok 30 - stash branch - no stashes on stack, stash-like argument ok 5 - apply copy # passed all 5 test(s) 1..5 ok 18 - submodule contains untracked and modifed content *** t4105-apply-fuzz.sh *** ok 19 - submodule contains untracked and modifed content (untracked ignored) ok 20 - submodule contains untracked and modifed content (dirty ignored) ok 21 - submodule contains untracked and modifed content (all ignored) ok 22 - submodule contains modifed content ok 23 - submodule is modified ok 1 - setup ok 24 - modified submodule contains untracked content ok 2 - unmodified patch ok 25 - modified submodule contains untracked content (untracked ignored) ok 26 - modified submodule contains untracked content (dirty ignored) ok 3 - minus offset ok 27 - modified submodule contains untracked content (all ignored) ok 4 - plus offset ok 28 - modified submodule contains untracked and modifed content ok 1 - setup ok 5 - big offset ok 29 - modified submodule contains untracked and modifed content (untracked ignored) ok 1 - setup ok 2 - apply add-a-patch with context ok 6 - fuzz with no offset ok 30 - modified submodule contains untracked and modifed content (dirty ignored) ok 31 - modified submodule contains untracked and modifed content (all ignored) ok 2 - stat binary diff -- should not fail. ok 7 - fuzz with minus offset ok 3 - apply add-z-patch with context ok 32 - modified submodule contains modifed content ok 3 - stat binary diff (copy) -- should not fail. ok 8 - fuzz with plus offset ok 4 - apply insert-a-patch with context ok 4 - check binary diff -- should fail. ok 33 - deleted submodule ok 9 - fuzz with big offset # passed all 9 test(s) 1..9 ok 5 - apply mod-a-patch with context ok 5 - check binary diff (copy) -- should fail. *** t4106-apply-stdin.sh *** ok 6 - apply mod-z-patch with context ok 6 - check incomplete binary diff with replacement -- should fail. ok 7 - check incomplete binary diff with replacement (copy) -- should fail. ok 7 - apply del-a-patch with context ok 8 - check binary diff with replacement. ok 8 - apply del-z-patch with context ok 9 - check binary diff with replacement (copy). ok 34 - multiple submodules ok 1 - setup ok 9 - apply add-a-patch without context ok 35 - path filter ok 2 - git apply --numstat - < patch ok 10 - apply binary diff -- should fail. ok 10 - apply add-z-patch without context ok 3 - git apply --numstat - < patch patch # passed all 3 test(s) 1..3 ok 36 - given commit *** t4107-apply-ignore-whitespace.sh *** ok 11 - apply insert-a-patch without context ok 11 - apply binary diff -- should fail. ok 37 - given commit --submodule ok 12 - apply mod-a-patch without context ok 12 - apply binary diff (copy) -- should fail. ok 38 - given commit --submodule=short ok 13 - apply mod-z-patch without context ok 39 - setup .git file for sm2 ok 14 - apply del-a-patch without context ok 40 - diff --submodule with .git file # passed all 40 test(s) 1..40 ok 13 - apply binary diff (copy) -- should fail. ok 15 - apply del-z-patch without context ok 1 - file creation ok 2 - patch2 fails (retab) ok 31 - stash branch - stashes on stack, stash-like argument *** t4109-apply-multifrag.sh *** ok 14 - apply binary diff with full-index ok 3 - patch2 applies with --ignore-whitespace ok 16 - apply non-git add-a-patch without context ok 4 - patch2 reverse applies with --ignore-space-change ok 5 - patch2 applies (apply.ignorewhitespace = change) ok 15 - apply binary diff with full-index (copy) ok 6 - patch3 fails (missing string at EOL) ok 17 - apply non-git add-z-patch without context ok 7 - patch4 fails (missing EOL at EOF) ok 8 - patch5 applies (leading whitespace) ok 9 - patches do not mangle whitespace ok 16 - apply full-index binary diff in new repo ok 18 - apply non-git insert-a-patch without context ok 10 - re-create file (with --ignore-whitespace) ok 11 - patch5 fails (--no-ignore-whitespace) ok 1 - git apply (1) # passed all 11 test(s) 1..11 ok 2 - git apply (2) ok 19 - apply non-git mod-a-patch without context ok 17 - apply binary diff without replacement. *** t4110-apply-scan.sh *** ok 3 - git apply (3) # passed all 3 test(s) 1..3 ok 20 - apply non-git mod-z-patch without context ok 18 - apply binary diff without replacement (copy). *** t4111-apply-subdir.sh *** ok 21 - apply non-git del-a-patch without context ok 44 - reword ok 1 - git apply scan # passed all 1 test(s) 1..1 ok 22 - apply non-git del-z-patch without context ok 19 - apply binary diff. *** t4112-apply-renames.sh *** ok 1 - setup ok 2 - setup: subdir ok 23 - two lines ok 20 - apply binary diff (copy). # passed all 20 test(s) 1..20 ok 24 - apply patch with 3 context lines matching at end # passed all 24 test(s) 1..24 *** t4113-apply-ending.sh *** *** t4114-apply-typechange.sh *** ok 3 - apply from subdir of toplevel ok 1 - check rename/copy patch ok 2 - apply rename/copy patch # passed all 2 test(s) 1..2 *** t4115-apply-symlink.sh *** ok 1 - setup ok 2 - apply at the end ok 3 - apply at the beginning # passed all 3 test(s) 1..3 ok 4 - apply --cached from subdir of toplevel *** t4116-apply-reverse.sh *** ok 1 - setup ok 2 - apply symlink patch ok 32 - stash show - stashes on stack, stash-like argument ok 1 - setup ok 3 - apply --index symlink patch # passed all 3 test(s) 1..3 ok 1 - setup repository and commits *** t4117-apply-reject.sh *** ok 2 - apply in forward ok 2 - file renamed from foo to foo/baz ok 45 - rebase -i can copy notes ok 5 - apply --index from subdir of toplevel ok 3 - apply in reverse ok 6 - apply from .git dir ok 3 - file renamed from foo/baz to foo ok 7 - apply from subdir of .git dir ok 4 - directory becomes file ok 4 - setup separate repository lacking postimage ok 5 - file becomes directory ok 1 - setup ok 5 - apply in forward without postimage ok 6 - file becomes symlink ok 2 - apply without --reject should fail ok 8 - apply --cached from .git dir ok 3 - apply without --reject should fail ok 6 - apply in reverse without postimage ok 7 - symlink becomes file ok 4 - apply with --reject should fail but update the file ok 7 - reversing a whitespace introduction # passed all 7 test(s) 1..7 ok 5 - apply with --reject should fail but update the file ok 8 - binary file becomes symlink ok 6 - the same test with --verbose *** t4118-apply-empty-context.sh *** ok 9 - symlink becomes binary file ok 7 - apply cleanly with --verbose # passed all 7 test(s) 1..7 ok 9 - apply --cached from subdir of .git dir # passed all 9 test(s) 1..9 *** t4119-apply-config.sh *** ok 10 - symlink becomes directory *** t4120-apply-popt.sh *** ok 11 - directory becomes symlink # passed all 11 test(s) 1..11 ok 1 - setup ok 2 - apply --numstat *** t4121-apply-diffs.sh *** ok 1 - setup ok 3 - apply --apply # passed all 3 test(s) 1..3 *** t4122-apply-symlink-inside.sh *** ok 2 - apply --whitespace=strip ok 1 - setup ok 2 - apply git diff with -p2 ok 46 - rebase -i can copy notes over a fixup ok 3 - apply --whitespace=strip from config ok 3 - apply with too large -p ok 4 - apply (-p2) traditional diff with funny filenames ok 33 - stash show -p - stashes on stack, stash-like argument ok 5 - apply with too large -p and fancy filename ok 4 - apply --whitespace=strip in subdir ok 6 - apply (-p2) diff, mode change only ok 1 - setup ok 7 - apply (-p2) diff, rename # passed all 7 test(s) 1..7 ok 5 - apply --whitespace=strip from config in subdir ok 2 - check if contextually independent diffs for the same file apply # passed all 2 test(s) 1..2 *** t4123-apply-shrink.sh *** *** t4124-apply-ws-rule.sh *** ok 1 - setup ok 6 - same in subdir but with traditional patch input ok 2 - apply ok 7 - same but with traditional patch input of depth 1 ok 8 - same but with traditional patch input of depth 2 ok 1 - setup ok 1 - setup ok 3 - check result ok 2 - whitespace=nowarn, default rule ok 2 - apply should fail gracefully # passed all 3 test(s) 1..3 # passed all 2 test(s) 1..2 ok 3 - whitespace=warn, default rule ok 4 - whitespace=error-all, default rule ok 9 - same but with traditional patch input of depth 1 *** t4125-apply-ws-fuzz.sh *** *** t4126-apply-empty.sh *** ok 5 - whitespace=error-all, no rule ok 10 - same but with traditional patch input of depth 2 ok 6 - whitespace=error-all, no rule (attribute) # passed all 10 test(s) 1..10 *** t4127-apply-same-fn.sh *** ok 34 - stash show - no stashes on stack, stash-like argument ok 7 - rule=-trailing,-space,-indent,-tab ok 8 - rule=-trailing,-space,-indent,-tab (attributes) ok 1 - setup ok 1 - setup ok 2 - apply empty ok 9 - rule=-trailing,-space,-indent,tab ok 1 - setup ok 47 - rebase while detaching HEAD ok 2 - nofix ok 3 - apply --index empty ok 10 - rule=-trailing,-space,-indent,tab (attributes) ok 3 - withfix (forward) ok 4 - apply create ok 2 - apply same filename with independent changes ok 5 - apply --index create ok 11 - rule=-trailing,-space,indent,-tab # passed all 5 test(s) 1..5 ok 4 - withfix (backward) # passed all 4 test(s) 1..4 *** t4128-apply-root.sh *** *** t4129-apply-samemode.sh *** ok 12 - rule=-trailing,-space,indent,-tab (attributes) ok 3 - apply same filename with overlapping changes ok 13 - rule=-trailing,space,-indent,-tab ok 14 - rule=-trailing,space,-indent,-tab (attributes) ok 35 - stash show -p - no stashes on stack, stash-like argument ok 1 - setup ok 2 - apply --directory -p (1) ok 1 - setup ok 4 - apply same new filename after rename ok 15 - rule=-trailing,space,-indent,tab ok 2 - same mode (no index) ok 3 - apply --directory -p (2) ok 16 - rule=-trailing,space,-indent,tab (attributes) ok 4 - apply --directory (new file) ok 3 - same mode (with index) ok 5 - apply same old filename after rename -- should fail. ok 17 - rule=-trailing,space,indent,-tab ok 5 - apply --directory -p (new file) ok 4 - same mode (index only) ok 18 - rule=-trailing,space,indent,-tab (attributes) ok 5 - mode update (no index) ok 6 - apply --directory (delete file) ok 6 - mode update (with index) ok 19 - rule=trailing,-space,-indent,-tab ok 7 - apply --directory (quoted filename) # passed all 7 test(s) 1..7 ok 7 - mode update (index only) # passed all 7 test(s) 1..7 *** t4130-apply-criss-cross-rename.sh *** ok 20 - rule=trailing,-space,-indent,-tab (attributes) *** t4131-apply-fake-ancestor.sh *** ok 6 - apply A->B (rename), C->A (rename), A->A -- should pass. # passed all 6 test(s) 1..6 *** t4132-apply-removal.sh *** ok 21 - rule=trailing,-space,-indent,tab ok 22 - rule=trailing,-space,-indent,tab (attributes) ok 1 - setup ok 2 - criss-cross rename ok 23 - rule=trailing,-space,indent,-tab ok 1 - setup ok 3 - diff -M -B ok 2 - test addEast.patch ok 4 - apply ok 24 - rule=trailing,-space,indent,-tab (attributes) ok 3 - test addGMT.patch ok 1 - setup ok 5 - criss-cross rename ok 4 - test addWest.patch ok 25 - rule=trailing,space,-indent,-tab ok 6 - diff -M -B ok 7 - apply # passed all 7 test(s) 1..7 ok 2 - apply --build-fake-ancestor ok 5 - test createEast.patch ok 26 - rule=trailing,space,-indent,-tab (attributes) *** t4133-apply-filenames.sh *** ok 6 - test createGMT.patch ok 27 - rule=trailing,space,-indent,tab ok 3 - apply --build-fake-ancestor in a subdirectory # passed all 3 test(s) 1..3 ok 7 - test createWest.patch ok 1 - setup *** t4134-apply-submodule.sh *** ok 28 - rule=trailing,space,-indent,tab (attributes) ok 8 - test emptyEast.patch ok 2 - apply diff with inconsistent filenames in headers # passed all 2 test(s) 1..2 ok 48 - always cherry-pick with --no-ff ok 9 - test emptyGMT.patch *** t4135-apply-weird-filenames.sh *** ok 29 - rule=trailing,space,indent,-tab ok 36 - stash drop - fail early if specified stash is not a stash reference ok 10 - test emptyWest.patch ok 1 - setup ok 11 - test removeEast.patch ok 30 - rule=trailing,space,indent,-tab (attributes) ok 2 - removing a submodule also removes all leading subdirectories # passed all 2 test(s) 1..2 ok 49 - set up commits with funny messages ok 31 - trailing whitespace & no newline at the end of file ok 12 - test removeGMT.patch *** t4150-am.sh *** ok 13 - test removeWest.patch ok 1 - setup ok 32 - blank at EOF with --whitespace=fix (1) ok 14 - test removeWest2.patch # passed all 14 test(s) 1..14 ok 2 - plain, git-style file creation patch *** t4151-am-abort.sh *** ok 1 - setup: messages ok 33 - blank at EOF with --whitespace=fix (2) ok 3 - plain, traditional patch ok 34 - blank at EOF with --whitespace=fix (3) ok 4 - plain, traditional file creation patch ok 35 - blank at end of hunk, not at EOF with --whitespace=fix ok 5 - with spaces, git-style file creation patch ok 36 - blank at EOF with --whitespace=warn ok 6 - with spaces, traditional patch ok 37 - blank at EOF with --whitespace=error ok 7 - with spaces, traditional file creation patch ok 50 - rebase-i history with funny messages # still have 1 known breakage(s) # passed all remaining 49 test(s) 1..50 ok 8 - with tab, git-style file creation patch ok 38 - blank but not empty at EOF ok 1 - setup ok 9 - with tab, traditional patch ok 2 - setup ok 39 - applying beyond EOF requires one non-blank context line *** t4200-rerere.sh *** ok 10 - with tab, traditional file creation patch ok 40 - tons of blanks at EOF should not apply ok 11 - with backslash, git-style file creation patch ok 41 - missing blank line at end with --whitespace=fix ok 12 - with backslash, traditional patch ok 13 - with backslash, traditional file creation patch ok 42 - two missing blank lines at end with --whitespace=fix ok 1 - setup ok 2 - nothing recorded without rerere ok 14 - with quote, git-style file creation patch ok 37 - stash pop - fail early if specified stash is not a stash reference ok 43 - missing blank line at end, insert before end, --whitespace=fix not ok 15 - with quote, traditional patch # TODO known breakage ok 3 - activate rerere, old style (conflicting merge) ok 3 - am applies patch correctly ok 2 - am stops at a patch that does not apply ok 16 - with quote, traditional file creation patch ok 44 - shrink file with tons of missing blanks at end of file ok 4 - rerere.enabled works, too ok 17 - whitespace-damaged traditional patch ok 45 - missing blanks at EOF must only match blank lines ok 5 - set up rr-cache ok 6 - rr-cache looks sane ok 7 - rerere diff ok 18 - traditional patch with colon in timezone ok 46 - missing blank line should match context line with spaces ok 8 - rerere status ok 19 - traditional, whitespace-damaged, colon in timezone # still have 1 known breakage(s) # passed all remaining 18 test(s) 1..19 ok 47 - same, but with the --ignore-space-option *** t4201-shortlog.sh *** ok 3 - am --skip continue after failed am ok 48 - same, but with CR-LF line endings && cr-at-eol set ok 4 - am applies patch e-mail not in a mbox ok 49 - same, but with CR-LF line endings && cr-at-eol unset # passed all 49 test(s) 1..49 ok 9 - first postimage wins *** t4202-log.sh *** ok 4 - am --abort goes back after failed am ok 10 - rerere updates postimage timestamp ok 11 - rerere clear ok 12 - set up for garbage collection tests ok 13 - gc preserves young or recently used records ok 1 - setup ok 14 - old records rest in peace ok 2 - default output format ok 3 - pretty format ok 4 - --abbrev ok 5 - output from user-defined format is re-wrapped ok 6 - shortlog wrapping ok 1 - setup ok 15 - setup: file2 added differently in two branches ok 7 - shortlog from non-git directory ok 5 - am applies patch e-mail not in a mbox with CRLF ok 6 - setup: new author and committer ok 2 - pretty ok 3 - pretty (tformat) ok 4 - pretty (shortcut) ok 5 - format ok 6 - format %w(12,1,2) ok 7 - format %w(,1,2) ok 8 - shortlog encoding # passed all 8 test(s) 1..8 ok 8 - oneline ok 16 - resolution was recorded properly *** t4203-mailmap.sh *** ok 9 - diff-filter=A ok 10 - diff-filter=M ok 11 - diff-filter=D ok 5 - am -3 stops at a patch that does not apply ok 12 - diff-filter=R ok 17 - rerere.autoupdate ok 13 - diff-filter=C ok 14 - git log --follow ok 15 - git log --no-walk sorts by commit time ok 18 - merge --rerere-autoupdate ok 16 - git show leaves list of commits as given ok 1 - setup ok 2 - No mailmap ok 17 - setup case sensitivity tests ok 18 - log --grep ok 3 - default .mailmap ok 19 - log --grep option parsing ok 4 - mailmap.file set ok 20 - log -i --grep ok 19 - merge --no-rerere-autoupdate ok 21 - log --grep -i ok 5 - mailmap.file override ok 22 - simple log --graph ok 6 - mailmap.file non-existant ok 38 - ref with non-existant reflog ok 7 - name entry after email entry ok 7 - am changes committer and keeps author ok 8 - name entry after email entry, case-insensitive ok 6 - am -3 --skip continue after failed am -3 ok 9 - No mailmap files, but configured ok 20 - set up an unresolved merge ok 23 - set up merge history ok 24 - log --graph with merge ok 25 - log --graph with full output ok 21 - explicit rerere ok 7 - am --abort goes back after failed am -3 # passed all 7 test(s) 1..7 ok 10 - Shortlog output (complex mapping) *** t4204-patch-id.sh *** ok 22 - explicit rerere with autoupdate ok 11 - Log output (complex mapping) ok 12 - Blame output (complex mapping) # passed all 12 test(s) 1..12 *** t4205-log-pretty-formats.sh *** ok 8 - am --signoff adds Signed-off-by: line ok 9 - am stays in branch ok 23 - explicit rerere --rerere-autoupdate overrides ok 1 - set up basic repos ok 2 - alias builtin format ok 1 - setup ok 24 - rerere --no-no-rerere-autoupdate ok 25 - rerere -h # passed all 25 test(s) 1..25 ok 39 - invalid ref of the form stash@{n}, n >= N ok 3 - alias masking builtin format ok 2 - patch-id output is well-formed ok 3 - patch-id detects equality *** t4206-log-follow-harder-copies.sh *** ok 4 - alias user-defined format ok 4 - patch-id detects inequality ok 5 - alias user-defined tformat ok 6 - alias non-existant format ok 5 - patch-id supports git-format-patch output ok 1 - add a file path0 and commit. ok 7 - alias of an alias ok 26 - set up more tangled history ok 2 - Change path0. ok 27 - log --graph with merge ok 6 - whitespace is irrelevant in footer ok 8 - alias masking an alias ok 3 - copy path0 to path1. ok 10 - am --signoff does not add Signed-off-by: line if already there ok 4 - find the copy path0 -> path1 harder ok 9 - alias loop # passed all 9 test(s) 1..9 ok 7 - patch-id supports git-format-patch MIME output # passed all 7 test(s) 1..7 ok 11 - am without --keep removes Re: and [PATCH] stuff ok 5 - validate the output. # passed all 5 test(s) 1..5 *** t4207-log-decoration-colors.sh *** *** t4252-am-options.sh *** *** t4253-am-keep-cr-dos.sh *** ok 1 - setup ok 40 - stash branch should not drop the stash if the branch exists # still have 2 known breakage(s) # passed all remaining 38 test(s) 1..40 ok 1 - setup repository with dos files *** t4300-merge-tree.sh *** ok 12 - am --keep really keeps the subject ok 1 - setup ok 2 - file add A, !B ok 28 - log.decorate configuration ok 3 - file add !A, B ok 2 - am with dos files without --keep-cr ok 29 - show added path under "--follow -M" # passed all 29 test(s) 1..29 ok 2 - interrupted am --whitespace=fix ok 4 - file add A, B (same) *** t5000-tar-tree.sh *** ok 1 - setup ok 2 - Commit Decorations Colored Correctly # passed all 2 test(s) 1..2 ok 13 - am -3 falls back to 3-way merge ok 5 - file add A, B (different) *** t5001-archive-attr.sh *** ok 1 - populate workdir ok 2 - add ignored file ok 6 - file change A, !B ok 3 - am with dos files with --keep-cr ok 7 - file change !A, B ok 1 - setup ok 2 - git archive ok 3 - archive/ignored does not exist ok 4 - archive/ignored-by-tree does not exist ok 5 - archive/ignored-by-worktree exists ok 6 - git archive with worktree attributes ok 7 - worktree/ignored does not exist ok 8 - worktree/ignored-by-tree exists ok 9 - worktree/ignored-by-worktree does not exist ok 14 - am can rename a file ok 3 - add files to repository ok 8 - file change A, B (same) ok 10 - git archive vs. bare ok 11 - git archive with worktree attributes, bare ok 12 - bare-worktree/ignored does not exist ok 13 - bare-worktree/ignored-by-tree exists ok 14 - bare-worktree/ignored-by-worktree exists ok 3 - interrupted am -C1 ok 4 - create bare clone ok 5 - remove ignored file ok 15 - export-subst ok 16 - git tar-tree vs. git archive with worktree attributes ok 6 - git archive ok 17 - git tar-tree vs. git archive with worktree attrs, bare # passed all 17 test(s) 1..17 ok 7 - git tar-tree ok 8 - git archive vs. git tar-tree ok 9 - file change A, B (different) *** t5100-mailinfo.sh *** ok 9 - git archive in a bare repo ok 10 - git archive vs. the same in a bare repo ok 4 - am with dos files config am.keepcr ok 11 - git archive with --output ok 1 - split sample box ok 2 - mailinfo 0001 ok 15 - am -3 can rename a file ok 12 - git archive --remote ok 3 - mailinfo 0002 ok 13 - validate file modification time ok 4 - mailinfo 0003 ok 14 - git get-tar-commit-id ok 10 - file change A, B (mixed) ok 5 - mailinfo 0004 ok 15 - extract tar archive ok 16 - validate filenames ok 17 - validate file contents ok 6 - mailinfo 0005 ok 7 - mailinfo 0006 ok 18 - git tar-tree with prefix ok 8 - mailinfo 0007 ok 19 - extract tar archive with prefix ok 20 - validate filenames with prefix ok 21 - validate file contents with prefix ok 9 - mailinfo 0008 ok 11 - file remove A, !B ok 10 - mailinfo 0009 ok 11 - mailinfo 0010 ok 12 - mailinfo 0011 ok 22 - create archives with substfiles ok 4 - interrupted am -p2 ok 13 - mailinfo 0012 ok 23 - extract substfiles ok 24 - validate substfile contents ok 14 - mailinfo 0013 ok 25 - extract substfiles from archive with prefix ok 12 - file remove !A, B ok 5 - am with dos files config am.keepcr overriden by --no-keep-cr ok 26 - validate substfile contents from archive with prefix ok 15 - mailinfo 0014 ok 16 - am -3 can rename a file after falling back to 3-way merge ok 16 - mailinfo 0015 ok 17 - mailinfo 0016 ok 18 - split box with rfc2047 samples ok 19 - mailinfo rfc2047/0001 ok 13 - file change A, remove B ok 20 - mailinfo rfc2047/0002 ok 21 - mailinfo rfc2047/0003 ok 22 - mailinfo rfc2047/0004 ok 23 - mailinfo rfc2047/0005 ok 27 - git archive --format=zip ok 24 - mailinfo rfc2047/0006 ok 25 - mailinfo rfc2047/0007 ok 14 - file remove A, change B ok 26 - mailinfo rfc2047/0008 # passed all 14 test(s) 1..14 ok 27 - mailinfo rfc2047/0009 *** t5150-request-pull.sh *** ok 28 - mailinfo rfc2047/0010 ok 29 - mailinfo rfc2047/0011 ok 30 - respect NULs ok 28 - git archive --format=zip in a bare repo ok 29 - git archive --format=zip vs. the same in a bare repo ok 5 - interrupted am -C1 -p2 ok 31 - Preserve NULs out of MIME encoded message ok 32 - mailinfo on from header without name works # passed all 32 test(s) 1..32 *** t5300-pack-object.sh *** ok 30 - git archive --format=zip with --output ok 17 - am -3 -q is quiet ok 6 - am with dos files with --keep-cr continue ok 31 - git archive with --output, inferring format ok 18 - am pauses on conflict ok 32 - git archive with --output, override inferred format ok 6 - interrupted am --directory="frotz nitfol" ok 33 - extract ZIP archive ok 34 - validate filenames ok 35 - validate file contents ok 7 - am with unix files config am.keepcr overriden by --no-keep-cr # passed all 7 test(s) 1..7 *** t5301-sliding-window.sh *** ok 19 - am --skip works ok 1 - setup ok 7 - apply to a funny path ok 2 - setup: two scripts for reading pull requests ok 36 - git archive --format=zip with prefix ok 37 - extract ZIP archive with prefix ok 38 - validate filenames with prefix ok 39 - validate file contents with prefix ok 40 - git archive --list outside of a git repo ok 3 - pull request when forgot to push ok 41 - git-archive --prefix=olde- # passed all 41 test(s) 1..41 ok 8 - am --reject # passed all 8 test(s) 1..8 *** t5302-pack-index.sh *** *** t5303-pack-corruption-resilience.sh *** ok 1 - setup ok 2 - verify-pack -v, defaults ok 3 - verify-pack -v, packedGitWindowSize == 1 page ok 4 - verify-pack -v, packedGit{WindowSize,Limit} == 1 page ok 20 - am --resolved works ok 4 - pull request after push ok 1 - initial setup validation ok 2 - create corruption in header of first object ok 5 - repack -a -d, packedGit{WindowSize,Limit} == 1 page ok 3 - ... but having a loose copy allows for full recovery ok 6 - verify-pack -v, defaults # passed all 6 test(s) 1..6 *** t5304-prune.sh *** ok 21 - am takes patches from a Pine mailbox ok 5 - request names an appropriate branch ok 4 - ... and loose copy of first delta allows for partial recovery ok 1 - setup ok 6 - pull request format ok 22 - am fails on mail without patch ok 5 - create corruption in data of first object ok 6 - ... but having a loose copy allows for full recovery ok 7 - request-pull ignores OPTIONS_KEEPDASHDASH poison # passed all 7 test(s) 1..7 ok 1 - setup *** t5305-include-tag.sh *** ok 7 - ... and loose copy of second object allows for partial recovery ok 2 - prune stale packs ok 23 - am fails on empty patch ok 1 - setup ok 8 - create corruption in header of first delta ok 2 - pack without --include-tag ok 9 - ... but having a loose copy allows for full recovery ok 3 - unpack objects ok 3 - prune --expire ok 4 - check unpacked result (have commit, no tag) ok 10 - ... and then a repack "clears" the corruption ok 5 - pack with --include-tag ok 2 - pack without delta ok 24 - am works from stdin in subdirectory ok 6 - unpack objects ok 7 - check unpacked result (have commit, have tag) # passed all 7 test(s) 1..7 *** t5306-pack-nobase.sh *** ok 11 - create corruption in data of first delta ok 12 - ... but having a loose copy allows for full recovery ok 1 - setup base ok 13 - ... and then a repack "clears" the corruption ok 25 - am works from file (relative path given) in subdirectory ok 2 - setup patch_clone ok 14 - corruption in delta base reference of first delta (OBJ_REF_DELTA) ok 4 - gc: implicit prune --expire ok 5 - gc: refuse to start with invalid gc.pruneExpire ok 15 - ... but having a loose copy allows for full recovery ok 26 - am works from file (absolute path given) in subdirectory ok 16 - ... and then a repack "clears" the corruption ok 3 - indirectly clone patch_clone ok 4 - clone of patch_clone is incomplete # passed all 4 test(s) 1..4 *** t5307-pack-missing-commit.sh *** ok 6 - gc: start with ok gc.pruneExpire ok 7 - prune: prune nonsense parameters ok 27 - am --committer-date-is-author-date ok 17 - corruption #0 in delta base reference of first delta (OBJ_OFS_DELTA) ok 18 - ... but having a loose copy allows for full recovery ok 3 - unpack without delta ok 8 - prune: prune unreachable heads ok 4 - check unpack without delta ok 19 - ... and then a repack "clears" the corruption ok 9 - prune: do not prune heads listed as an argument ok 1 - setup ok 28 - am without --committer-date-is-author-date ok 2 - check corruption ok 3 - rev-list notices corruption (1) ok 4 - rev-list notices corruption (2) ok 5 - pack-objects notices corruption # passed all 5 test(s) 1..5 *** t5400-send-pack.sh *** ok 20 - corruption #1 in delta base reference of first delta (OBJ_OFS_DELTA) ok 21 - ... but having a loose copy allows for full recovery ok 10 - gc --no-prune ok 22 - ... and then a repack "clears" the corruption ok 29 - am --ignore-date ok 23 - ... and a redundant pack allows for full recovery too ok 30 - am into an unborn branch ok 24 - corrupting header to have too small output buffer fails unpack # passed all 24 test(s) 1..24 *** t5401-update-hooks.sh *** ok 11 - gc respects gc.pruneExpire ok 31 - am newline in subject ok 5 - pack with REF_DELTA ok 1 - setup ok 32 - am -q is quiet # passed all 32 test(s) 1..32 *** t5402-post-merge-hook.sh *** ok 2 - push ok 3 - updated as expected ok 4 - hooks ran ok 5 - pre-receive hook input ok 6 - update hook arguments ok 7 - post-receive hook input ok 8 - post-update hook arguments ok 9 - all hook stdin is /dev/null ok 10 - all *-receive hook args are empty ok 11 - send-pack produced no output ok 12 - send-pack stderr contains hook messages # passed all 12 test(s) 1..12 *** t5403-post-checkout-hook.sh *** ok 12 - gc --prune= ok 1 - setup ok 2 - post-merge does not run for up-to-date ok 3 - post-merge runs as expected ok 4 - post-merge from normal merge receives the right argument ok 5 - post-merge from squash merge runs as expected ok 6 - post-merge from squash merge receives the right argument # passed all 6 test(s) 1..6 ok 1 - setup *** t5404-tracking-branches.sh *** ok 2 - post-checkout runs as expected ok 3 - post-checkout receives the right arguments with HEAD unchanged ok 4 - post-checkout runs as expected ok 5 - post-checkout args are correct with git checkout -b ok 6 - post-checkout receives the right args with HEAD changed ok 7 - post-checkout receives the right args when not switching branches ok 13 - gc --prune=never ok 8 - post-checkout hook is triggered by clone # passed all 8 test(s) 1..8 ok 1 - setup *** t5405-send-pack-rewind.sh *** ok 6 - unpack with REF_DELTA ok 2 - prepare pushable branches ok 7 - check unpack with REF_DELTA ok 3 - mixed-success push returns error ok 4 - check tracking branches updated correctly after push ok 5 - check tracking branches not updated for failed refs ok 1 - setup ok 6 - deleted branches have their tracking branches removed ok 2 - non forced push should die not segfault ok 3 - forced push should succeed ok 7 - already deleted tracking branches ignored # passed all 3 test(s) 1..3 # passed all 7 test(s) 1..7 *** t5406-remote-rejects.sh *** *** t5407-post-rewrite-hook.sh *** ok 1 - setup ok 14 - gc respects gc.pruneExpire=never ok 2 - push reports error ok 3 - individual ref reports error # passed all 3 test(s) 1..3 ok 1 - setup *** t5500-fetch-pack.sh *** ok 2 - git commit --amend ok 3 - git commit --amend --no-post-rewrite ok 15 - prune --expire=never ok 16 - gc: prune old objects after local clone # passed all 16 test(s) 1..16 *** t5502-quickfetch.sh *** ok 8 - pack with OFS_DELTA ok 1 - setup ok 1 - setup ok 2 - clone without alternate ok 2 - 1st pull ok 3 - further commits in the original ok 4 - git rebase ok 4 - copy commit and tree but not blob by hand ok 5 - quickfetch should not leave a corrupted repository ok 6 - quickfetch should not copy from alternate ok 9 - unpack with OFS_DELTA ok 10 - check unpack with OFS_DELTA ok 11 - compare delta flavors ok 12 - use packed objects ok 5 - git rebase --skip ok 13 - use packed deltified (REF_DELTA) objects ok 14 - use packed deltified (OFS_DELTA) objects ok 6 - git rebase -m ok 15 - survive missing objects/pack directory ok 1 - setup ok 16 - verify pack ok 17 - verify pack -v ok 18 - verify-pack catches mismatched .idx and .pack files ok 2 - pack-objects with index version 1 ok 19 - verify-pack catches a corrupted pack signature ok 20 - verify-pack catches a corrupted pack version ok 7 - git rebase -m --skip ok 21 - verify-pack catches a corrupted type/size of the 1st packed object data ok 22 - verify-pack catches a corrupted sum of the index file itself ok 3 - post 1st pull setup ok 3 - pack-objects with index version 2 ok 4 - both packs should be identical ok 5 - index v1 and index v2 should be different ok 7 - quickfetch should handle ~1000 refs (on Windows) # passed all 7 test(s) 1..7 ok 6 - index-pack with index version 1 ok 8 - git rebase -i (unchanged) ok 7 - index-pack with index version 2 ok 8 - index-pack results should match pack-objects ones *** t5503-tagfollow.sh *** ok 4 - 2nd pull ok 1 - setup ok 2 - setup expect ok 3 - fetch A (new commit : 1 connection) ok 5 - 3rd pull ok 4 - create tag T on A, create C on branch cat ok 5 - setup expect ok 9 - index v2: force some 64-bit offsets with pack-objects ok 6 - fetch C, T (new branch, tag : 1 connection) ok 10 - index v2: verify a pack with some 64-bit offsets ok 11 - 64-bit offsets: should be different from previous index v2 results ok 6 - clone shallow ok 1 - setup ok 7 - clone shallow object count ok 8 - clone shallow object count (part 2) ok 23 - build pack index for an existing pack ok 9 - git rebase -i (skip) ok 9 - fsck in shallow repo ok 7 - create commits O, B, tag S on B ok 8 - setup expect ok 10 - simple fetch in shallow repo ok 12 - index v2: force some 64-bit offsets with index-pack ok 13 - 64-bit offsets: index-pack result should match pack-objects one ok 11 - no changes expected ok 12 - fetch same depth in shallow repo ok 9 - fetch B, S (commit and tag : 1 connection) ok 10 - setup expect ok 13 - no changes expected ok 14 - add two more ok 11 - new clone fetch master and tags # passed all 11 test(s) 1..11 ok 14 - [index v1] 1) stream pack to repository *** t5505-remote.sh *** ok 15 - pull in shallow repo ok 15 - [index v1] 2) create a stealth corruption in a delta base reference ok 16 - [index v1] 3) corrupted delta happily returned wrong data ok 16 - clone shallow object count ok 17 - [index v1] 4) confirm that the pack is actually corrupted ok 17 - add two more (part 2) ok 2 - pack the source repository ok 18 - [index v1] 5) pack-objects happily reuses corrupted data ok 19 - [index v1] 6) newly created pack is BAD ! ok 18 - deepening pull in shallow repo ok 19 - clone shallow object count ok 20 - deepening fetch in shallow repo ok 1 - setup ok 20 - [index v2] 1) stream pack to repository ok 21 - clone shallow object count ok 10 - git rebase -i (squash) ok 2 - remote information for the origin ok 21 - [index v2] 2) create a stealth corruption in a delta base reference ok 22 - [index v2] 3) corrupted delta happily returned wrong data ok 22 - pull in shallow repo with missing merge base ok 23 - [index v2] 4) confirm that the pack is actually corrupted ok 3 - pack the destination repository ok 3 - add another remote ok 4 - remote forces tracking branches ok 5 - remove remote ok 23 - additional simple shallow deepenings ok 24 - clone shallow object count # passed all 24 test(s) 1..24 ok 4 - refuse pushing rewound head without --force ok 6 - remove remote ok 5 - push can be used to delete a ref ok 24 - [index v2] 5) pack-objects refuses to reuse corrupted data ok 24 - unpacking with --strict ok 7 - remove remote protects non-remote branches ok 6 - refuse deleting push with denyDeletes ok 7 - cannot override denyDeletes with git -c send-pack ok 11 - git rebase -i (fixup without conflict) *** t5506-remote-groups.sh *** ok 8 - override denyDeletes with git -c receive-pack ok 1 - setup ok 9 - denyNonFastforwards trumps --force ok 8 - show ok 9 - show -n ok 10 - push --all excludes remote tracking hierarchy ok 2 - no group updates all ok 10 - prune ok 11 - set-head --delete ok 3 - nonexistant group produces error ok 12 - set-head --auto ok 13 - set-head --auto fails w/multiple HEADs ok 14 - set-head explicit ok 11 - pushing explicit refspecs respects forcing ok 15 - prune --dry-run ok 4 - updating group updates all members (remote update) ok 16 - add --mirror && prune ok 5 - updating group updates all members (fetch) ok 12 - pushing wildcard refspecs respects forcing ok 12 - git rebase -i (double edit) # passed all 12 test(s) 1..12 *** t5510-fetch.sh *** ok 17 - add alt && prune ok 6 - updating group does not update non-members (remote update) ok 13 - deny pushing to delete current branch # passed all 13 test(s) 1..13 ok 25 - index-pack with --strict ok 1 - setup *** t5511-refspec.sh *** ok 18 - add with reachable tags (default) ok 7 - updating group does not update non-members (fetch) ok 1 - push (invalid) ok 19 - add --tags ok 2 - push : ok 8 - updating remote name updates that remote # passed all 8 test(s) 1..8 ok 3 - push :: (invalid) *** t5512-ls-remote.sh *** ok 2 - clone and setup child repos ok 4 - push +: ok 20 - add --no-tags ok 21 - reject --no-no-tags ok 3 - fetch test ok 5 - fetch ok 6 - fetch : ok 1 - setup ok 4 - fetch test for-merge ok 22 - update ok 2 - ls-remote --tags .git ok 5 - fetch tags when there is no tags ok 7 - fetch :: (invalid) ok 3 - ls-remote .git ok 4 - ls-remote --tags self ok 5 - ls-remote self ok 8 - push refs/heads/*:refs/remotes/frotz/* ok 6 - dies when no remote specified and no default remotes found ok 6 - fetch following tags ok 9 - push refs/heads/*:refs/remotes/frotz (invalid) ok 7 - use "origin" when no remote specified ok 8 - suppress "From " with -q ok 7 - fetch must not resolve short tag name ok 10 - push refs/heads:refs/remotes/frotz/* (invalid) ok 23 - update with arguments ok 8 - fetch must not resolve short remote name ok 11 - push refs/heads/master:refs/remotes/frotz/xyzzy ok 9 - create bundle 1 ok 10 - header of bundle looks right ok 9 - use branch..remote if possible ok 12 - fetch refs/heads/*:refs/remotes/frotz/* ok 11 - create bundle 2 ok 10 - confuses pattern as remote when no remote specified # passed all 10 test(s) 1..10 ok 12 - unbundle 1 ok 24 - update --prune *** t5513-fetch-track.sh *** ok 13 - fetch refs/heads/*:refs/remotes/frotz (invalid) ok 14 - fetch refs/heads:refs/remotes/frotz/* (invalid) ok 13 - bundle 1 has only 3 files ok 15 - fetch refs/heads/master:refs/remotes/frotz/xyzzy ok 14 - unbundle 2 ok 16 - fetch refs/heads/master::refs/remotes/frotz/xyzzy (invalid) ok 1 - setup ok 25 - [index v2] 6) verify-pack detects CRC mismatch ok 25 - update default ok 17 - fetch refs/heads/maste :refs/remotes/frotz/xyzzy (invalid) ok 2 - fetch # passed all 2 test(s) 1..2 ok 15 - bundle does not prerequisite objects *** t5514-fetch-multiple.sh *** ok 16 - bundle should be able to create a full history ok 18 - push master~1:refs/remotes/frotz/backup ok 26 - running index-pack in the object store # passed all 26 test(s) 1..26 ok 19 - fetch master~1:refs/remotes/frotz/backup (invalid) *** t5515-fetch-merge-logic.sh *** ok 26 - update default (overridden, with funny whitespace) ok 20 - push HEAD~4:refs/remotes/frotz/new ok 21 - fetch HEAD~4:refs/remotes/frotz/new (invalid) ok 27 - update (with remotes.default defined) ok 26 - honor pack.packSizeLimit ok 22 - push HEAD ok 28 - "remote show" does not show symbolic refs ok 23 - fetch HEAD ok 29 - reject adding remote with an invalid name ok 27 - verify resulting packs ok 24 - push refs/heads/ nitfol (invalid) ok 1 - setup ok 25 - fetch refs/heads/ nitfol (invalid) ok 17 - fetch via rsync ok 30 - rename a remote ok 26 - push HEAD: (invalid) ok 27 - fetch HEAD: ok 2 - git fetch --all ok 28 - push refs/heads/ nitfol: (invalid) ok 31 - migrate a remote from named file in $GIT_DIR/remotes ok 29 - fetch refs/heads/ nitfol: (invalid) ok 30 - push :refs/remotes/frotz/deleteme ok 32 - migrate a remote from named file in $GIT_DIR/branches ok 31 - fetch :refs/remotes/frotz/HEAD-to-me ok 18 - push via rsync ok 32 - push :refs/remotes/frotz/delete me (invalid) ok 3 - git fetch --all should continue if a remote has errors ok 4 - git fetch --all does not allow non-option arguments ok 33 - remote prune to cause a dangling symref ok 33 - fetch :refs/remotes/frotz/HEAD to me (invalid) ok 1 - setup ok 34 - fetch refs/heads/*/for-linus:refs/remotes/mine/*-blah (invalid) ok 19 - push via rsync ok 34 - show empty remote ok 35 - remote set-branches requires a remote ok 5 - git fetch --multiple (but only one remote) ok 35 - push refs/heads/*/for-linus:refs/remotes/mine/*-blah (invalid) ok 20 - fetch with a non-applying branch..merge ok 36 - fetch refs/heads*/for-linus:refs/remotes/mine/* (invalid) ok 37 - push refs/heads*/for-linus:refs/remotes/mine/* (invalid) ok 21 - fetch from GIT URL with a non-applying branch..merge [1] ok 38 - fetch refs/heads/*/*/for-linus:refs/remotes/mine/* (invalid) ok 6 - git fetch --multiple (two remotes) ok 7 - git fetch --multiple (bad remote names) ok 2 - br-config-explicit ok 39 - push refs/heads/*/*/for-linus:refs/remotes/mine/* (invalid) ok 22 - fetch from GIT URL with a non-applying branch..merge [2] ok 36 - remote set-branches ok 40 - fetch refs/heads/*/for-linus:refs/remotes/mine/* ok 23 - fetch from GIT URL with a non-applying branch..merge [3] ok 37 - remote set-branches with --mirror ok 41 - push refs/heads/*/for-linus:refs/remotes/mine/* ok 24 - quoting of a strangely named repo # passed all 41 test(s) 1..41 ok 38 - new remote *** t5516-fetch-push.sh *** ok 39 - remote set-url bar ok 8 - git fetch --all (skipFetchAll) ok 40 - remote set-url baz bar ok 25 - bundle should record HEAD correctly ok 41 - remote set-url zot bar ok 3 - br-config-explicit config-explicit ok 42 - remote set-url --push zot baz ok 43 - remote set-url --push zot ok 26 - explicit fetch should not update tracking ok 44 - remote set-url --push qux zot ok 1 - setup ok 45 - remote set-url --push foo qu+x ok 9 - git fetch --multiple (ignoring skipFetchAll) # passed all 9 test(s) 1..9 ok 46 - remote set-url --push --add aaa ok 2 - fetch without wildcard ok 47 - remote set-url --push bar aaa ok 4 - br-config-explicit-merge ok 48 - remote set-url --push --delete bar ok 27 - explicit pull should not update tracking *** t5517-push-mirror.sh *** ok 49 - remote set-url --push --delete foo ok 50 - remote set-url --add bbb ok 3 - fetch with wildcard ok 51 - remote set-url --delete .* ok 28 - configured fetch updates tracking ok 29 - pushing nonexistent branch by mistake should not segv ok 52 - remote set-url --delete bbb ok 53 - remote set-url --delete baz ok 5 - br-config-explicit-merge config-explicit ok 54 - remote set-url --add ccc ok 55 - remote set-url --delete baz # passed all 55 test(s) 1..55 ok 4 - fetch with insteadOf ok 1 - push mirror creates new branches ok 5 - fetch with pushInsteadOf (should not rewrite) *** t5518-fetch-exit-status.sh *** ok 6 - br-config-explicit-octopus ok 30 - auto tag following fetches minimum ok 6 - push without wildcard ok 31 - refuse to fetch into the current branch ok 2 - push mirror updates existing branches ok 32 - fetch into the current branch with --update-head-ok ok 1 - setup ok 33 - fetch --dry-run ok 2 - non-fast-forward fetch ok 7 - push with wildcard ok 3 - forced update # passed all 3 test(s) 1..3 ok 7 - br-config-explicit-octopus config-explicit *** t5519-push-alternates.sh *** ok 28 - tolerate packsizelimit smaller than biggest object ok 34 - should be able to fetch with duplicate refspecs # passed all 34 test(s) 1..34 ok 8 - push with insteadOf ok 29 - verify resulting packs ok 30 - fake a SHA1 hash collision ok 3 - push mirror force updates existing branches ok 9 - push with pushInsteadOf ok 8 - br-config-glob ok 31 - make sure index-pack detects the SHA1 collision *** t5520-pull.sh *** # passed all 31 test(s) 1..31 ok 1 - setup ok 1 - setup ok 10 - push with pushInsteadOf and explicit pushurl (pushInsteadOf should not rewrite) ok 2 - alice works and pushes *** t5521-pull-options.sh *** ok 4 - push mirror removes branches ok 9 - br-config-glob config-glob ok 2 - pulling into void ok 3 - checking the results ok 1 - setup ok 11 - push with matching heads ok 4 - pulling into void using master:master ok 3 - bob fetches from alice, works and pushes ok 4 - clean-up in case the previous failed ok 2 - git pull -q ok 10 - br-config-glob-merge ok 5 - alice works and pushes again ok 6 - bob works and pushes ok 5 - push mirror adds, updates and removes branches together ok 12 - push with matching heads on the command line ok 3 - git pull ok 5 - test . as a remote ok 7 - alice works and pushes yet again ok 11 - br-config-glob-merge config-glob ok 4 - git pull -v ok 6 - push mirror creates new tags ok 8 - bob works and pushes again # passed all 8 test(s) 1..8 ok 6 - the default remote . should not break explicit pull *** t5522-pull-symlink.sh *** ok 13 - failed (non-fast-forward) push with matching heads ok 5 - git pull -v -q ok 12 - br-config-glob-octopus ok 6 - git pull -q -v ok 1 - setup ok 7 - push mirror updates existing tags ok 14 - push --force with matching heads ok 13 - br-config-glob-octopus config-glob ok 2 - pulling from real subdir ok 3 - pulling from symlinked subdir ok 7 - git pull --force ok 14 - br-remote-explicit ok 15 - push with matching heads and forced update ok 8 - push mirror force updates existing tags ok 7 - --rebase ok 4 - pushing from symlinked subdir # passed all 4 test(s) 1..4 *** t5523-push-upstream.sh *** ok 8 - git pull --all # passed all 8 test(s) 1..8 ok 1 - setup bare parent ok 16 - push with no ambiguity (1) ok 15 - br-remote-explicit remote-explicit ok 2 - setup local commit ok 9 - push mirror removes tags *** t5524-pull-msg.sh *** ok 3 - push -u master:master ok 4 - push -u master:other ok 5 - push -u --dry-run master:otherX ok 17 - push with no ambiguity (2) ok 16 - br-remote-explicit-merge ok 1 - setup ok 6 - push -u master2:master2 ok 7 - push -u master2:other2 ok 10 - push mirror adds, updates and removes tags together ok 8 - branch.to-rebase.rebase ok 8 - push -u :master2 ok 2 - pull # passed all 2 test(s) 1..2 ok 17 - br-remote-explicit-merge remote-explicit *** t5525-fetch-tagopt.sh *** ok 9 - push -u --all ok 18 - push with colon-less refspec, no ambiguity ok 11 - remote.foo.mirror adds and removes branches ok 10 - push -u HEAD # passed all 10 test(s) 1..10 *** t5530-upload-pack-error.sh *** ok 18 - br-remote-explicit-octopus ok 1 - setup ok 1 - setup and corrupt repository ok 2 - fetch with tagopt=--no-tags does not get tag ok 19 - push with weak ambiguity (1) ok 12 - remote.foo.mirror=no has no effect ok 2 - fsck fails # passed all 12 test(s) 1..12 ok 3 - fetch --tags with tagopt=--no-tags gets tag ok 3 - upload-pack fails due to error in pack-objects packing *** t5531-deep-submodule-push.sh *** ok 4 - fetch --no-tags with tagopt=--tags does not get tag ok 19 - br-remote-explicit-octopus remote-explicit ok 4 - corrupt repo differently ok 5 - fetch with tagopt=--tags gets tag # passed all 5 test(s) 1..5 ok 5 - fsck fails *** t5540-http-push.sh *** ok 6 - upload-pack fails due to error in rev-list ok 7 - upload-pack error message when bad ref requested ok 8 - upload-pack fails due to error in pack-objects enumeration ok 1 - setup ok 9 - create empty repository # passed all 0 test(s) 1..0 # SKIP Network testing disabled (define GIT_TEST_HTTPD to enable) *** t5541-http-push.sh *** ok 10 - fetch fails ok 2 - push # passed all 10 test(s) 1..10 ok 20 - br-remote-glob # passed all 2 test(s) 1..2 ok 9 - --rebase with rebased upstream *** t5550-http-fetch.sh *** *** t5551-http-fetch.sh *** # passed all 0 test(s) 1..0 # SKIP Network testing disabled (define GIT_TEST_HTTPD to enable) ok 20 - push with weak ambiguity (2) *** t5560-http-backend-noserver.sh *** # passed all 0 test(s) 1..0 # SKIP Network testing disabled (define GIT_TEST_HTTPD to enable) # passed all 0 test(s) 1..0 # SKIP Network testing disabled (define GIT_TEST_HTTPD to enable) *** t5561-http-backend.sh *** *** t5600-clone-fail-cleanup.sh *** ok 21 - br-remote-glob remote-glob # passed all 0 test(s) 1..0 # SKIP Network testing disabled (define GIT_TEST_HTTPD to enable) *** t5601-clone.sh *** ok 1 - clone of non-existent source should fail ok 2 - failed clone should not leave a directory ok 21 - push with ambiguity ok 22 - br-remote-glob-merge ok 1 - setup ok 3 - clone of non-existent (relative to $PWD) source should fail ok 2 - clone with excess parameters (1) ok 3 - clone with excess parameters (2) ok 4 - clone should work now that source exists ok 5 - successful clone must leave the directory # passed all 5 test(s) 1..5 ok 23 - br-remote-glob-merge remote-glob *** t5602-clone-remote-exec.sh *** ok 4 - output from clone ok 1 - setup repository ok 2 - direct refs/heads/master not found ok 10 - --rebase with rebased default upstream ok 22 - push with colon-less refspec (1) ok 1 - setup ok 5 - clone does not keep pack ok 2 - clone calls git upload-pack unqualified with no -u option ok 3 - clone calls specified git upload-pack with -u option # passed all 3 test(s) 1..3 ok 6 - clone checks out files *** t5700-clone-reference.sh *** ok 24 - br-remote-glob-octopus ok 7 - clone respects GIT_WORK_TREE ok 3 - static file is ok ok 8 - clone creates intermediate directories ok 9 - clone creates intermediate directories for bare repo ok 1 - preparing first repository ok 25 - br-remote-glob-octopus remote-glob ok 23 - push with colon-less refspec (2) ok 4 - no export by default ok 10 - clone --mirror ok 11 - clone --bare names the local repository .git ok 26 - br-branches-default ok 24 - push with colon-less refspec (3) ok 12 - clone --mirror does not repeat tags ok 5 - export if git-daemon-export-ok ok 2 - preparing second repository ok 13 - clone to destination with trailing / ok 3 - cloning with reference (-l -s) ok 4 - existence of info/alternates ok 27 - br-branches-default branches-default ok 25 - push with colon-less refspec (4) ok 11 - rebased upstream + fetch + pull --rebase ok 14 - clone to destination with extra trailing / ok 6 - static file if http.getanyfile true is ok ok 5 - pulling from reference ok 15 - clone to an existing empty directory ok 16 - clone to an existing non-empty directory ok 17 - clone to an existing path ok 6 - that reference gets used ok 28 - br-branches-default-merge ok 26 - push head with non-existant, incomplete dest ok 7 - cloning with reference (no -l -s) ok 8 - fetched no objects ok 9 - existence of info/alternates ok 18 - clone a void ok 7 - static file if http.getanyfile false fails ok 10 - pulling from reference ok 29 - br-branches-default-merge branches-default ok 27 - push tag with non-existant, incomplete dest ok 11 - that reference gets used ok 8 - http.uploadpack default enabled ok 19 - clone respects global branch.autosetuprebase ok 9 - http.uploadpack true ok 20 - respect url-encoding of file:// ok 28 - push sha1 with non-existant, incomplete dest ok 10 - http.uploadpack false ok 21 - do not query-string-decode + in URLs ok 30 - br-branches-default-octopus ok 11 - http.receivepack default disabled ok 29 - push ref expression with non-existant, incomplete dest ok 22 - do not respect url-encoding of non-url path # passed all 22 test(s) 1..22 ok 12 - updating origin ok 12 - http.receivepack true ok 13 - http.receivepack false ok 13 - pulling changes from origin ok 31 - br-branches-default-octopus branches-default *** t5701-clone-local.sh *** ok 14 - that alternate to origin gets used ok 30 - push with HEAD ok 14 - http-backend blocks bad PATH_INFO # passed all 14 test(s) 1..14 *** t5702-clone-options.sh *** ok 15 - pulling changes from origin ok 32 - br-branches-one ok 16 - check objects expected to exist locally ok 1 - setup ok 17 - preparing alternate repository #1 ok 31 - push with HEAD nonexisting at remote ok 1 - preparing origin repository ok 2 - clone -o ok 18 - cloning alternate repo #2 and adding changes to repo #1 ok 33 - br-branches-one branches-one ok 2 - local clone without .git suffix ok 3 - redirected clone ok 19 - cloning alternate repo #1, using #2 as reference ok 3 - local clone with .git suffix ok 34 - br-branches-one-merge ok 20 - cloning with reference being subset of source (-l -s) # passed all 20 test(s) 1..20 ok 4 - redirected clone -v # passed all 4 test(s) 1..4 ok 4 - local clone from x ok 12 - pull --rebase dies early with dirty working directory *** t5704-bundle.sh *** ok 5 - local clone from x.git that does not exist *** t5705-clone-2gb.sh *** ok 32 - push with +HEAD ok 6 - With -no-hardlinks, local will make a copy ok 35 - br-branches-one-merge branches-one Skipping expensive 2GB clone test; enable it with GIT_TEST_CLONE_2GB=t ok 1 # skip setup (missing CLONE_2GB) ok 2 # skip clone - bare (missing CLONE_2GB) ok 3 # skip clone - with worktree, file:// protocol (missing CLONE_2GB) # passed all 3 test(s) 1..3 ok 7 - Even without -l, local will make a hardlink *** t5706-clone-branch.sh *** ok 1 - setup ok 13 - pull --rebase works on branch yet to be born ok 8 - local clone of repo with nonexistent ref in HEAD ok 2 - tags can be excluded by rev-list options ok 33 - push HEAD with non-existant, incomplete dest ok 3 - die if bundle file cannot be created not ok 4 - bundle --stdin # TODO known breakage ok 9 - bundle clone without .bundle suffix ok 36 - br-branches-one-octopus not ok 5 - bundle --stdin # TODO known breakage # still have 2 known breakage(s) # passed all remaining 3 test(s) 1..5 *** t5710-info-alternate.sh *** ok 1 - setup ok 14 - setup for detecting upstreamed changes ok 10 - bundle clone with .bundle suffix ok 2 - vanilla clone chooses HEAD ok 37 - br-branches-one-octopus branches-one ok 11 - bundle clone from b4 ok 3 - clone -b chooses specified branch ok 12 - bundle clone from b4.bundle that does not exist ok 4 - clone -b sets up tracking ok 5 - clone -b does not munge remotes/origin/HEAD ok 34 - push with config remote.*.push = HEAD ok 13 - bundle clone with nonexistent HEAD ok 6 - clone -b with bogus branch chooses HEAD # passed all 6 test(s) 1..6 ok 38 - master ok 1 - preparing first repository *** t5800-remote-helpers.sh *** ok 14 - clone empty repository ok 15 - git pull --rebase detects upstreamed changes ok 39 - master config-explicit ok 35 - push with config remote.*.pushurl ok 15 - clone empty repository, and then push should not segfault. # passed all 15 test(s) 1..15 ok 1 - setup repository ok 2 - preparing second repository *** t6001-rev-list-graft.sh *** ok 40 - master config-glob ok 16 - setup for avoiding reapplying old patches ok 36 - push with dry-run ok 2 - cloning from local repo ok 3 - preparing third repository ok 1 - setup ok 2 - without grafts ok 41 - master remote-explicit ok 3 - with grafts ok 4 - without grafts, with pathlimit ok 5 - with grafts, with pathlimit ok 6 - without grafts ok 7 - with grafts ok 8 - without grafts, with pathlimit ok 9 - with grafts, with pathlimit ok 3 - cloning from remote repo ok 10 - without grafts ok 11 - with grafts ok 42 - master remote-glob ok 12 - without grafts, with pathlimit ok 37 - push updates local refs ok 4 - create new commit on remote ok 13 - with grafts, with pathlimit # passed all 13 test(s) 1..13 ok 4 - creating too deep nesting *** t6002-rev-list-bisect.sh *** ok 17 - git pull --rebase does not reapply old patches # passed all 17 test(s) 1..17 ok 5 - invalidity of deepest repository ok 43 - master branches-default *** t6003-rev-list-topo-order.sh *** ok 5 - pulling from local repo ok 6 - validity of third repository ok 7 - validity of fourth repository ok 44 - master branches-one ok 8 - breaking of loops ok 9 - that info/alternates is necessary ok 6 - pulling from remote remote ok 45 - br-unconfig ok 38 - push updates up-to-date local refs ok 10 - that relative alternate is possible for current dir ok 11 - that relative alternate is only possible for current dir # passed all 11 test(s) 1..11 ok 7 - pushing to local repo ok 46 - br-unconfig config-explicit *** t6004-rev-list-path-optim.sh *** ok 39 - push preserves up-to-date packed refs ok 1 - setup ok 2 - path-optimization ok 47 - br-unconfig config-glob ok 8 - synch with changes from localclone ok 3 - further setup ok 4 - path optimization 2 # passed all 4 test(s) 1..4 ok 40 - push does not update local refs on failure ok 48 - br-unconfig remote-explicit *** t6005-rev-list-count.sh *** ok 9 - pushing remote local repo # passed all 9 test(s) 1..9 *** t6006-rev-list-format.sh *** ok 41 - allow deleting an invalid remote ref ok 49 - br-unconfig remote-glob ok 1 - setup ok 1 - setup ok 2 - no options ok 2 - format percent ok 3 - format hash ok 3 - --max-count ok 4 - format tree ok 5 - format parents ok 42 - allow deleting a ref using --delete ok 6 - format author ok 4 - --max-count all forms ok 7 - format committer ok 8 - format encoding ok 9 - format subject ok 1 - bisection diff --bisect l0 ^root <= 0 ok 5 - --skip ok 10 - format body ok 11 - format raw-body ok 50 - br-unconfig branches-default ok 2 - bisection diff --bisect l1 ^root <= 0 ok 12 - format colors ok 13 - format advanced-colors ok 3 - bisection diff --bisect l2 ^root <= 0 ok 14 - setup complex body ok 6 - --skip --max-count # passed all 6 test(s) 1..6 ok 15 - format complex-encoding ok 16 - format complex-subject ok 4 - bisection diff --bisect a0 ^root <= 0 *** t6007-rev-list-cherry-pick-file.sh *** ok 17 - format complex-body ok 43 - allow deleting a tag using --delete ok 18 - %x00 shows NUL ok 5 - bisection diff --bisect a1 ^root <= 0 ok 19 - %ad respects --date= ok 20 - empty email ok 6 - bisection diff --bisect a2 ^root <= 0 ok 51 - br-unconfig branches-one ok 21 - del LF before empty (1) ok 22 - del LF before empty (2) ok 7 - bisection diff --bisect a3 ^root <= 0 ok 23 - add LF before non-empty (1) ok 24 - add LF before non-empty (2) ok 44 - push --delete without args aborts ok 25 - add SP before non-empty (1) ok 8 - bisection diff --bisect b1 ^root <= 0 ok 26 - add SP before non-empty (2) ok 9 - bisection diff --bisect b2 ^root <= 0 ok 1 - setup ok 27 - --abbrev ok 2 - --left-right ok 28 - %H is not affected by --abbrev-commit ok 52 - master ../.git ok 10 - bisection diff --bisect b3 ^root <= 0 ok 3 - --count ok 29 - %h is not affected by --abbrev-commit ok 4 - --cherry-pick foo comes up empty ok 5 - --cherry-pick bar does not come up empty ok 30 - "%h %gD: %gs" is same as git-reflog ok 45 - push --delete refuses src:dest refspecs ok 11 - bisection diff --bisect c1 ^root <= 0 ok 31 - "%h %gD: %gs" is same as git-reflog (with date) ok 53 - master ../.git one ok 32 - "%h %gD: %gs" is same as git-reflog (with --abbrev) ok 12 - bisection diff --bisect c2 ^root <= 0 ok 1 - rev-list has correct number of entries ok 6 - --cherry-pick with independent, but identical branches ok 33 - %gd shortens ref name ok 2 - simple topo order ok 13 - bisection diff --bisect c3 ^root <= 0 ok 3 - two diamonds topo order (g6) ok 54 - master ../.git one two ok 7 - --count --left-right ok 14 - bisection diff --bisect E ^F <= 0 # passed all 7 test(s) 1..7 ok 4 - multiple heads ok 5 - multiple heads, prune at a1 *** t6008-rev-list-submodule.sh *** ok 15 - bisection diff --bisect e1 ^F <= 0 ok 46 - warn on push to HEAD of non-bare repository ok 6 - multiple heads, prune at l1 ok 55 - master --tags ../.git ok 16 - bisection diff --bisect e2 ^F <= 0 ok 7 - cross-epoch, head at l5, prune at l1 ok 8 - duplicated head arguments ok 17 - bisection diff --bisect e3 ^F <= 0 ok 9 - prune near topo ok 18 - bisection diff --bisect e4 ^F <= 0 ok 10 - head has no parent ok 11 - two nodes - one head, one base ok 19 - bisection diff --bisect e5 ^F <= 0 ok 47 - deny push to HEAD of non-bare repository ok 12 - three nodes one head, one internal, one base ok 34 - oneline with empty message ok 56 - master ../.git tag tag-one tag tag-three # passed all 34 test(s) 1..34 ok 20 - bisection diff --bisect e6 ^F <= 0 ok 13 - linear prune l2 ^root *** t6009-rev-list-parent.sh *** ok 21 - bisection diff --bisect e7 ^F <= 0 ok 14 - linear prune l2 ^l0 ok 15 - linear prune l2 ^l1 ok 22 - bisection diff --bisect f1 ^F <= 0 ok 16 - linear prune l5 ^a4 ok 1 - setup ok 23 - bisection diff --bisect f2 ^F <= 0 ok 17 - linear prune l5 ^l3 ok 2 - Ilari's test # passed all 2 test(s) 1..2 ok 57 - master ../.git tag tag-one-tree tag tag-three-file ok 18 - linear prune l5 ^l4 ok 48 - allow push to HEAD of bare repository (bare) ok 24 - bisection diff --bisect f3 ^F <= 0 *** t6010-merge-base.sh *** ok 19 - max-count 10 - topo order ok 25 - bisection diff --bisect f4 ^F <= 0 ok 20 - max-count 10 - non topo order ok 1 - setup ok 2 - one is ancestor of others and should not be shown # passed all 2 test(s) 1..2 ok 26 - bisection diff --bisect E ^F <= 0 ok 1 - setup ok 21 - --max-age=c3, no --topo-order *** t6011-rev-list-with-bad-commit.sh *** ok 22 - one specified head reachable from another a4, c3, --topo-order ok 27 - bisection diff --bisect V ^U <= 1 ok 58 - master ../.git one tag tag-one tag tag-three-file ok 23 - one specified head reachable from another c3, a4, --topo-order ok 28 - bisection diff --bisect V ^U ^u1 ^u2 ^u3 <= 0 ok 49 - allow push to HEAD of non-bare repository (config) ok 24 - one specified head reachable from another a4, c3, no --topo-order ok 2 - set up G and H ok 29 - bisection diff --bisect u1 ^U <= 0 ok 25 - one specified head reachable from another c3, a4, no --topo-order ok 26 - graph with c3 and a4 parents of head ok 30 - bisection diff --bisect u2 ^U <= 0 ok 27 - graph with a4 and c3 parents of head ok 28 - head ^head --topo-order ok 59 - br-unconfig ../.git ok 29 - head ^head no --topo-order ok 31 - bisection diff --bisect u3 ^U <= 0 ok 3 - merge-base G H ok 50 - fetch with branches ok 30 - simple topo order (l5r1) ok 32 - bisection diff --bisect u4 ^U <= 0 ok 31 - simple topo order (r1l5) ok 60 - br-unconfig ../.git one ok 33 - bisection diff --bisect u5 ^U <= 0 ok 32 - don't print things unreachable from one branch ok 34 - --bisect l5 ^root ok 4 - merge-base/show-branch --independent ok 33 - --topo-order a4 l3 # passed all 33 test(s) 1..33 ok 1 - setup ok 35 - --bisect l5 ^root ^c3 ok 51 - fetch with branches containing # ok 2 - verify number of revisions ok 61 - br-unconfig ../.git one two ok 36 - --bisect l5 ^root ^c3 ^b4 *** t6012-rev-list-simplify.sh *** ok 3 - corrupt second commit object ok 37 - --bisect l3 ^root ^c3 ^b4 ok 4 - rev-list should fail ok 38 - --bisect l5 ^b3 ^a3 ^b4 ^a4 ok 62 - br-unconfig --tags ../.git ok 39 - --bisect l4 ^a2 ^a3 ^b ^a4 ok 5 - git repack _MUST_ fail ok 52 - push with branches ok 6 - first commit is still available # passed all 6 test(s) 1..6 ok 40 - --bisect l3 ^a2 ^a3 ^b ^a4 *** t6013-rev-list-reverse-parents.sh *** ok 41 - --bisect a4 ^a2 ^a3 ^b4 ok 42 - --bisect a4 ^a2 ^a3 ^b4 ^c2 ok 5 - unsynchronized clocks ok 43 - --bisect a4 ^a2 ^a3 ^b4 ^c2 ^c3 ok 53 - push with branches containing # ok 44 - --bisect a4 ^a2 ^a3 ^b4 ok 63 - br-unconfig ../.git tag tag-one tag tag-three ok 45 - --bisect c3 ^a2 ^a3 ^b4 ^c2 # passed all 45 test(s) 1..45 *** t6014-rev-list-all.sh *** ok 6 - --independent with unsynchronized clocks ok 1 - set up --reverse example ok 64 - br-unconfig ../.git tag tag-one-tree tag tag-three-file ok 2 - --reverse --parents --full-history combines correctly ok 3 - --boundary does too # passed all 3 test(s) 1..3 ok 1 - setup ok 2 - log --full-history *** t6015-rev-list-show-all-parents.sh *** ok 3 - log --full-history -- file ok 1 - setup ok 4 - log --full-history --topo-order -- file ok 2 - rev-list --all lists detached HEAD ok 5 - log --full-history --date-order -- file ok 6 - log --simplify-merges -- file ok 65 - br-unconfig ../.git one tag tag-one tag tag-three-file # passed all 65 test(s) 1..65 ok 54 - push into aliased refs (consistent) ok 7 - log -- file ok 8 - log --topo-order -- file # passed all 8 test(s) 1..8 *** t6016-rev-list-graph-simplify-history.sh *** *** t6017-rev-list-stdin.sh *** ok 1 - set up --show-all --parents test ok 2 - --parents rewrites TREESAME parents correctly ok 3 - --parents --show-all does not rewrites TREESAME parents # passed all 3 test(s) 1..3 ok 3 - repack does not lose detached HEAD # passed all 3 test(s) 1..3 *** t6018-rev-list-glob.sh *** *** t6019-rev-list-ancestry-path.sh *** ok 55 - push into aliased refs (inconsistent) ok 7 - merge-base for octopus-step (setup) ok 8 - merge-base A B C ok 56 - push --porcelain ok 57 - push --porcelain bad url ok 1 - setup ok 2 - rev-parse --glob=refs/heads/subspace/* ok 3 - rev-parse --glob=heads/subspace/* ok 4 - rev-parse --glob=refs/heads/subspace/ ok 58 - push --porcelain rejected ok 5 - rev-parse --glob=heads/subspace/ ok 6 - rev-parse --glob=heads/subspace ok 7 - rev-parse --branches=subspace/* ok 9 - criss-cross merge-base for octopus-step # passed all 9 test(s) 1..9 ok 8 - rev-parse --branches=subspace/ ok 1 - setup ok 9 - rev-parse --branches=subspace ok 2 - rev-list D..M ok 10 - rev-parse --glob=heads/subspace/* --glob=heads/other/* ok 3 - rev-list --ancestry-path D..M ok 59 - push --porcelain --dry-run rejected # passed all 59 test(s) 1..59 *** t6020-merge-df.sh *** ok 4 - rev-list D..M -- M.t ok 11 - rev-parse --glob=heads/someref/* master ok 1 - set up rev-list --graph test ok 5 - rev-list --ancestry-patch D..M -- M.t # passed all 5 test(s) 1..5 ok 2 - --graph --all ok 12 - rev-parse --glob=heads/* ok 13 - rev-parse --tags=foo *** t6021-merge-criss-cross.sh *** ok 3 - --graph --simplify-by-decoration *** t6022-merge-rename.sh *** ok 14 - rev-parse --remotes=foo ok 15 - rev-list --glob=refs/heads/subspace/* ok 4 - --graph --simplify-by-decoration prune branch B ok 16 - rev-list --glob refs/heads/subspace/* ok 17 - rev-list --glob=heads/subspace/* ok 1 - prepare repository ok 5 - --graph --full-history -- bar.txt ok 2 - Merge with d/f conflicts ok 18 - rev-list --glob=refs/heads/subspace/ ok 19 - rev-list --glob=heads/subspace/ ok 6 - --graph --full-history --simplify-merges -- bar.txt ok 20 - rev-list --glob=heads/subspace ok 21 - rev-list --branches=subspace/* ok 7 - --graph -- bar.txt ok 22 - rev-list --branches=subspace/ ok 23 - rev-list --branches=subspace ok 8 - --graph --sparse -- bar.txt ok 3 - F/D conflict # passed all 3 test(s) 1..3 ok 24 - rev-list --branches ok 9 - --graph ^C4 ok 1 - prepare repository ok 1 - setup ok 10 - --graph ^C3 ok 25 - rev-list --glob=heads/someref/* master *** t6023-merge-file.sh *** ok 2 - Criss-cross merge ok 3 - Criss-cross merge result ok 11 - --graph --boundary ^C3 # passed all 11 test(s) 1..11 ok 26 - rev-list --glob=heads/subspace/* --glob=heads/other/* ok 2 - check rev-list master ok 27 - rev-list --glob=heads/* *** t6024-recursive-merge.sh *** ok 28 - rev-list --tags=foo ok 3 - check log --stat master ok 1 - merge with no changes ok 4 - Criss-cross merge fails (-s resolve) ok 29 - rev-list --tags # passed all 4 test(s) 1..4 ok 2 - merge without conflict ok 4 - check rev-list side-1 ^side-4 ok 30 - rev-list --remotes=foo ok 3 - works in subdirectory # passed all 30 test(s) 1..30 *** t6025-merge-symlinks.sh *** ok 4 - merge without conflict (--quiet) ok 5 - merge without conflict (missing LF at EOF) ok 6 - merge result added missing LF ok 1 - setup *** t6026-merge-attr.sh *** ok 5 - check log --stat side-1 ^side-4 ok 7 - merge with conflicts ok 8 - expected conflict markers ok 9 - merge with conflicts, using -L ok 10 - expected conflict markers, with -L ok 6 - check rev-list side-1 ^side-7 -- ok 11 - conflict in removed tail ok 12 - expected conflict markers ok 13 - binary files cannot be merged ok 14 - MERGE_ZEALOUS simplifies non-conflicts ok 7 - check log --stat side-1 ^side-7 -- ok 15 - ZEALOUS_ALNUM ok 16 - "diff3 -m" style output (1) ok 8 - check rev-list side-1 ^side-7 -- file-1 ok 17 - "diff3 -m" style output (2) ok 2 - pull renaming branch into unrenaming one ok 18 - marker size # passed all 18 test(s) 1..18 *** t6027-merge-binary.sh *** ok 9 - check log --stat side-1 ^side-7 -- file-1 ok 1 - setup ok 10 - check rev-list side-1 ^side-7 -- file-2 ok 1 - setup ok 2 - merge master into b-symlink, which has a different symbolic link ok 3 - the merge result must be a file ok 2 - merge ok 11 - check log --stat side-1 ^side-7 -- file-2 ok 4 - merge master into b-file, which has a file instead of a symbolic link ok 5 - the merge result must be a file ok 3 - check merge result in index ok 1 - setup tests ok 12 - check rev-list side-3 ^side-4 -- file-3 ok 4 - check merge result in working tree ok 6 - merge b-file, which has a file instead of a symbolic link, into master ok 7 - the merge result must be a file ok 2 - combined merge conflicts # passed all 7 test(s) 1..7 ok 3 - pull renaming branch into another renaming one ok 3 - result contains a conflict ok 5 - retry the merge with longer context ok 13 - check log --stat side-3 ^side-4 -- file-3 ok 4 - virtual trees were processed *** t6028-merge-up-to-date.sh *** ok 14 - check rev-list side-3 ^side-2 ok 15 - check log --stat side-3 ^side-2 ok 1 - setup ok 5 - refuse to merge binary files ok 16 - check rev-list side-3 ^side-2 -- file-1 ok 17 - check log --stat side-3 ^side-2 -- file-1 ok 6 - custom merge backend # passed all 17 test(s) 1..17 ok 4 - pull unrenaming branch into renaming one ok 1 - setup ok 2 - resolve *** t6029-merge-subtree.sh *** ok 2 - merge -s recursive up-to-date ok 3 - recursive # passed all 3 test(s) 1..3 *** t6030-bisect-porcelain.sh *** ok 3 - merge -s recursive fast-forward ok 6 - mark rename/delete as unmerged # passed all 6 test(s) 1..6 ok 7 - custom merge backend ok 4 - merge -s ours up-to-date *** t6031-merge-recursive.sh *** ok 5 - pull conflicting renames ok 5 - merge -s ours fast-forward ok 1 - setup ok 6 - merge -s subtree up-to-date ok 2 - subtree available and works like recursive # passed all 6 test(s) 1..6 *** t6032-merge-large-rename.sh *** ok 1 - set up basic repo with 1 file (hello) and 4 commits ok 6 - interference with untracked working tree file ok 8 - up-to-date merge without common ancestor # passed all 8 test(s) 1..8 ok 3 - setup *** t6033-merge-crlf.sh *** ok 1 - setup (initial) ok 1 - mode change in one branch: keep changed version ok 2 - verify executable bit on file ok 7 - interference with untracked working tree file ok 4 - initial merge ok 3 - mode change in both branches: expect conflict ok 4 - verify executable bit on file ok 2 - bisect starts with only one bad ok 1 - setup ok 2 - Check "ours" is CRLF ok 8 - interference with untracked working tree file ok 2 - rename (5, ok) ok 3 - set diff.renamelimit to 4 ok 5 - merge update ok 3 - Check that conflict file is CRLF # passed all 3 test(s) 1..3 *** t6034-merge-rename-nocruft.sh *** ok 5 - merging with triple rename across D/F conflict # passed all 5 test(s) 1..5 ok 6 - initial ambiguous subtree *** t6035-merge-dir-to-symlink.sh *** ok 9 - updated working tree file should prevent the merge ok 3 - bisect does not start with only one good ok 4 - rename (4, ok) ok 7 - merge using explicit ok 1 - create a commit where dir a/b changed to symlink ok 1 - setup ok 10 - updated working tree file should prevent the merge ok 2 - keep a/b-2/c/d across checkout ok 2 - merge white into red (A->B,M->N) ok 8 - merge2 using explicit ok 3 - checkout should not have deleted a/b-2/c/d # passed all 8 test(s) 1..8 ok 3 - merge blue into white (A->B, mod A, A untracked) # passed all 3 test(s) 1..3 *** t6036-recursive-corner-cases.sh *** ok 4 - setup for merge test *** t6037-merge-ours-theirs.sh *** ok 5 - rename (5, fail) ok 6 - set merge.renamelimit to 5 ok 11 - interference with untracked working tree file ok 5 - Handle D/F conflict, do not lose a/b-2/c/d in merge (resolve) ok 6 - Handle D/F conflict, do not lose a/b-2/c/d in merge (recursive) ok 12 - merge of identical changes in a renamed file # passed all 12 test(s) 1..12 ok 1 - setup ok 4 - bisect start with one bad and good *** t6038-merge-text-auto.sh *** ok 2 - plain recursive - should conflict ok 7 - Handle F/D conflict, do not lose a/b-2/c/d in merge (resolve) ok 1 - setup ok 8 - Handle F/D conflict, do not lose a/b-2/c/d in merge (recursive) ok 3 - recursive favouring theirs ok 7 - rename (5, ok) ok 2 - merge # passed all 2 test(s) 1..2 ok 4 - recursive favouring ours *** t6040-tracking-info.sh *** not ok 9 - do not lose untracked in merge (resolve) # TODO known breakage ok 10 - do not lose untracked in merge (recursive) ok 11 - do not lose modifications in merge (resolve) ok 12 - do not lose modifications in merge (recursive) ok 1 - setup ok 2 - set up fuzz_conflict() helper ok 8 - rename (6, fail) # passed all 8 test(s) 1..8 ok 13 - setup a merge where dir a/b-2 changed to symlink *** t6050-replace.sh *** ok 3 - Merge after setting text=auto ok 4 - Merge addition of text=auto ok 14 - merge should not have D/F conflicts (resolve) ok 5 - Detect CRLF/LF conflict after setting text=auto ok 15 - merge should not have D/F conflicts (recursive) ok 1 - setup ok 6 - Detect LF/CRLF conflict from addition of text=auto ok 2 - branch -v ok 16 - merge should not have F/D conflicts (recursive) # still have 1 known breakage(s) # passed all remaining 15 test(s) 1..16 ok 3 - checkout *** t6101-rev-parse-parents.sh *** not ok 7 - checkout -m after setting text=auto # TODO known breakage ok 4 - checkout with local tracked branch ok 5 - status not ok 8 - checkout -m addition of text=auto # TODO known breakage ok 1 - set up buggy branch ok 6 - status when tracking lightweight tags ok 5 - pull with -X # passed all 5 test(s) 1..5 *** t6120-describe.sh *** not ok 9 - cherry-pick patch from after text=auto was added # TODO known breakage ok 2 - replace the author ok 7 - status when tracking annotated tags ok 3 - test --no-replace-objects option ok 8 - setup tracking with branch --set-upstream on existing branch ok 5 - bisect fails if given any junk instead of revs ok 4 - test GIT_NO_REPLACE_OBJECTS env variable ok 5 - tag replaced commit ok 10 - Test delete/normalize conflict # still have 3 known breakage(s) # passed all remaining 7 test(s) 1..10 ok 1 - start is valid ok 9 - --set-upstream does not change branch # passed all 9 test(s) 1..9 ok 2 - start^0 *** t6200-fmt-merge-msg.sh *** ok 3 - start^1 not valid ok 6 - "git fsck" works ok 6 - bisect reset: back in the master branch ok 4 - second^1 = second^ *** t6300-for-each-ref.sh *** ok 5 - final^1^1^1 ok 6 - final^1^1^1 = final^^^ ok 7 - final^1^2 ok 8 - final^1^2 != final^1^1 ok 9 - final^1^3 not valid ok 10 - --verify start2^1 ok 11 - --verify start2^0 ok 12 - final^1^@ = final^1^1 final^1^2 ok 13 - final^1^! = final^1 ^final^1^1 ^final^1^2 ok 1 - Create sample commit with known timestamp ok 2 - Create upstream config ok 3 - basic atom: head refname ok 4 - basic atom: head upstream ok 5 - basic atom: head objecttype ok 6 - basic atom: head objectsize ok 14 - repack for next test ok 7 - basic atom: head objectname ok 1 - setup ok 8 - basic atom: head tree ok 15 - short SHA-1 works # passed all 15 test(s) 1..15 ok 2 - describe HEAD ok 9 - basic atom: head parent ok 7 - bisect reset: back in another branch ok 10 - basic atom: head numparent ok 3 - describe HEAD^ *** t7001-mv.sh *** ok 11 - basic atom: head object ok 4 - describe HEAD^^ ok 12 - basic atom: head type ok 5 - describe HEAD^^2 ok 13 - basic atom: head author ok 8 - bisect reset when not bisecting ok 6 - describe HEAD^^2^ ok 14 - basic atom: head authorname ok 15 - basic atom: head authoremail ok 7 - describe HEAD^^^ ok 16 - basic atom: head authordate ok 8 - describe --tags HEAD ok 7 - repack, clone and fetch work ok 17 - basic atom: head committer ok 1 - prepare reference tree ok 9 - describe --tags HEAD^ ok 18 - basic atom: head committername ok 2 - moving the file out of subdirectory ok 10 - describe --tags HEAD^^ ok 19 - basic atom: head committeremail ok 3 - commiting the change ok 11 - describe --tags HEAD^^2 ok 20 - basic atom: head committerdate ok 4 - checking the commit ok 5 - moving the file back into subdirectory ok 12 - describe --tags HEAD^^2^ ok 21 - basic atom: head tag ok 22 - basic atom: head tagger ok 6 - commiting the change ok 13 - describe --tags HEAD^^^ ok 7 - checking the commit ok 8 - "git replace" listing and deleting ok 23 - basic atom: head taggername ok 14 - describe --all HEAD ok 8 - checking -k on non-existing file ok 24 - basic atom: head taggeremail ok 9 - checking -k on untracked file ok 15 - describe --all HEAD^ ok 25 - basic atom: head taggerdate ok 10 - checking -k on multiple untracked files ok 26 - basic atom: head creator ok 16 - describe --all HEAD^^^ ok 11 - checking -f on untracked file with existing target ok 27 - basic atom: head creatordate ok 9 - "git replace" replacing ok 17 - describe --long HEAD^^2^ ok 28 - basic atom: head subject ok 18 - describe --long HEAD^^2 ok 12 - adding another file ok 29 - basic atom: head body ok 13 - moving whole subdirectory ok 19 - describe --all A^0 ok 30 - basic atom: head contents ok 20 - no warning was displayed for A ok 21 - rename tag A to Q locally ok 14 - commiting the change ok 31 - basic atom: tag refname ok 22 - describe HEAD ok 32 - basic atom: tag upstream ok 23 - warning was displayed for Q ok 24 - rename tag Q back to A ok 15 - checking the commit ok 33 - basic atom: tag objecttype ok 16 - succeed when source is a prefix of destination ok 17 - moving whole subdirectory into subdirectory ok 25 - pack tag refs ok 34 - basic atom: tag objectsize ok 35 - basic atom: tag objectname ok 18 - commiting the change ok 26 - describe HEAD ok 36 - basic atom: tag tree ok 27 - describe --dirty ok 28 - set-up dirty work tree ok 19 - checking the commit ok 37 - basic atom: tag parent ok 20 - do not move directory over existing directory ok 29 - describe --dirty ok 38 - basic atom: tag numparent ok 21 - move into "." ok 30 - describe --dirty=.mod ok 39 - basic atom: tag object ok 31 - describe --dirty HEAD ok 40 - basic atom: tag type ok 41 - basic atom: tag author ok 42 - basic atom: tag authorname ok 43 - basic atom: tag authoremail ok 10 - create parallel branch without the bug ok 44 - basic atom: tag authordate ok 22 - Michael Cassar's test case ok 45 - basic atom: tag committer ok 32 - set-up matching pattern tests ok 46 - basic atom: tag committername ok 33 - describe --match=test-* ok 47 - basic atom: tag committeremail ok 34 - describe --tags --match=test1-* ok 48 - basic atom: tag committerdate ok 9 - bisect reset removes packed refs ok 11 - push to cloned repo ok 35 - describe --tags --match=test2-* ok 49 - basic atom: tag tag ok 23 - Sergey Vlasov's test case ok 50 - basic atom: tag tagger ok 36 - describe --long --tags --match=test2-* HEAD^ # passed all 36 test(s) 1..36 ok 51 - basic atom: tag taggername ok 52 - basic atom: tag taggeremail ok 24 - absolute pathname ok 53 - basic atom: tag taggerdate *** t7003-filter-branch.sh *** ok 54 - basic atom: tag creator ok 55 - basic atom: tag creatordate ok 56 - basic atom: tag subject ok 57 - basic atom: tag body ok 25 - absolute pathname outside should fail ok 58 - basic atom: tag contents ok 59 - Check invalid atoms names are errors ok 12 - push branch with replacement ok 60 - Check format specifiers are ignored in naming date atoms ok 26 - git mv to move multiple sources into a directory ok 61 - Check valid format specifiers for date fields ok 62 - Check invalid format specifiers are errors ok 27 - git mv should not change sha1 of moved cache entry ok 63 - Check unformatted date fields output ok 13 - fetch branch with replacement ok 64 - Check format "default" formatted date fields output ok 65 - Check format "relative" date fields output ok 28 - git mv should overwrite symlink to a file ok 66 - Check format "short" date fields output ok 67 - Check format "local" date fields output ok 68 - Check format "iso8601" date fields output ok 29 - git mv should overwrite file with a symlink # passed all 29 test(s) 1..29 ok 69 - Check format "rfc2822" date fields output ok 70 - Verify ascending sort *** t7004-tag.sh *** ok 71 - Verify descending sort ok 72 - Quoting style: shell ok 73 - Quoting style: perl ok 74 - Quoting style: python ok 1 - setup ok 75 - Quoting style: tcl ok 76 - more than one quoting style: --perl --shell ok 1 - listing all tags in an empty tree should succeed ok 77 - more than one quoting style: -s --python ok 78 - more than one quoting style: --python --tcl ok 79 - more than one quoting style: --tcl --perl ok 2 - listing all tags in an empty tree should output nothing ok 3 - looking for a tag in an empty tree should fail ok 80 - Check short refname format ok 4 - creating a tag in an empty tree should fail ok 81 - Check short upstream format ok 1 - setup ok 5 - creating a tag for HEAD in an empty tree should fail ok 10 - bisect start: back in good branch ok 82 - Check short objectname format ok 6 - creating a tag for an unknown revision should fail ok 83 - Check for invalid refname format ok 7 - creating a tag using default HEAD should succeed ok 2 - message for merging local branch ok 8 - listing all tags if one exists should succeed ok 9 - listing all tags if one exists should output that tag ok 10 - listing a tag using a matching pattern should succeed ok 84 - Check ambiguous head and tag refs (strict) ok 11 - listing a tag using a matching pattern should output that tag ok 12 - listing tags using a non-matching pattern should suceed ok 85 - Check ambiguous head and tag refs (loose) ok 13 - listing tags using a non-matching pattern should output nothing ok 3 - message for merging external branch ok 14 - trying to create a tag with the name of one existing should fail ok 86 - Check ambiguous head and tag refs II (loose) ok 15 - trying to create a tag with a non-valid name should fail ok 16 - creating a tag using HEAD directly should succeed ok 87 - an unusual tag with an incomplete line # passed all 87 test(s) 1..87 ok 17 - trying to delete an unknown tag should fail *** t7005-editor.sh *** ok 18 - trying to delete tags without params should succeed and do nothing ok 4 - [merge] summary/log configuration ok 19 - deleting two existing tags in one command should succeed ok 1 - determine default editor ok 20 - creating a tag with the name of another deleted one should succeed ok 11 - bisect start: no ".git/BISECT_START" if junk rev ok 21 - trying to delete two tags, existing and not, should fail in the 2nd ok 14 - bisect and replacements ok 22 - trying to delete an already deleted tag should fail ok 2 - setup ok 3 - dumb should error out when falling back on vi ok 15 - index-pack and replacements # passed all 15 test(s) 1..15 ok 5 - fmt-merge-msg -m ok 6 - setup: expected shortlog for two branches ok 4 - dumb should prefer EDITOR to VISUAL *** t7006-pager.sh *** ok 5 - Using vi ok 23 - listing all tags should print them ordered ok 24 - listing tags with substring as pattern must print those matching ok 25 - listing tags with a suffix as pattern must print those matching ok 6 - Using EDITOR ok 26 - listing tags with a prefix as pattern must print those matching ok 2 - rewrite identically ok 1 - determine default pager ok 3 - result is really identical ok 27 - listing tags using a name as pattern must print that one matching ok 2 - set up terminal for tests # no usable terminal, so skipping some tests ok 7 - Using VISUAL ok 28 - listing tags using a name as pattern must print that one matching ok 29 - listing tags with ? in the pattern should print those matching ok 30 - listing tags using v.* should print nothing because none have v. ok 3 - setup ok 4 # skip some commands use a pager (missing TTY) ok 5 # skip pager runs from subdir (missing TTY) ok 6 # skip some commands do not use a pager (missing TTY) ok 8 - Using core_editor ok 31 - listing tags using v* should print only those having v ok 7 - no pager when stdout is a pipe ok 8 - no pager when stdout is a regular file ok 9 # skip git --paginate rev-list uses a pager (missing TTY) ok 10 - no pager even with --paginate when stdout is a pipe ok 11 # skip no pager with --no-pager (missing TTY) ok 12 # skip configuration can disable pager (missing TTY) ok 13 # skip git config uses a pager if configured to (missing TTY) ok 14 # skip configuration can enable pager (from subdir) (missing TTY) ok 32 - a non-annotated tag created without parameters should point to HEAD ok 9 - Using GIT_EDITOR ok 33 - trying to verify an unknown tag should fail ok 15 - tests can detect color ok 34 - trying to verify a non-annotated and non-signed tag should fail ok 35 - trying to verify many non-annotated or unknown tags, should fail ok 10 - Using vi (override) ok 16 - no color when stdout is a regular file ok 17 # skip color when writing to a pager (missing TTY) ok 36 - creating an annotated tag with -m message should succeed ok 11 - Using EDITOR (override) ok 18 - color when writing to a file intended for a pager ok 19 - setup: some aliases ok 20 # skip git log - default pager is used by default (missing SIMPLEPAGERTTY) ok 21 # skip git log - PAGER overrides default pager (missing TTY) ok 12 - bisect start: no ".git/BISECT_START" if mistaken rev ok 22 # skip git log - repository-local core.pager setting overrides PAGER (missing TTY) ok 23 # skip git log - core.pager overrides PAGER from subdirectory (missing TTY) ok 24 # skip git log - GIT_PAGER overrides core.pager (missing TTY) ok 25 # skip git -p log - default pager is used by default (missing SIMPLEPAGERTTY) ok 26 # skip git -p log - PAGER overrides default pager (missing TTY) ok 27 # skip git -p log - repository-local core.pager setting overrides PAGER (missing TTY) ok 37 - creating an annotated tag with -F messagefile should succeed ok 12 - Using VISUAL (override) ok 28 # skip git -p log - core.pager overrides PAGER from subdirectory (missing TTY) ok 29 # skip git -p log - GIT_PAGER overrides core.pager (missing TTY) ok 30 # skip git aliasedlog - default pager is used by default (missing SIMPLEPAGERTTY) ok 31 # skip git aliasedlog - PAGER overrides default pager (missing TTY) ok 32 # skip git aliasedlog - repository-local core.pager setting overrides PAGER (missing TTY) ok 33 # skip git aliasedlog - core.pager overrides PAGER from subdirectory (missing TTY) ok 34 # skip git aliasedlog - GIT_PAGER overrides core.pager (missing TTY) ok 7 - shortlog for two branches ok 35 # skip git -p aliasedlog - default pager is used by default (missing SIMPLEPAGERTTY) ok 36 # skip git -p aliasedlog - PAGER overrides default pager (missing TTY) ok 37 # skip git -p aliasedlog - repository-local core.pager setting overrides PAGER (missing TTY) ok 38 # skip git -p aliasedlog - core.pager overrides PAGER from subdirectory (missing TTY) ok 39 # skip git -p aliasedlog - GIT_PAGER overrides core.pager (missing TTY) ok 40 # skip git -p true - default pager is used by default (missing SIMPLEPAGERTTY) ok 41 # skip git -p true - PAGER overrides default pager (missing TTY) ok 42 # skip git -p true - repository-local core.pager setting overrides PAGER (missing TTY) ok 43 # skip git -p true - core.pager overrides PAGER from subdirectory (missing TTY) ok 44 # skip git -p true - GIT_PAGER overrides core.pager (missing TTY) ok 45 # skip git -p request-pull - default pager is used by default (missing SIMPLEPAGERTTY) ok 46 # skip git -p request-pull - PAGER overrides default pager (missing TTY) ok 47 # skip git -p request-pull - repository-local core.pager setting overrides PAGER (missing TTY) ok 48 # skip git -p request-pull - core.pager overrides PAGER from subdirectory (missing TTY) ok 49 # skip git -p request-pull - GIT_PAGER overrides core.pager (missing TTY) ok 50 # skip git -p - default pager is used by default (missing SIMPLEPAGERTTY) ok 51 # skip git -p - PAGER overrides default pager (missing TTY) ok 52 # skip git -p - repository-local core.pager setting is not used (missing TTY) ok 53 # skip git -p - core.pager is not used from subdirectory (missing TTY) ok 38 - creating an annotated tag with -F - should succeed ok 54 # skip git -p - GIT_PAGER overrides core.pager (missing TTY) ok 55 # skip no pager for 'git -p nonsense' (missing TTY) ok 56 # skip git shortlog - default pager is used by default (missing SIMPLEPAGERTTY) ok 57 # skip git shortlog - PAGER overrides default pager (missing TTY) ok 58 # skip git shortlog - repository-local core.pager setting overrides PAGER (missing TTY) ok 59 # skip git shortlog - core.pager overrides PAGER from subdirectory (missing TTY) ok 60 # skip git shortlog - GIT_PAGER overrides core.pager (missing TTY) ok 13 - Using core_editor (override) ok 61 - setup: configure shortlog not to paginate ok 62 # skip no pager for 'git shortlog' (missing TTY) ok 63 # skip git shortlog - core.pager is not used from subdirectory (missing TTY) ok 64 # skip git -p shortlog - default pager is used by default (missing SIMPLEPAGERTTY) ok 65 # skip git -p shortlog - core.pager overrides PAGER from subdirectory (missing TTY) ok 39 - trying to create a tag with a non-existing -F file should fail ok 66 # skip git -p apply f a ok 6 - git ls-files (absolute) ok 4 - rewrite bare repository identically ok 14 - git grep -F yx a ok 5 - result is really identical ok 7 - git ls-files (relative #1) ok 15 - git grep -Fi Yf a not ok 16 - git grep -Fi Yx a # TODO known breakage ok 8 - git ls-files (relative #2) ok 11 - merge-msg tag ok 17 - git grep yf a not ok 18 - git grep yx a # TODO known breakage ok 9 - git ls-files (relative #3) # still have 3 known breakage(s) # passed all remaining 15 test(s) 1..18 ok 51 - listing the one-line message of a non-signed tag should succeed *** t7011-skip-worktree-reading.sh *** ok 10 - commit using absolute path names ok 12 - merge-msg two tags ok 11 - log using absolute path names ok 14 - bisect skip: successfull result ok 12 - blame using absolute path names ok 13 - setup deeper work tree ok 14 - add a directory outside the work tree ok 52 - listing the zero-lines message of a non-signed tag should succeed ok 15 - add a file outside the work tree, nasty case 1 ok 13 - merge-msg tag and branch ok 1 - setup ok 6 - correct GIT_DIR while using -d ok 16 - add a file outside the work tree, nasty case 2 # passed all 16 test(s) 1..16 *** t7012-skip-worktree-writing.sh *** ok 2 - update-index ok 14 - merge-msg lots of commits # passed all 14 test(s) 1..14 ok 3 - update-index *** t7060-wtstatus.sh *** ok 4 - update-index --remove ok 7 - Fail if commit filter fails ok 1 - setup ok 5 - update-index --remove ok 53 - listing many message lines of a non-signed tag should succeed ok 2 - read-tree updates worktree, absent case ok 6 - ls-files --delete ok 54 - trying to verify an annotated non-signed tag should fail ok 7 - ls-files --delete ok 3 - read-tree updates worktree, dirty case ok 55 - trying to verify a file-annotated non-signed tag should fail ok 8 - ls-files --modified ok 4 - read-tree removes worktree, absent case ok 1 - setup ok 56 - trying to verify two annotated non-signed tags should fail ok 9 - ls-files --modified ok 2 - A/A conflict ok 5 - read-tree removes worktree, dirty case ok 3 - Report path with conflict ok 4 - Report new path with conflict ok 10 - grep with skip-worktree file ok 57 - creating a signed tag with -m message should succeed ok 15 - bisect skip: cannot tell between 3 commits ok 6 - index setup ok 11 - diff-index does not examine skip-worktree absent entries ok 58 - sign with a given key id ok 59 - sign with an unknown id (1) ok 12 - diff-index does not examine skip-worktree dirty entries ok 7 - git-add ignores worktree content ok 60 - sign with an unknown id (2) ok 13 - diff-files does not examine skip-worktree absent entries ok 8 - git-add ignores worktree content ok 61 - -u implies signed tag ok 14 - diff-files does not examine skip-worktree dirty entries ok 5 - M/D conflict does not segfault # passed all 5 test(s) 1..5 ok 9 - git-rm fails if worktree is dirty ok 15 - git-rm succeeds on skip-worktree absent entries *** t7101-reset.sh *** ok 62 - creating a signed tag with -F messagefile should succeed ok 10 - git-clean, absent case ok 16 - commit on skip-worktree absent entries ok 63 - creating a signed tag with -F - should succeed ok 11 - git-clean, dirty case # passed all 11 test(s) 1..11 ok 17 - commit on skip-worktree dirty entries # passed all 17 test(s) 1..17 *** t7102-reset.sh *** ok 1 - creating initial files ok 64 - -s implies annotated tag *** t7103-reset-bare.sh *** ok 65 - trying to create a signed tag with non-existing -F file should fail ok 66 - verifying a signed tag should succeed ok 2 - creating second files ok 3 - resetting tree HEAD^ ok 4 - checking initial files exist after rewind ok 5 - checking lack of path1/path2/COPYING ok 6 - checking lack of path1/COPYING ok 7 - checking lack of COPYING ok 8 - checking checking lack of path1/COPYING-TOO ok 9 - checking lack of path1/path2 ok 10 - checking lack of path1 ok 67 - verifying two signed tags in one command should succeed # passed all 10 test(s) 1..10 ok 1 - setup non-bare *** t7104-reset.sh *** ok 2 - "hard" reset requires a worktree ok 16 - bisect skip: cannot tell between 2 commits ok 3 - "merge" reset requires a worktree ok 4 - "keep" reset requires a worktree ok 5 - "mixed" reset is ok ok 1 - creating initial files and commits ok 6 - "soft" reset is ok ok 7 - hard reset works with GIT_WORK_TREE ok 8 - setup bare ok 2 - giving a non existing revision should fail ok 9 - "hard" reset is not allowed in bare ok 10 - "merge" reset is not allowed in bare ok 1 - setup ok 68 - verifying many signed and non-signed tags should fail ok 11 - "keep" reset is not allowed in bare ok 3 - reset --soft with unmerged index should fail ok 12 - "mixed" reset is not allowed in bare ok 2 - reset --hard should restore unmerged ones ok 13 - "soft" reset is allowed in bare # passed all 13 test(s) 1..13 ok 69 - verifying a forged tag should fail ok 3 - reset --hard did not corrupt index nor cached-tree # passed all 3 test(s) 1..3 *** t7105-reset-patch.sh *** ok 4 - giving paths with options different than --mixed should fail *** t7110-reset-merge.sh *** ok 70 - creating a signed tag with an empty -m message should succeed ok 8 - rewrite, renaming a specific file ok 9 - test that the file was renamed ok 5 - giving unrecognized options should fail ok 71 - creating a signed tag with an empty -F messagefile should succeed ok 1 - setup ok 1 - setup ok 2 - reset --merge is ok with changes in file it does not touch ok 72 - extra blanks in the message for a signed tag should be removed ok 3 - reset --merge is ok when switching back ok 73 - creating a signed tag with a blank -m message should succeed ok 6 - trying to do reset --soft with pending merge should fail ok 4 - reset --keep is ok with changes in file it does not touch ok 74 - creating a signed tag with blank -F file with spaces should succeed ok 5 - reset --keep is ok when switching back ok 75 - creating a signed tag with spaces and no newline should succeed ok 2 - saying "n" does nothing ok 17 - bisect skip: with commit both bad and skipped ok 6 - reset --merge discards changes added to index (1) ok 7 - trying to do reset --soft with pending checkout merge should fail ok 76 - creating a signed tag with a -F file with #comments should succeed ok 7 - reset --merge is ok again when switching back (1) ok 8 - reset --keep fails with changes in index in files it touches ok 77 - creating a signed tag with #commented -m message should succeed ok 9 - reset --merge discards changes added to index (2) ok 78 - creating a signed tag with #commented -F messagefile should succeed ok 3 - git reset -p ok 10 - reset --merge is ok again when switching back (2) ok 79 - creating a signed tag with a #comment and no newline should succeed ok 11 - reset --keep keeps changes it does not touch ok 8 - resetting to HEAD with no changes should succeed and do nothing ok 12 - reset --keep keeps changes when switching back ok 9 - --soft reset only should show changes in diff --cached ok 13 - reset --merge fails with changes in file it touches ok 4 - git reset -p HEAD^ ok 80 - listing the one-line message of a signed tag should succeed ok 14 - reset --keep fails with changes in file it touches ok 10 - changing files and redo the last commit should succeed ok 18 - "git bisect run" simple case ok 11 - --hard reset should change the files and undo commits permanently ok 81 - listing the zero-lines message of a signed tag should succeed ok 12 - redoing changes adding them without commit them should succeed ok 15 - setup 3 different branches ok 10 - rewrite, renaming a specific directory ok 11 - test that the directory was renamed ok 5 - git reset -p dir ok 13 - --mixed reset to HEAD should unadd the files ok 16 - "reset --merge HEAD^" is ok with pending merge ok 17 - "reset --keep HEAD^" fails with pending merge ok 14 - redoing the last two commits should succeed ok 18 - "reset --merge HEAD" is ok with pending merge ok 19 - "reset --keep HEAD" fails with pending merge ok 19 - "git bisect run" with more complex "git bisect start" ok 82 - listing many message lines of a signed tag should succeed ok 6 - git reset -p -- foo (inside dir) ok 20 - --merge is ok with added/deleted merge ok 83 - creating a signed tag pointing to a tree should succeed ok 12 - rewrite one branch, keeping a side branch ok 21 - --keep fails with added/deleted merge # passed all 21 test(s) 1..21 ok 13 - common ancestor is still common (unchanged) ok 84 - creating a signed tag pointing to a blob should succeed ok 15 - --hard reset to HEAD should clear a failed merge *** t7111-reset-table.sh *** ok 85 - creating a signed tag pointing to another tag should succeed ok 86 - creating a signed tag with rfc1991 ok 7 - git reset -p HEAD^ -- dir ok 8 - none of this moved HEAD # passed all 8 test(s) 1..8 ok 87 - reediting a signed tag body omits signature *** t7201-co.sh *** ok 88 - verifying rfc1991 signature ok 1 - creating initial commits ok 89 - list tag with rfc1991 signature ok 90 - verifying rfc1991 signature without --rfc1991 ok 2 - check: A B C D --soft A B D ok 16 - --hard reset to ORIG_HEAD should clear a fast-forward merge ok 91 - list tag with rfc1991 signature without --rfc1991 ok 3 - check: A B C D --mixed A D D ok 92 - reediting a signed tag body omits signature ok 17 - test --mixed ok 93 - git tag -s fails if gpg is misconfigured ok 1 - setup ok 20 - bisect skip: add line and then a new test ok 94 - verify signed tag fails when public key is not present ok 4 - check: A B C D --hard D D D ok 95 - git tag -a fails if tag annotation is empty ok 18 - test resetting the index at give paths ok 2 - checkout from non-existing branch ok 5 - check: A B C D --merge XXXXX ok 96 - message in editor has initial comment ok 3 - checkout with dirty tree without -m ok 14 - filter subdirectory only ok 19 - resetting an unmodified path is a no-op ok 6 - check: A B C D --keep XXXXX ok 4 - checkout with unrelated dirty tree without -m ok 20 - --mixed refreshes the index ok 97 - overwriting an annoted tag should use its previous body ok 15 - subdirectory filter result looks okay ok 98 - filename for the message is relative to cwd ok 21 - disambiguation (1) ok 7 - check: A B C C --soft A B C ok 99 - filename for the message is relative to cwd ok 22 - disambiguation (2) ok 5 - checkout -m with dirty tree ok 100 - creating second commit and tag ok 8 - check: A B C C --mixed A C C ok 16 - more setup ok 23 - disambiguation (3) ok 101 - creating third commit without tag ok 6 - checkout -m with dirty tree, renamed ok 24 - disambiguation (4) ok 102 - checking that first commit is in all tags (hash) # passed all 24 test(s) 1..24 ok 9 - check: A B C C --hard C C C ok 103 - checking that first commit is in all tags (tag) ok 21 - bisect skip and bisect replay ok 104 - checking that first commit is in all tags (relative) *** t7400-submodule-basic.sh *** ok 10 - check: A B C C --merge XXXXX ok 105 - checking that second commit only has one tag ok 7 - checkout -m with merge conflict ok 106 - checking that third commit has no tags ok 11 - check: A B C C --keep A C C ok 8 - format of merge conflict from checkout -m ok 107 - creating simple branch ok 1 - setup - initial commit ok 108 - checking that branch head only has one tag ok 12 - check: B B C D --soft B B D ok 9 - checkout --merge --conflict=diff3 ok 109 - merging original branch into this branch ok 2 - setup - repository in init subdirectory ok 110 - checking that original branch head has one tag now ok 3 - setup - commit with gitlink ok 4 - setup - hide init subdirectory ok 13 - check: B B C D --mixed B D D ok 111 - checking that initial commit is in all tags ok 10 - checkout to detach HEAD (with advice declined) ok 5 - setup - repository to add submodules to ok 112 - mixing incompatibles modes and options is forbidden # passed all 112 test(s) 1..112 ok 14 - check: B B C D --hard D D D ok 11 - checkout to detach HEAD *** t7401-submodule-summary.sh *** ok 15 - check: B B C D --merge D D D ok 16 - check: B B C D --keep XXXXX ok 12 - checkout to detach HEAD with branchname^ ok 22 - bisect run & skip: cannot tell between 2 ok 17 - check: B B C C --soft B B C ok 13 - checkout to detach HEAD with :/message ok 18 - check: B B C C --mixed B C C ok 14 - checkout to detach HEAD with HEAD^0 ok 6 - submodule add ok 19 - check: B B C C --hard C C C ok 15 - checkout with ambiguous tag/branch names ok 1 - added submodule ok 7 - submodule add to .gitignored path fails ok 20 - check: B B C C --merge C C C ok 21 - check: B B C C --keep B C C ok 16 - checkout with ambiguous tag/branch names ok 22 - check: B C C D --soft B C D ok 2 - modified submodule(forward) ok 8 - submodule add to .gitignored path with --force ok 17 - switch branches while in subdirectory ok 23 - check: B C C D --mixed B D D ok 18 - checkout specific path while in subdirectory ok 3 - modified submodule(forward), --files ok 24 - check: B C C D --hard D D D ok 25 - check: B C C D --merge XXXXX ok 19 - checkout w/--track sets up tracking ok 26 - check: B C C D --keep XXXXX ok 20 - checkout w/autosetupmerge=always sets up tracking ok 27 - check: B C C C --soft B C C ok 4 - modified submodule(backward) ok 28 - check: B C C C --mixed B C C ok 21 - checkout w/--track from non-branch HEAD fails ok 23 - bisect run & skip: find first bad ok 9 - submodule add --branch ok 29 - check: B C C C --hard C C C ok 22 - detach a symbolic link HEAD ok 30 - check: B C C C --merge B C C ok 31 - check: B C C C --keep B C C ok 5 - modified submodule(backward and forward) ok 17 - use index-filter to move into a subdirectory ok 32 - setting up branches to test with unmerged entries ok 6 - --summary-limit ok 33 - check: X U B C --soft XXXXX ok 18 - stops when msg filter fails ok 10 - submodule add with ./ in path ok 23 - checkout with --track fakes a sensible -b ok 24 - checkout with --track, but without -b, fails with too short tracked name ok 34 - check: X U B C --mixed X C C ok 7 - typechanged submodule(submodule->blob), --cached ok 25 - checkout an unmerged path should fail ok 35 - check: X U B C --hard C C C ok 26 - checkout with an unmerged path can be ignored ok 36 - check: X U B C --merge C C C ok 24 - bisect skip only one range ok 8 - typechanged submodule(submodule->blob), --files ok 37 - check: X U B C --keep XXXXX ok 38 - check: X U B B --soft XXXXX ok 27 - checkout unmerged stage ok 9 - typechanged submodule(submodule->blob) ok 39 - check: X U B B --mixed X B B ok 28 - checkout with --merge ok 11 - submodule add with // in path ok 40 - check: X U B B --hard B B B ok 29 - checkout with --merge, in diff3 -m style ok 41 - check: X U B B --merge B B B ok 10 - nonexistent commit ok 30 - checkout --conflict=merge, overriding config ok 42 - check: X U B B --keep XXXXX # passed all 42 test(s) 1..42 *** t7402-submodule-rebase.sh *** ok 31 - checkout --conflict=diff3 ok 11 - typechanged submodule(blob->submodule) ok 25 - bisect skip many ranges ok 32 - failing checkout -b should not break working tree ok 12 - submodule add with /.. in path ok 33 - switch out of non-branch ok 12 - deleted submodule ok 1 - setup ok 26 - bisect starting with a detached HEAD ok 13 - multiple submodules ok 34 - custom merge driver with checkout -m # passed all 34 test(s) 1..34 ok 14 - path filter *** t7403-submodule-sync.sh *** ok 13 - submodule add with ./, /.. and // in path ok 15 - given commit ok 14 - setup - add an example entry to .gitmodules ok 27 - bisect errors out if bad and good are mistaken ok 19 - author information is preserved ok 15 - status should fail for unmapped paths ok 16 - setup - map path in .gitmodules ok 16 - --for-status ok 2 - rebase with a dirty submodule ok 17 - status should only print one line ok 18 - setup - fetch commit name from submodule ok 17 - fail when using --files together with --cached ok 19 - status should initially be "missing" ok 18 - should not fail in an empty repo # passed all 18 test(s) 1..18 *** t7405-submodule-merge.sh *** ok 20 - init should register submodule url in .git/config ok 3 - interactive rebase with a dirty submodule ok 21 - update should fail when path is used by a file ok 4 - rebase with dirty file and submodule fails ok 28 - bisect does not create a "bisect" branch ok 22 - update should fail when path is used by a nonempty directory ok 1 - setup ok 2 - change submodule ok 1 - setup ok 29 - side branch creation ok 23 - update should work when path is an empty dir ok 3 - change submodule url ok 24 - status should be "up-to-date" after update ok 5 - stash with a dirty submodule # passed all 5 test(s) 1..5 *** t7406-submodule-update.sh *** ok 2 - setup for merge search ok 25 - status should be "modified" after submodule commit ok 30 - good merge base when good and bad are siblings ok 3 - merge with one side as a fast-forward of the other ok 4 - merging should conflict for non fast-forward ok 26 - the --cached sha1 should be rev1 ok 27 - git diff should report the SHA1 of the new submodule commit ok 5 - merging should fail for ambiguous common parent ok 4 - "git submodule sync" should update submodule URLs ok 28 - update should checkout rev1 ok 6 - merging should fail for changes that are backwards ok 31 - skipped merge base when good and bad are siblings ok 20 - remove a certain author's commits ok 29 - status should be "up-to-date" after update ok 7 - merging with a modify/modify conflict between merge bases # passed all 7 test(s) 1..7 ok 30 - checkout superproject with subproject already present ok 5 - "git submodule sync" should update submodule URLs if not yet cloned # passed all 5 test(s) 1..5 *** t7407-submodule-foreach.sh *** *** t7408-submodule-reference.sh *** ok 31 - apply submodule diff ok 21 - barf on invalid name ok 1 - preparing first repository ok 32 - bad merge base when good and bad are siblings ok 32 - update --init ok 33 - many merge bases creation ok 33 - do not add files from a submodule ok 22 - "map" works in commit filter ok 2 - preparing second repository ok 34 - gracefully add submodule with a trailing slash ok 3 - preparing supermodule ok 35 - ls-files gracefully handles trailing slash ok 36 - moving to a commit without submodule does not leave empty dir ok 37 - submodule warns ok 4 - submodule add --reference ok 5 - after add: existence of info/alternates ok 1 - setup a submodule tree ok 6 - that reference gets used with add ok 34 - good merge bases when good and bad are siblings ok 7 - cloning supermodule ok 23 - Name needing quotes ok 2 - submodule update detaching the HEAD ok 8 - update with reference ok 9 - after update: existence of info/alternates ok 10 - that reference gets used with update # passed all 10 test(s) 1..10 ok 38 - add submodules without specifying an explicit path # passed all 38 test(s) 1..38 *** t7500-commit.sh *** ok 1 - a basic commit in an empty tree should succeed *** t7501-commit.sh *** ok 3 - submodule update --rebase staying on master ok 2 - nonexistent template file should return error ok 35 - optimized merge base checks ok 3 - nonexistent template file in config should return error ok 4 - unedited template should not commit ok 5 - unedited template with comments should not commit ok 1 - initial status ok 2 - fail initial amend ok 1 - setup a submodule tree ok 6 - a Signed-off-by line by itself should not commit ok 3 - initial commit ok 4 - invalid options 1 ok 24 - Subdirectory filter with disappearing trees ok 7 - adding comments to a template should not commit ok 5 - invalid options 2 ok 6 - using paths with -a ok 7 - using paths with --interactive ok 8 - using invalid commit with -C ok 8 - adding real content to a template should commit ok 9 - testing nothing to commit ok 10 - next commit ok 11 - commit message from non-existing file ok 12 - empty commit message ok 4 - submodule update --merge staying on master ok 9 - -t option should be short for --template ok 13 - commit message from file ok 14 - amend commit ok 15 - passing -m and -F ok 16 - using message from other commit ok 10 - config-specified template should commit ok 17 - editing message from other commit ok 11 - explicit commit message should override template ok 18 - message from stdin ok 19 - overriding author from command line ok 20 - commit --author output mentions author ok 12 - commit message from file should override template ok 36 - "parallel" side branch creation ok 13 - using alternate GIT_INDEX_FILE (1) ok 14 - using alternate GIT_INDEX_FILE (2) ok 15 - --signoff ok 21 - interactive add ok 5 - submodule update - rebase in .git/config ok 25 - Tag name filtering retains tag message ok 16 - commit message from file (1) ok 22 - showing committed revisions ok 17 - commit message from file (2) ok 18 - commit message from stdin ok 23 - editor not invoked if -F is given ok 24 - validate git rev-list output. ok 19 - commit -F overrides -t ok 20 - Commit without message is allowed with --allow-empty-message ok 25 - partial commit that involves removal (1) ok 21 - Commit without message is no-no without --allow-empty-message ok 37 - restricting bisection on one dir ok 26 - partial commit that involves removal (2) ok 22 - Commit a message with --allow-empty-message # passed all 22 test(s) 1..22 ok 27 - partial commit that involves removal (3) *** t7502-commit.sh *** ok 2 - test basic "submodule foreach" usage ok 28 - amend commit to fix author ok 29 - amend commit to fix date ok 6 - submodule update - checkout in .git/config but --rebase given ok 30 - sign off (1) ok 1 - output summary format ok 31 - sign off (2) ok 26 - Tag name filtering strips gpg signature ok 2 - output summary format for commit with an empty diff ok 32 - signoff gap ok 33 - signoff gap 2 ok 7 - submodule update - merge in .git/config ok 34 - multiple -m ok 35 - amend commit to fix author ok 36 - git commit with dirty index ok 3 - output summary format for merges ok 37 - same tree (single parent) ok 38 - same tree (single parent) --allow-empty ok 8 - submodule update - checkout in .git/config but --merge given ok 4 - the basics ok 5 - partial ok 38 - restricting bisection on one dir and a file ok 39 - same tree (merge and amend merge) ok 6 - partial modification in a subdirectory ok 7 - partial removal ok 27 - Tag name filtering allows slashes in tag names ok 8 - sign off ok 40 - amend using the message from another commit ok 9 - submodule update - checkout in .git/config ok 9 - multiple -m ok 10 - verbose ok 11 - verbose respects diff config ok 41 - amend using the message from a commit named with tag ok 12 - cleanup commit messages (verbatim,-t) ok 10 - submodule init picks up rebase ok 13 - cleanup commit messages (verbatim,-F) ok 14 - cleanup commit messages (verbatim,-m) ok 42 - amend can copy notes # passed all 42 test(s) 1..42 ok 15 - cleanup commit messages (whitespace,-F) ok 16 - cleanup commit messages (strip,-F) ok 11 - submodule init picks up merge *** t7503-pre-commit-hook.sh *** # passed all 11 test(s) 1..11 ok 17 - cleanup commit messages (strip,-F,-e) ok 18 - author different from committer ok 39 - skipping away from skipped commit ok 19 - committer is automatic *** t7504-commit-msg-hook.sh *** ok 1 - with no hook ok 2 - --no-verify with no hook ok 3 - with succeeding hook ok 1 - with no hook ok 4 - --no-verify with succeeding hook ok 28 - Prune empty commits ok 20 - do not fire editor in the presence of conflicts ok 5 - with failing hook ok 2 - with no hook (editor) ok 21 - a SIGTERM should break locks ok 6 - --no-verify with failing hook ok 40 - erroring out when using bad path parameters # passed all 40 test(s) 1..40 ok 3 - --no-verify with no hook ok 7 - with non-executable hook ok 4 - --no-verify with no hook (editor) *** t7505-prepare-commit-msg-hook.sh *** ok 8 - --no-verify with non-executable hook # passed all 8 test(s) 1..8 *** t7506-status-submodule.sh *** ok 5 - with succeeding hook ok 3 - setup nested submodules ok 6 - with succeeding hook (editor) ok 1 - with no hook ok 22 - Hand committing of a redundant merge removes dups ok 7 - --no-verify with succeeding hook ok 23 - A single-liner subject with a token plus colon is not a footer ok 8 - --no-verify with succeeding hook (editor) ok 2 - with hook (-m) ok 9 - with failing hook ok 1 - setup ok 24 - commit ok 2 - status clean ok 10 - with failing hook (editor) ok 3 - with hook (-m editor) ok 3 - commit --dry-run -a clean ok 11 - --no-verify with failing hook ok 25 - commit ok 4 - status with modified file in submodule ok 4 - with hook (-t) ok 12 - --no-verify with failing hook (editor) ok 5 - status with modified file in submodule (porcelain) ok 26 - commit --status ok 13 - with non-executable hook ok 5 - with hook (-F) ok 6 - status with added file in submodule ok 14 - with non-executable hook (editor) ok 27 - commit --no-status ok 15 - --no-verify with non-executable hook ok 7 - status with added file in submodule (porcelain) ok 6 - with hook (-F editor) ok 8 - status with untracked file in submodule ok 16 - --no-verify with non-executable hook (editor) ok 9 - status -uno with untracked file in submodule ok 28 - commit with commit.status = yes ok 10 - status with untracked file in submodule (porcelain) ok 7 - with hook (-C) ok 29 - --remap-to-ancestor with filename filters ok 17 - hook edits commit message ok 11 - status with added and untracked file in submodule ok 29 - commit with commit.status = no ok 8 - with hook (editor) ok 18 - hook edits commit message (editor) ok 12 - status with added and untracked file in submodule (porcelain) ok 19 - hook doesn't edit commit message ok 30 - commit --status with commit.status = yes ok 13 - status with modified file in modified submodule ok 9 - with hook (--amend) ok 20 - hook doesn't edit commit message (editor) # passed all 20 test(s) 1..20 ok 14 - status with modified file in modified submodule (porcelain) ok 15 - status with added file in modified submodule ok 10 - with hook (-c) ok 11 - with failing hook ok 31 - commit --no-status with commit.status = yes ok 16 - status with added file in modified submodule (porcelain) *** t7507-commit-verbose.sh *** ok 12 - with failing hook (--no-verify) # passed all 12 test(s) 1..12 ok 17 - status with untracked file in modified submodule *** t7508-status.sh *** ok 18 - status with untracked file in modified submodule (porcelain) ok 32 - commit --status with commit.status = no ok 19 - status with added and untracked file in modified submodule ok 1 - setup ok 33 - commit --no-status with commit.status = no ok 2 - initial commit shows verbose diff ok 20 - status with added and untracked file in modified submodule (porcelain) ok 3 - second commit ok 21 - setup .git file for sub ok 1 - setup ok 34 - commit ok 2 - status (1) ok 3 - status (2) ok 4 - verbose diff is stripped out ok 22 - status with added file in modified submodule with .git file ok 23 - rm submodule contents ok 4 - status (advice.statusHints false) ok 24 - status clean (empty submodule dir) ok 35 - commit ok 25 - status -a clean (empty submodule dir) ok 5 - status -s ok 5 - verbose diff is stripped out (mnemonicprefix) # passed all 25 test(s) 1..25 ok 6 - status -s -b ok 6 - diff in message is retained without -v *** t7509-commit.sh *** ok 7 - status -uno ok 36 - commit --status ok 8 - status (status.showUntrackedFiles no) not ok 7 - diff in message is retained with -v # TODO known breakage # still have 1 known breakage(s) # passed all remaining 6 test(s) 1..7 ok 9 - status -uno (advice.statusHints false) *** t7600-merge.sh *** ok 37 - commit --no-status ok 10 - status -s -uno ok 11 - status -s (status.showUntrackedFiles no) ok 30 - automatic remapping to ancestor with filename filters ok 12 - status -unormal ok 1 - set up test data and helpers ok 38 - commit with commit.status = yes ok 13 - status (status.showUntrackedFiles normal) ok 1 - -C option copies authorship and message ok 14 - status -s -unormal ok 15 - status -s (status.showUntrackedFiles normal) ok 39 - commit with commit.status = no ok 16 - status -uall ok 2 - -C option copies only the message with --reset-author ok 17 - status (status.showUntrackedFiles all) ok 3 - -c option copies authorship and message ok 40 - commit --status with commit.status = yes ok 18 - status -s -uall ok 19 - status -s (status.showUntrackedFiles all) ok 4 - -c option copies only the message with --reset-author ok 4 - use "submodule foreach" to checkout 2nd level submodule ok 20 - status with relative paths ok 41 - commit --no-status with commit.status = yes ok 21 - status -s with relative paths ok 22 - status --porcelain ignores relative paths setting ok 5 - --amend option copies authorship ok 23 - setup unique colors ok 2 - setup ok 24 - status with color.ui ok 42 - commit --status with commit.status = no ok 25 - status with color.status ok 3 - test option parsing ok 6 - --amend option with empty author ok 4 - reject non-strategy with a git-merge-foo name ok 26 - status -s with color.ui ok 43 - commit --no-status with commit.status = no # passed all 43 test(s) 1..43 ok 31 - setup submodule ok 27 - status -s with color.status ok 28 - status -s -b with color.status *** t7601-merge-pull-config.sh *** ok 5 - merge c0 with c1 ok 7 - --amend option with missing author ok 29 - status --porcelain ignores color.ui ok 30 - status --porcelain ignores color.status ok 8 - --reset-author makes the commit ours even with --amend option ok 31 - status --porcelain ignores -b ok 6 - merge c0 with c1 with --ff-only ok 9 - --reset-author and --author are mutually exclusive ok 32 - status without relative paths ok 10 - --reset-author should be rejected without -c/-C/--amend # passed all 10 test(s) 1..10 ok 33 - status -s without relative paths ok 34 - dry-run of partial commit excluding new file in index *** t7602-merge-octopus-many.sh *** ok 35 - status refreshes the index ok 7 - merge from unborn branch ok 36 - setup status submodule summary ok 1 - setup ok 37 - status submodule summary is disabled by default ok 38 - status --untracked-files=all does not show submodule ok 2 - merge c1 with c2 ok 39 - status -s submodule summary is disabled by default ok 8 - merge c1 with c2 ok 40 - status -s --untracked-files=all does not show submodule ok 3 - merge c1 with c2 (ours in pull.twohead) ok 4 - merge c1 with c2 and c3 (recursive in pull.octopus) ok 32 - rewrite submodule with another content ok 41 - status submodule summary ok 42 - status -s submodule summary ok 9 - merge c1 with c2 and c3 ok 10 - failing merges with --ff-only ok 5 - merge c1 with c2 and c3 (recursive and octopus in pull.octopus) ok 11 - merge c0 with c1 (no-commit) ok 12 - merge c1 with c2 (no-commit) ok 6 - setup conflicted merge ok 5 - use "foreach --recursive" to checkout all submodules ok 43 - status submodule summary (clean submodule) ok 44 - status -s submodule summary (clean submodule) ok 13 - merge c1 with c2 and c3 (no-commit) ok 14 - merge c0 with c1 (squash) ok 33 - replace submodule revision ok 6 - test messages from "foreach --recursive" # passed all 33 test(s) 1..33 ok 15 - merge c0 with c1 (squash, ff-only) *** t7603-merge-reduce-heads.sh *** ok 7 - merge picks up the best result ok 45 - commit --dry-run submodule summary (--amend) ok 46 # skip status succeeds in a read-only repository (missing SANITY of POSIXPERM,SANITY) ok 16 - merge c1 with c2 (squash) ok 17 - unsuccesful merge of c1 with c2 (squash, ff-only) ok 7 - test "foreach --quiet --recursive" ok 47 - --ignore-submodules=untracked suppresses submodules with untracked content ok 18 - merge c1 with c2 and c3 (squash) ok 8 - merge picks up the best result (from config) ok 1 - setup ok 9 - merge errors out on invalid strategy ok 19 - merge c1 with c2 (no-commit in config) ok 10 - merge errors out on invalid strategy # passed all 10 test(s) 1..10 *** t7604-merge-custom-message.sh *** ok 20 - merge c1 with c2 (squash in config) ok 2 - merge c1 with c2, c3, c4, c5 ok 21 - override config option -n with --summary ok 1 - setup ok 22 - override config option -n with --stat ok 2 - merge c2 with a custom message ok 48 - .gitmodules ignore=untracked suppresses submodules with untracked content ok 1 - setup ok 3 - merge --log appends to custom message # passed all 3 test(s) 1..3 *** t7605-merge-resolve.sh *** ok 23 - override config option --stat ok 3 - setup ok 49 - .git/config ignore=untracked suppresses submodules with untracked content ok 24 - merge c1 with c2 (override --no-commit) ok 4 - merge E and I ok 1 - setup ok 25 - merge c1 with c2 (override --squash) ok 5 - verify merge result ok 50 - --ignore-submodules=dirty suppresses submodules with untracked content ok 26 - merge c0 with c1 (no-ff) ok 2 - merge c1 to c2 ok 6 - add conflicts ok 27 - combining --squash and --no-ff is refused ok 28 - combining --ff-only and --no-ff is refused ok 3 - merge c2 to c3 (fails) ok 29 - merge c0 with c1 (ff overrides no-ff) # passed all 3 test(s) 1..3 *** t7606-merge-custom.sh *** ok 7 - merge E2 and I2, causing a conflict and resolve it ok 1 - set up custom strategy ok 8 - verify merge result # passed all 8 test(s) 1..8 ok 30 - merge log message *** t7607-merge-overwrite.sh *** ok 8 - use "update --recursive" to checkout all submodules ok 2 - setup ok 51 - .gitmodules ignore=dirty suppresses submodules with untracked content ok 31 - merge c1 with c0, c2, c0, and c1 ok 1 - setup ok 3 - merge c2 with a custom strategy ok 2 - will not overwrite untracked file ok 3 - will overwrite tracked file ok 52 - .git/config ignore=dirty suppresses submodules with untracked content ok 32 - merge c1 with c0, c2, c0, and c1 ok 4 - will not overwrite new file ok 4 - trivial merge with custom strategy # passed all 4 test(s) 1..4 ok 5 - will not overwrite staged changes *** t7608-merge-messages.sh *** ok 6 - will not overwrite removed file ok 33 - merge c1 with c1 and c2 ok 53 - --ignore-submodules=dirty suppresses submodules with modified content ok 7 - will not overwrite re-added file ok 34 - merge fast-forward in a dirty tree ok 9 - test "status --recursive" ok 8 - will not overwrite removed file with staged changes ok 35 - in-index merge ok 9 - will not overwrite untracked subtree ok 36 - refresh the index before merging ok 1 - merge local branch ok 10 - will not overwrite untracked file in leading path ok 54 - .gitmodules ignore=dirty suppresses submodules with modified content not ok 11 - will not overwrite untracked symlink in leading path # TODO known breakage ok 12 - will not be confused by symlink in leading path ok 13 - will not overwrite untracked file on unborn branch # still have 1 known breakage(s) # passed all remaining 12 test(s) 1..13 ok 2 - merge octopus branches *** t7609-merge-co-error-msgs.sh *** ok 37 - merge early part of c2 ok 2 - merge c1 with c2, c3, c4, ... c29 ok 38 - merge --no-ff --no-commit && commit ok 55 - .git/config ignore=dirty suppresses submodules with modified content ok 3 - merge tag ok 39 - amending no-ff merge commit # passed all 39 test(s) 1..39 ok 3 - merge output uses pretty names ok 1 - setup *** t7610-mergetool.sh *** ok 4 - merge up-to-date output uses pretty names ok 2 - untracked files overwritten by merge (fast and non-fast forward) ok 4 - ambiguous tag ok 3 - untracked files or local changes ovewritten by merge ok 56 - --ignore-submodules=untracked doesn't suppress submodules with modified content ok 5 - merge fast-forward output uses pretty names # passed all 5 test(s) 1..5 ok 4 - cannot switch branches because of local changes ok 5 - not uptodate file porcelain checkout error *** t7700-repack.sh *** ok 1 - setup ok 5 - remote branch # passed all 5 test(s) 1..5 *** t7701-repack-unpack-unreachable.sh *** ok 57 - .gitmodules ignore=untracked doesn't suppress submodules with modified content ok 6 - not_uptodate_dir porcelain checkout error # passed all 6 test(s) 1..6 *** t7800-difftool.sh *** ok 1 - objects in packs marked .keep are not repacked ok 1 - setup ok 58 - .git/config ignore=untracked doesn't suppress submodules with modified content ok 2 - loose objects in alternate ODB are not repacked ok 59 - --ignore-submodules=untracked doesn't suppress submodule summary ok 10 - use "git clone --recursive" to checkout all submodules # passed all 10 test(s) 1..10 ok 2 - custom mergetool ok 1 - -A with -d option leaves unreachable objects unpacked ok 3 - packed obs in alt ODB are repacked even when local repo is packless ok 60 - .gitmodules ignore=untracked doesn't suppress submodule summary ok 2 - custom commands ok 2 - -A without -d option leaves unreachable objects packed ok 3 - difftool ignores bad --tool values ok 4 - packed obs in alt ODB are repacked when local repo has packs *** t7810-grep.sh *** ok 3 - unpacked objects receive timestamp of pack file # passed all 3 test(s) 1..3 *** t7811-grep-open.sh *** ok 61 - .git/config ignore=untracked doesn't suppress submodule summary ok 1 - setup ok 2 - grep should not segfault with a bad input ok 3 - grep -w HEAD ok 4 - grep -w HEAD (w) ok 1 - determine default pager ok 5 - grep -w HEAD (x) ok 5 - packed obs in alternate ODB kept pack are repacked ok 6 - grep -w HEAD (y-1) ok 7 - grep -w HEAD (y-2) ok 8 - grep -w HEAD (z) ok 4 - difftool honors --gui ok 9 - grep HEAD (t-1) ok 3 - mergetool crlf ok 10 - grep HEAD (t-2) ok 11 - grep HEAD (t-3) ok 6 - packed unreachable obs in alternate ODB are not loosened ok 12 - grep -c HEAD (no /dev/null) ok 13 - grep --max-depth -1 HEAD ok 14 - grep --max-depth 0 HEAD ok 62 - --ignore-submodules=dirty doesn't suppress submodule summary ok 2 - setup ok 15 - grep --max-depth 0 -- '*' HEAD ok 16 - grep --max-depth 1 HEAD ok 3 - git grep -O ok 7 - local packed unreachable obs that exist in alternate ODB are not loosened ok 17 - grep --max-depth 0 -- t HEAD ok 4 - git grep -O --cached ok 18 - grep -w in working tree ok 19 - grep -w in working tree (w) ok 5 - git grep -O --no-index ok 6 - setup: fake "less" ok 20 - grep -w in working tree (x) ok 21 - grep -w in working tree (y-1) ok 22 - grep -w in working tree (y-2) ok 23 - grep -w in working tree (z) ok 7 - git grep -O jumps to line in less ok 24 - grep in working tree (t-1) ok 25 - grep in working tree (t-2) ok 4 - mergetool in subdir ok 26 - grep in working tree (t-3) ok 8 - modified file ok 5 - difftool --gui works without configured diff.guitool ok 27 - grep -c in working tree (no /dev/null) ok 28 - grep --max-depth -1 in working tree ok 29 - grep --max-depth 0 in working tree ok 30 - grep --max-depth 0 -- '*' in working tree ok 8 - objects made unreachable by grafts only are kept ok 31 - grep --max-depth 1 in working tree # passed all 8 test(s) 1..8 ok 32 - grep --max-depth 0 -- t in working tree ok 63 - .gitmodules ignore=dirty doesn't suppress submodule summary ok 9 - copes with color settings *** t8001-annotate.sh *** ok 33 - grep -e A --and -e B ok 34 - grep ( -e A --or -e B ) --and -e B ok 35 - grep -e A --and --not -e B ok 10 - run from subdir # passed all 10 test(s) 1..10 ok 36 - grep should ignore GREP_OPTIONS ok 37 - grep -f, non-existent file *** t8002-blame.sh *** ok 38 - grep -f, one pattern ok 1 - prepare reference tree ok 39 - grep -f, multiple patterns ok 2 - check all lines blamed on A ok 40 - grep -f, ignore empty lines ok 3 - Setup new lines blamed on B ok 41 - grep -q, silently report matches ok 4 - Two lines blamed on A, two on B ok 1 - prepare reference tree ok 6 - GIT_DIFF_TOOL variable ok 5 - merge-setup part 1 ok 2 - check all lines blamed on A ok 3 - Setup new lines blamed on B ok 6 - Two lines blamed on A, two on B, two on B1 ok 4 - Two lines blamed on A, two on B ok 7 - merge-setup part 2 ok 5 - merge-setup part 1 ok 64 - .git/config ignore=dirty doesn't suppress submodule summary ok 8 - Two lines blamed on A, one on B, one on B2 ok 6 - Two lines blamed on A, two on B, two on B1 ok 65 - --ignore-submodules=all suppresses submodule summary ok 5 - mergetool on file in parent dir ok 7 - merge-setup part 2 ok 8 - Two lines blamed on A, one on B, one on B2 ok 9 - merge-setup part 3 ok 10 - Two lines blamed on A, one on B, two on B1, one on B2 ok 11 - Annotating an old revision works ok 6 - mergetool skips autoresolved ok 12 - Annotating an old revision works ok 42 - grep -C1, hunk mark between files ok 9 - merge-setup part 3 ok 13 - merge-setup part 4 ok 43 - grep -C1 hunk mark between files ok 10 - Two lines blamed on A, one on B, two on B1, one on B2 ok 14 - Two lines blamed on A, one on B, two on B1, one on B2, one on A U Thor ok 11 - Annotating an old revision works ok 15 - an incomplete line added ok 12 - Annotating an old revision works ok 16 - With incomplete lines. ok 13 - merge-setup part 4 not ok 66 - .gitmodules ignore=all suppresses submodule summary # TODO known breakage ok 17 - some edit ok 14 - Two lines blamed on A, one on B, two on B1, one on B2, one on A U Thor ok 18 - some edit ok 15 - an incomplete line added ok 16 - With incomplete lines. ok 19 - Annotating an old revision works # passed all 19 test(s) 1..19 ok 17 - some edit ok 7 - GIT_DIFF_TOOL overrides *** t8003-blame.sh *** ok 18 - some edit # passed all 18 test(s) 1..18 ok 44 - log grep setup ok 45 - log grep (1) *** t8004-blame.sh *** ok 46 - log grep (2) ok 47 - log grep (3) ok 48 - log grep (4) ok 49 - log grep (5) ok 50 - log grep (6) ok 51 - log --grep --author implicitly uses all-match ok 52 - grep with CE_VALID file not ok 67 - .git/config ignore=all suppresses submodule summary # TODO known breakage # still have 2 known breakage(s) # passed all remaining 65 test(s) 1..67 ok 53 - grep -p with userdiff *** t8005-blame-i18n.sh *** ok 1 - setup ok 54 - grep -p ok 2 - straight copy without -C ok 8 - GIT_DIFFTOOL_NO_PROMPT variable ok 3 - straight move without -C ok 55 - grep -p -B5 ok 4 - straight copy with -C ok 56 - grep from a subdirectory to search wider area (1) ok 5 - straight move with -C ok 6 - straight copy with -C -C ok 57 - grep from a subdirectory to search wider area (2) ok 7 - straight move with -C -C ok 7 - mergetool merges all from subdir # passed all 7 test(s) 1..7 ok 8 - append without -C ok 58 - grep -Fi ok 9 - append with -C ok 1 - setup first case ok 10 - append with -C -C *** t8006-blame-textconv.sh *** ok 2 - blame runs on unconflicted file while other file has conflicts ok 11 - append with -C -C -C ok 3 - blame runs on conflicted file in stages 1,3 # passed all 3 test(s) 1..3 ok 12 - blame wholesale copy ok 59 - outside of git repository ok 13 - blame wholesale copy and more ok 1 - setup the repository *** t8007-cat-file-textconv.sh *** ok 2 - blame respects i18n.commitencoding ok 3 - blame respects i18n.logoutputencoding ok 60 - inside git repository but with --no-index ok 14 - blame path that used to be a directory ok 4 - blame respects --encoding=UTF-8 ok 61 - setup double-dash tests ok 1 - setup ok 5 - blame respects --encoding=none # passed all 5 test(s) 1..5 ok 62 - grep -- pattern ok 2 - no filter specified ok 15 - blame to a commit with no author name ok 63 - grep -- pattern -- pathspec ok 16 - blame -L with invalid start ok 3 - setup textconv filters *** t9001-send-email.sh *** ok 9 - GIT_DIFFTOOL_PROMPT variable ok 64 - grep -e pattern -- path ok 1 - setup ok 17 - blame -L with invalid end ok 4 - blame with --no-textconv ok 65 - grep -e -- -- path ok 2 - no filter specified # passed all 65 test(s) 1..65 ok 18 - indent of line numbers, nine lines ok 3 - setup textconv filters ok 19 - indent of line numbers, ten lines # passed all 19 test(s) 1..19 ok 4 - cat-file without --textconv ok 5 - cat-file without --textconv on previous commit ok 5 - basic blame on last commit *** t9010-svn-fe.sh *** ok 1 - prepare reference tree ok 6 - cat-file --textconv on last commit ok 2 - Setup helper tool ok 7 - cat-file --textconv on previous commit ok 3 - Extract patches ok 8 - cat-file without --textconv (symlink) ok 6 - blame --textconv going through revisions ok 9 - cat-file --textconv on index (symlink) *** t9100-git-svn-basic.sh *** ok 7 - make a new commit ok 10 - cat-file --textconv on HEAD (symlink) # passed all 10 test(s) 1..10 # passed all 0 test(s) 1..0 # SKIP Perl SVN libraries not found or unusable *** t9101-git-svn-props.sh *** ok 8 - blame from previous revision *** t9102-git-svn-deep-rmdir.sh *** ok 9 - blame with --no-textconv (on symlink) # passed all 0 test(s) 1..0 # SKIP Perl SVN libraries not found or unusable ok 10 - blame --textconv (on symlink) ok 10 - difftool.prompt config variable is false *** t9103-git-svn-tracked-directory-removed.sh *** ok 11 - make another new commit # passed all 0 test(s) 1..0 # SKIP Perl SVN libraries not found or unusable # passed all 0 test(s) 1..0 # SKIP Perl SVN libraries not found or unusable *** t9104-git-svn-follow-parent.sh *** *** t9105-git-svn-commit-diff.sh *** # passed all 0 test(s) 1..0 # SKIP Perl SVN libraries not found or unusable *** t9106-git-svn-commit-diff-clobber.sh *** ok 12 - blame on last commit (-C -C, symlink) # passed all 12 test(s) 1..12 # passed all 0 test(s) 1..0 # SKIP Perl SVN libraries not found or unusable # passed all 0 test(s) 1..0 # SKIP Perl SVN libraries not found or unusable *** t9107-git-svn-migrate.sh *** *** t9108-git-svn-glob.sh *** *** t9109-git-svn-multi-glob.sh *** # passed all 0 test(s) 1..0 # SKIP Perl SVN libraries not found or unusable *** t9110-git-svn-use-svm-props.sh *** # passed all 0 test(s) 1..0 # SKIP Perl SVN libraries not found or unusable # passed all 0 test(s) 1..0 # SKIP Perl SVN libraries not found or unusable *** t9111-git-svn-use-svnsync-props.sh *** # passed all 0 test(s) 1..0 # SKIP Perl SVN libraries not found or unusable ok 11 - difftool merge.prompt = false *** t9112-git-svn-md5less-file.sh *** *** t9113-git-svn-dcommit-new-file.sh *** # passed all 0 test(s) 1..0 # SKIP Perl SVN libraries not found or unusable *** t9114-git-svn-dcommit-merge.sh *** ok 4 - No confirm with --suppress-cc # passed all 0 test(s) 1..0 # SKIP Perl SVN libraries not found or unusable # passed all 0 test(s) 1..0 # SKIP Perl SVN libraries not found or unusable # passed all 0 test(s) 1..0 # SKIP Perl SVN libraries not found or unusable *** t9115-git-svn-dcommit-funky-renames.sh *** *** t9116-git-svn-log.sh *** *** t9117-git-svn-init-clone.sh *** # passed all 0 test(s) 1..0 # SKIP Perl SVN libraries not found or unusable *** t9118-git-svn-funky-branch-names.sh *** # passed all 0 test(s) 1..0 # SKIP Perl SVN libraries not found or unusable # passed all 0 test(s) 1..0 # SKIP Perl SVN libraries not found or unusable # passed all 0 test(s) 1..0 # SKIP Perl SVN libraries not found or unusable *** t9119-git-svn-info.sh *** *** t9120-git-svn-clone-with-percent-escapes.sh *** *** t9121-git-svn-fetch-renamed-dir.sh *** # passed all 0 test(s) 1..0 # SKIP Perl SVN libraries not found or unusable ok 12 - difftool.prompt can overridden with -y *** t9122-git-svn-author.sh *** # passed all 0 test(s) 1..0 # SKIP Perl SVN libraries not found or unusable # passed all 0 test(s) 1..0 # SKIP Perl SVN libraries not found or unusable # passed all 0 test(s) 1..0 # SKIP Perl SVN libraries not found or unusable *** t9123-git-svn-rebuild-with-rewriteroot.sh *** *** t9124-git-svn-dcommit-auto-props.sh *** *** t9125-git-svn-multi-glob-branch-names.sh *** # passed all 0 test(s) 1..0 # SKIP Perl SVN libraries not found or unusable *** t9126-git-svn-follow-deleted-readded-directory.sh *** # passed all 0 test(s) 1..0 # SKIP Perl SVN libraries not found or unusable # passed all 0 test(s) 1..0 # SKIP Perl SVN libraries not found or unusable # passed all 0 test(s) 1..0 # SKIP Perl SVN libraries not found or unusable *** t9127-git-svn-partial-rebuild.sh *** *** t9128-git-svn-cmd-branch.sh *** *** t9129-git-svn-i18n-commitencoding.sh *** ok 5 - No confirm with --confirm=never # passed all 0 test(s) 1..0 # SKIP Perl SVN libraries not found or unusable *** t9130-git-svn-authors-file.sh *** # passed all 0 test(s) 1..0 # SKIP Perl SVN libraries not found or unusable # passed all 0 test(s) 1..0 # SKIP Perl SVN libraries not found or unusable *** t9131-git-svn-empty-symlink.sh *** # passed all 0 test(s) 1..0 # SKIP Perl SVN libraries not found or unusable ok 13 - difftool.prompt can overridden with --prompt *** t9132-git-svn-broken-symlink.sh *** *** t9133-git-svn-nested-git-repo.sh *** # passed all 0 test(s) 1..0 # SKIP Perl SVN libraries not found or unusable *** t9134-git-svn-ignore-paths.sh *** # passed all 0 test(s) 1..0 # SKIP Perl SVN libraries not found or unusable # passed all 0 test(s) 1..0 # SKIP Perl SVN libraries not found or unusable *** t9135-git-svn-moved-branch-empty-file.sh *** # passed all 0 test(s) 1..0 # SKIP Perl SVN libraries not found or unusable *** t9136-git-svn-recreated-branch-empty-file.sh *** *** t9137-git-svn-dcommit-clobber-series.sh *** # passed all 0 test(s) 1..0 # SKIP Perl SVN libraries not found or unusable *** t9138-git-svn-authors-prog.sh *** # passed all 0 test(s) 1..0 # SKIP Perl SVN libraries not found or unusable # passed all 0 test(s) 1..0 # SKIP Perl SVN libraries not found or unusable *** t9139-git-svn-non-utf8-commitencoding.sh *** # passed all 0 test(s) 1..0 # SKIP Perl SVN libraries not found or unusable *** t9140-git-svn-reset.sh *** *** t9141-git-svn-multiple-branches.sh *** # passed all 0 test(s) 1..0 # SKIP Perl SVN libraries not found or unusable *** t9142-git-svn-shallow-clone.sh *** # passed all 0 test(s) 1..0 # SKIP Perl SVN libraries not found or unusable # passed all 0 test(s) 1..0 # SKIP Perl SVN libraries not found or unusable # passed all 0 test(s) 1..0 # SKIP Perl SVN libraries not found or unusable ok 6 - No confirm with sendemail.confirm=never *** t9143-git-svn-gc.sh *** *** t9144-git-svn-old-rev_map.sh *** *** t9145-git-svn-master-branch.sh *** # passed all 0 test(s) 1..0 # SKIP Perl SVN libraries not found or unusable *** t9146-git-svn-empty-dirs.sh *** # passed all 0 test(s) 1..0 # SKIP Perl SVN libraries not found or unusable # passed all 0 test(s) 1..0 # SKIP Perl SVN libraries not found or unusable # passed all 0 test(s) 1..0 # SKIP Perl SVN libraries not found or unusable *** t9150-svk-mergetickets.sh *** *** t9151-svn-mergeinfo.sh *** *** t9152-svn-empty-dirs-after-gc.sh *** # passed all 0 test(s) 1..0 # SKIP Perl SVN libraries not found or unusable *** t9153-git-svn-rewrite-uuid.sh *** # passed all 0 test(s) 1..0 # SKIP Perl SVN libraries not found or unusable ok 14 - difftool last flag wins # passed all 0 test(s) 1..0 # SKIP Perl SVN libraries not found or unusable # passed all 0 test(s) 1..0 # SKIP Perl SVN libraries not found or unusable *** t9154-git-svn-fancy-glob.sh *** *** t9155-git-svn-fetch-deleted-tag.sh *** *** t9156-git-svn-fetch-deleted-tag-2.sh *** # passed all 0 test(s) 1..0 # SKIP Perl SVN libraries not found or unusable *** t9157-git-svn-fetch-merge.sh *** # passed all 0 test(s) 1..0 # SKIP Perl SVN libraries not found or unusable # passed all 0 test(s) 1..0 # SKIP Perl SVN libraries not found or unusable # passed all 0 test(s) 1..0 # SKIP Perl SVN libraries not found or unusable *** t9200-git-cvsexportcommit.sh *** *** t9300-fast-import.sh *** *** t9301-fast-import-notes.sh *** ok 7 - Send patches # passed all 0 test(s) 1..0 # SKIP Perl SVN libraries not found or unusable ok 8 - setup expect ok 9 - Verify commandline *** t9350-fast-export.sh *** ok 1 - set up master branch ok 1 - A: create pack from stdin ok 2 - A: verify pack ok 3 - A: verify commit ok 4 - A: verify tree ok 5 - A: verify file2 ok 6 - A: verify file3 ok 7 - A: verify file4 ok 2 - add notes with simple M command ok 8 - A: verify tag/series-A ok 3 - add notes with simple N command ok 9 - A: verify marks output ok 1 - setup ok 10 - A: verify marks import ok 4 - update existing notes with N command ok 11 - A: verify marks import does not crash ok 12 - A: verify pack ok 5 - add concatentation notes with M command ok 10 - Send patches with --envelope-sender ok 11 - setup expect ok 12 - Verify commandline ok 13 - A: verify diff ok 15 - difftool + mergetool config variables ok 2 - fast-export | fast-import ok 6 - verify that deleteall also removes notes ok 7 - verify that later N commands override earlier M commands ok 3 - fast-export master~2..master ok 14 - A: export marks with large values ok 4 - iso-8859-1 ok 15 - B: fail on invalid blob sha1 ok 16 - B: fail on invalid branch name ".badbranchname" ok 17 - B: fail on invalid branch name "bad[branch]name" ok 5 - import/export-marks ok 16 - difftool..path not ok - 1 New file # mkdir A B C D E F && # echo hello1 >A/newfile1.txt && # echo hello2 >B/newfile2.txt && # cp "$TEST_DIRECTORY"/test9200a.png C/newfile3.png && # cp "$TEST_DIRECTORY"/test9200a.png D/newfile4.png && # git add A/newfile1.txt && # git add B/newfile2.txt && # git add C/newfile3.png && # git add D/newfile4.png && # git commit -a -m "Test: New file" && # id=$(git rev-list --max-count=1 HEAD) && # (cd "$CVSWORK" && # git cvsexportcommit -c $id && # check_entries A "newfile1.txt/1.1/" && # check_entries B "newfile2.txt/1.1/" && # check_entries C "newfile3.png/1.1/-kb" && # check_entries D "newfile4.png/1.1/-kb" && # test_cmp A/newfile1.txt ../A/newfile1.txt && # test_cmp B/newfile2.txt ../B/newfile2.txt && # test_cmp C/newfile3.png ../C/newfile3.png && # test_cmp D/newfile4.png ../D/newfile4.png # ) ok 18 - B: accept branch name "TEMP_TAG" ok 6 - set up faked signed tag ok 7 - signed-tags=abort ok 8 - signed-tags=verbatim ok 9 - signed-tags=strip ok 19 - C: incremental import create pack from stdin ok 13 - Send patches with --envelope-sender=auto ok 14 - setup expect ok 15 - Verify commandline ok 17 - difftool --extcmd=cat ok 16 - setup expect ok 20 - C: verify pack ok 21 - C: validate reuse existing blob ok 22 - C: verify commit ok 23 - C: validate rename result ok 18 - difftool --extcmd cat ok 24 - D: inline data in commit ok 10 - setup submodule not ok - 2 Remove two files, add two and update two # echo Hello1 >>A/newfile1.txt && # rm -f B/newfile2.txt && # rm -f C/newfile3.png && # echo Hello5 >E/newfile5.txt && # cp "$TEST_DIRECTORY"/test9200b.png D/newfile4.png && # cp "$TEST_DIRECTORY"/test9200a.png F/newfile6.png && # git add E/newfile5.txt && # git add F/newfile6.png && # git commit -a -m "Test: Remove, add and update" && # id=$(git rev-list --max-count=1 HEAD) && # (cd "$CVSWORK" && # git cvsexportcommit -c $id && # check_entries A "newfile1.txt/1.2/" && # check_entries B "" && # check_entries C "" && # check_entries D "newfile4.png/1.2/-kb" && # check_entries E "newfile5.txt/1.1/" && # check_entries F "newfile6.png/1.1/-kb" && # test_cmp A/newfile1.txt ../A/newfile1.txt && # test_cmp D/newfile4.png ../D/newfile4.png && # test_cmp E/newfile5.txt ../E/newfile5.txt && # test_cmp F/newfile6.png ../F/newfile6.png # ) ok 25 - D: verify pack ok 26 - D: validate new files added ok 19 - difftool -x cat ok 27 - D: verify file5 ok 28 - D: verify file6 ok 29 - E: rfc2822 date, --date-format=raw ok 30 - E: rfc2822 date, --date-format=rfc2822 ok 17 - Show all headers ok 20 - difftool --extcmd echo arg1 ok 31 - E: verify pack ok 32 - E: verify commit ok 3 - Fail to change binary more than one generation old ok 33 - F: non-fast-forward update skips ok 21 - difftool --extcmd cat arg1 ok 34 - F: verify pack ok 35 - F: verify other commit ok 11 - submodule fast-export | fast-import ok 22 - difftool --extcmd cat arg2 # passed all 22 test(s) 1..22 ok 36 - G: non-fast-forward update forced *** t9400-git-cvsserver-server.sh *** not ok - 4 Remove only binary files ok 37 - G: verify pack # git reset --hard HEAD^^ && # rm -f D/newfile4.png && # git commit -a -m "test: remove only a binary file" && # id=$(git rev-list --max-count=1 HEAD) && # (cd "$CVSWORK" && # git cvsexportcommit -c $id && # check_entries A "newfile1.txt/1.2/" && # check_entries B "" && # check_entries C "" && # check_entries D "" && # check_entries E "newfile5.txt/1.1/" && # check_entries F "newfile6.png/1.1/-kb" && # test_cmp A/newfile1.txt ../A/newfile1.txt && # test_cmp E/newfile5.txt ../E/newfile5.txt && # test_cmp F/newfile6.png ../F/newfile6.png # ) # passed all 0 test(s) 1..0 # SKIP skipping git-cvsserver tests, Perl SQLite interface unavailable ok 38 - G: branch changed, but logged *** t9401-git-cvsserver-crlf.sh *** ok 18 - Prompting works ok 12 - setup copies ok 39 - H: deletall, add 1 # passed all 0 test(s) 1..0 # SKIP skipping git-cvsserver tests, Perl SQLite interface unavailable *** t9500-gitweb-standalone-no-errors.sh *** ok 40 - H: verify pack ok 13 - fast-export -C -C | fast-import ok 41 - H: validate old files removed, new files added ok 42 - H: verify file ok 14 - fast-export | fast-import when master is tagged not ok - 5 Remove only a text file # rm -f A/newfile1.txt && # git commit -a -m "test: remove only a binary file" && # id=$(git rev-list --max-count=1 HEAD) && # (cd "$CVSWORK" && # git cvsexportcommit -c $id && # check_entries A "" && # check_entries B "" && # check_entries C "" && # check_entries D "" && # check_entries E "newfile5.txt/1.1/" && # check_entries F "newfile6.png/1.1/-kb" && # test_cmp E/newfile5.txt ../E/newfile5.txt && # test_cmp F/newfile6.png ../F/newfile6.png # ) ok 43 - I: export-pack-edges ok 44 - I: verify edge list ok 15 - cope with tagger-less tags ok 45 - J: reset existing branch creates empty commit ok 46 - J: branch has 1 commit, empty tree ok 19 - cccmd works ok 47 - K: reinit branch with from ok 16 - setup for limiting exports by PATH ok 48 - K: verify K^1 = branch^1 ok 17 - dropping tag of filtered out object ok 18 - rewriting tag of filtered out object ok 49 - L: verify internal tree sorting not ok 19 - no exact-ref revisions included # TODO known breakage not ok - 6 New file with spaces in file name # mkdir "G g" && # echo ok then >"G g/with spaces.txt" && # git add "G g/with spaces.txt" && \ # cp "$TEST_DIRECTORY"/test9200a.png "G g/with spaces.png" && \ # git add "G g/with spaces.png" && # git commit -a -m "With spaces" && # id=$(git rev-list --max-count=1 HEAD) && # (cd "$CVSWORK" && # git cvsexportcommit -c $id && # check_entries "G g" "with spaces.png/1.1/-kb|with spaces.txt/1.1/" # ) ok 20 - path limiting with import-marks does not lose unmodified files ok 50 - M: rename file in same subdirectory ok 21 - full-tree re-shows unmodified files ok 51 - M: rename file to new subdirectory ok 22 - set-up a few more tags for tag export tests ok 52 - M: rename subdirectory to new subdirectory ok 23 - tree_tag ok 1 - no commits: projects_list (implicit) ok 24 - tree_tag-obj ok 25 - tag-obj_tag ok 53 - N: copy file in same subdirectory ok 26 - tag-obj_tag-obj ok 20 - reject long lines ok 21 - no patch was sent not ok - 7 Update file with spaces in file name # echo Ok then >>"G g/with spaces.txt" && # cat "$TEST_DIRECTORY"/test9200a.png >>"G g/with spaces.png" && \ # git add "G g/with spaces.png" && # git commit -a -m "Update with spaces" && # id=$(git rev-list --max-count=1 HEAD) && # (cd "$CVSWORK" && # git cvsexportcommit -c $id # check_entries "G g" "with spaces.png/1.2/-kb|with spaces.txt/1.2/" # ) ok 54 - N: copy then modify subdirectory ok 2 - no commits: projects_index ok 55 - N: copy dirty subdirectory ok 27 - directory becomes symlink # still have 1 known breakage(s) # passed all remaining 26 test(s) 1..27 ok 22 - Author From: in message body ok 56 - N: copy directory by id *** t9501-gitweb-standalone-http-status.sh *** ok 57 - N: modify copied tree ok 58 - O: comments are all skipped ok 59 - O: blank lines not necessary after data commands ok 3 - no commits: .git summary (implicit) ok 1 - setup ok 23 - Author From: not in message body ok 60 - O: repack before next test ok 4 - no commits: .git commit (implicit HEAD) not ok - 8 File with non-ascii file name # mkdir -p Å/goo/a/b/c/d/e/f/g/h/i/j/k/l/m/n/o/p/q/r/s/t/u/v/w/x/y/z/å/ä/ö && # echo Foo >Å/goo/a/b/c/d/e/f/g/h/i/j/k/l/m/n/o/p/q/r/s/t/u/v/w/x/y/z/å/ä/ö/gårdetsågårdet.txt && # git add Å/goo/a/b/c/d/e/f/g/h/i/j/k/l/m/n/o/p/q/r/s/t/u/v/w/x/y/z/å/ä/ö/gårdetsågårdet.txt && # cp "$TEST_DIRECTORY"/test9200a.png Å/goo/a/b/c/d/e/f/g/h/i/j/k/l/m/n/o/p/q/r/s/t/u/v/w/x/y/z/å/ä/ö/gårdetsågårdet.png && # git add Å/goo/a/b/c/d/e/f/g/h/i/j/k/l/m/n/o/p/q/r/s/t/u/v/w/x/y/z/å/ä/ö/gårdetsågårdet.png && # git commit -a -m "Går det så går det" && \ # id=$(git rev-list --max-count=1 HEAD) && # (cd "$CVSWORK" && # git cvsexportcommit -v -c $id && # check_entries \ # "Å/goo/a/b/c/d/e/f/g/h/i/j/k/l/m/n/o/p/q/r/s/t/u/v/w/x/y/z/å/ä/ö" \ # "gårdetsågårdet.png/1.1/-kb|gårdetsågårdet.txt/1.1/" # ) ok 61 - O: blank lines not necessary after other commands ok 62 - O: progress outputs as requested by input ok 24 - allow long lines with --no-validate ok 5 - no commits: .git commitdiff (implicit HEAD) ok 9 - Mismatching patch should fail ok 63 - P: supermodule & submodule mix ok 6 - no commits: .git tree (implicit HEAD) ok 25 - Invalid In-Reply-To ok 10 - Retain execute bit ok 64 - P: verbatim SHA gitlinks ok 65 - P: fail on inline gitlink ok 66 - P: fail on blob mark in gitlink ok 7 - no commits: .git heads ok 2 - snapshots: tgz only default format enabled ok 67 - Q: commit notes not ok - 11 -w option should work with relative GIT_DIR ok 68 - Q: verify pack # # mkdir W && # echo foobar >W/file1.txt && # echo bazzle >W/file2.txt && # git add W/file1.txt && # git add W/file2.txt && # git commit -m "More updates" && # id=$(git rev-list --max-count=1 HEAD) && # (cd "$GIT_DIR" && # GIT_DIR=. git cvsexportcommit -w "$CVSWORK" -c $id && # check_entries "$CVSWORK/W" "file1.txt/1.1/|file2.txt/1.1/" && # test_cmp "$CVSWORK/W/file1.txt" ../W/file1.txt && # test_cmp "$CVSWORK/W/file2.txt" ../W/file2.txt # ) # ok 69 - Q: verify first commit ok 26 - Valid In-Reply-To when prompting ok 27 - setup fake editor ok 70 - Q: verify second commit ok 71 - Q: verify third commit ok 72 - Q: verify first notes commit ok 73 - Q: verify first notes tree ok 74 - Q: verify first note for first commit ok 75 - Q: verify first note for second commit ok 76 - Q: verify first note for third commit ok 77 - Q: verify second notes commit ok 78 - Q: verify second notes tree ok 79 - Q: verify second note for first commit ok 8 - no commits: .git tags ok 80 - Q: verify first note for second commit ok 81 - Q: verify first note for third commit ok 82 - Q: verify third notes commit not ok - 12 check files before directories ok 9 - Make initial commit # # # echo Notes > release-notes && # git add release-notes && # git commit -m "Add release notes" release-notes && # id=$(git rev-parse HEAD) && # git cvsexportcommit -w "$CVSWORK" -c $id && # # echo new > DS && # echo new > E/DS && # echo modified > release-notes && # git add DS E/DS release-notes && # git commit -m "Add two files with the same basename" && # id=$(git rev-parse HEAD) && # git cvsexportcommit -w "$CVSWORK" -c $id && # check_entries "$CVSWORK/E" "DS/1.1/|newfile5.txt/1.1/" && # check_entries "$CVSWORK" "DS/1.1/|release-notes/1.2/" && # test_cmp "$CVSWORK/DS" DS && # test_cmp "$CVSWORK/E/DS" E/DS && # test_cmp "$CVSWORK/release-notes" release-notes # # ok 83 - Q: verify third notes tree not ok - 13 re-commit a removed filename which remains in CVS attic # # # (cd "$CVSWORK" && # echo >attic_gremlin && # cvs -Q add attic_gremlin && # cvs -Q ci -m "added attic_gremlin" && # rm attic_gremlin && # cvs -Q rm attic_gremlin && # cvs -Q ci -m "removed attic_gremlin") && # # echo > attic_gremlin && # git add attic_gremlin && # git commit -m "Added attic_gremlin" && # git cvsexportcommit -w "$CVSWORK" -c HEAD && # (cd "$CVSWORK"; cvs -Q update -d) && # test -f "$CVSWORK/attic_gremlin" # ok 84 - Q: verify third note for first commit ok 85 - Q: verify fourth notes commit ok 86 - Q: verify fourth notes tree ok 87 - Q: verify second note for second commit ok 88 - R: abort on unsupported feature ok 89 - R: supported feature is accepted ok 90 - R: abort on receiving feature after data command ok 91 - R: only one import-marks feature allowed per stream ok 28 - --compose works ok 29 - first message is compose text ok 30 - second message is patch ok 31 - setup expect ok 92 - R: export-marks feature results in a marks file being created ok 93 - R: export-marks options can be overriden by commandline options ok 94 - R: import to output marks works without any content ok 95 - R: import marks prefers commandline marks file over the stream ok 96 - R: multiple --import-marks= should be honoured not ok - 14 commit a file with leading spaces in the name # # # echo space > " space" && # git add " space" && # git commit -m "Add a file with a leading space" && # id=$(git rev-parse HEAD) && # git cvsexportcommit -w "$CVSWORK" -c $id && # check_entries "$CVSWORK" " space/1.1/|DS/1.1/|attic_gremlin/1.3/|release-notes/1.2/" && # test_cmp "$CVSWORK/ space" " space" # # ok 10 - projects_list (implicit) ok 97 - R: feature relative-marks should be honoured ok 8 - add lots of commits and notes ok 98 - R: feature no-relative-marks should be honoured ok 99 - R: quiet option results in no stats being output ok 100 - R: die on unknown option ok 101 - R: unknown commandline options are rejected ok 102 - R: ignore non-git options not ok - 15 use the same checkout for Git and CVS # # # (mkdir shared && # cd shared && # unset GIT_DIR && # cvs co . && # git init && # git add " space" && # git commit -m "fake initial commit" && # echo Hello >> " space" && # git commit -m "Another change" " space" && # git cvsexportcommit -W -p -u -c HEAD && # grep Hello " space" && # git diff-files) # # # failed 12 among 15 test(s) 1..15 make[2]: *** [t9200-git-cvsexportcommit.sh] Error 1 make[2]: *** Waiting for unfinished jobs.... ok 32 - sendemail.cc set ok 33 - setup expect ok 11 - projects_index ok 3 - snapshots: all enabled in default, use default disabled value ok 12 - .git summary (implicit) ok 34 - sendemail.cc unset ok 35 - setup expect ok 4 - snapshots: zip explicitly disabled ok 13 - .git commit (implicit HEAD) ok 9 - verify that lots of notes trigger a fanout scheme ok 36 - sendemail.cccmd ok 10 - verify that non-notes are untouched by a fanout change ok 37 - setup expect ok 103 - R: blob bigger than threshold ok 104 - R: verify created pack ok 5 - snapshots: tgz explicitly enabled ok 105 - R: verify written objects ok 106 - R: blob appears only once # passed all 106 test(s) 1..106 ok 14 - .git commitdiff (implicit HEAD, root commit) ok 38 - --suppress-cc=all ok 39 - setup expect ok 6 - snapshots: good tree-ish id ok 15 - .git commitdiff_plain (implicit HEAD, root commit) ok 40 - --suppress-cc=body ok 41 - setup expect ok 7 - snapshots: bad tree-ish id ok 16 - .git commit (HEAD) ok 8 - snapshots: bad tree-ish id (tagged object) ok 42 - --suppress-cc=body --suppress-cc=cccmd ok 43 - setup expect ok 17 - .git tree (implicit HEAD) ok 9 - snapshots: good object id ok 18 - .git blob (file) ok 44 - --suppress-cc=sob ok 45 - setup expect ok 10 - snapshots: bad object id ok 19 - .git blob_plain (file) ok 46 - --suppress-cc=bodycc ok 47 - setup expect ok 11 - load checking: load too high (default action) # passed all 11 test(s) 1..11 ok 20 - .git commit (non-existent) ok 48 - --suppress-cc=cc ok 21 - .git commitdiff (non-existent) ok 49 - --confirm=always ok 22 - .git commitdiff (non-existent vs HEAD) ok 23 - .git tree (0000000000000000000000000000000000000000) ok 50 - --confirm=auto ok 11 - remove lots of notes ok 12 - verify that removing notes trigger fanout consolidation ok 24 - .git tag (0000000000000000000000000000000000000000) ok 13 - verify that non-notes are untouched by a fanout change ok 51 - --confirm=cc ok 25 - .git blob (non-existent) ok 52 - --confirm=compose ok 26 - .git blob_plain (non-existent) ok 27 - commitdiff(0): root ok 53 - confirm by default (due to cc) ok 28 - commitdiff(0): file added ok 14 - add notes to 16 commits in each of 10 refs # passed all 14 test(s) 1..14 ok 54 - confirm by default (due to --compose) ok 29 - commitdiff(0): mode change ok 55 - confirm detects EOF (inform assumes y) ok 30 - commitdiff(0): file renamed ok 56 - confirm detects EOF (auto causes failure) ok 31 - commitdiff(0): file to symlink ok 32 - commitdiff(0): file deleted ok 57 - confirm doesnt loop forever ok 33 - commitdiff(0): file copied / new file ok 58 - utf8 Cc is rfc2047 encoded ok 34 - commitdiff(0): mode change and modified ok 59 - --compose adds MIME for utf8 body ok 35 - commitdiff(0): renamed and modified ok 36 - commitdiff(0): renamed, mode change and modified ok 60 - --compose respects user mime type ok 37 - setup typechange commits ok 61 - --compose adds MIME for utf8 subject ok 38 - commitdiff(2): file renamed from foo to foo/baz ok 39 - commitdiff(2): file renamed from foo/baz to foo ok 62 - detects ambiguous reference/file conflict ok 40 - commitdiff(2): directory becomes file ok 63 - feed two files ok 41 - commitdiff(2): file becomes directory ok 64 - in-reply-to but no threading ok 42 - commitdiff(2): file becomes symlink ok 43 - commitdiff(2): symlink becomes file ok 65 - no in-reply-to and no threading ok 44 - commitdiff(2): symlink becomes directory ok 66 - threading but no chain-reply-to ok 45 - commitdiff(2): directory becomes symlink ok 67 - warning with an implicit --chain-reply-to ok 46 - Create a merge ok 47 - commit(0): merge commit ok 68 - no warning with an explicit --chain-reply-to ok 48 - commitdiff(0): merge commit ok 69 - no warning with an explicit --no-chain-reply-to ok 49 - Prepare large commit ok 50 - commit(1): large commit ok 70 - no warning with sendemail.chainreplyto = false ok 51 - commitdiff(1): large commit ok 71 - no warning with sendemail.chainreplyto = true ok 52 - tags: list of different types of tags ok 72 - sendemail.to works ok 53 - tag: Tag to commit object ok 73 - --no-to overrides sendemail.to ok 54 - tag: on lightweight tag (invalid) ok 55 - logs: log (implicit HEAD) ok 74 - sendemail.cc works ok 56 - logs: shortlog (implicit HEAD) ok 75 - --no-cc overrides sendemail.cc ok 57 - logs: history (implicit HEAD, file) ok 76 - sendemail.bcc works ok 58 - logs: history (implicit HEAD, non-existent file) ok 77 - --no-bcc overrides sendemail.bcc ok 78 - setup expect ok 79 - setup expect ok 59 - logs: history (implicit HEAD, deleted file) ok 80 - asks about and fixes 8bit encodings ok 60 - path_info: project ok 81 - sendemail.8bitEncoding works ok 61 - path_info: project/branch ok 62 - path_info: project/branch:file ok 82 - --8bit-encoding overrides sendemail.8bitEncoding ok 83 - setup expect ok 84 - setup expect ok 63 - path_info: project/branch:dir/ ok 85 - --8bit-encoding also treats subject ok 64 - path_info: project/branch:file (non-existent) ok 86 - refusing to send cover letter template ok 65 - path_info: project/branch:dir/ (non-existent) ok 66 - path_info: project/branch:/file ok 87 - --force sends cover letter template anyway # passed all 87 test(s) 1..87 ok 67 - path_info: project/:/file (implicit HEAD) ok 68 - path_info: project/:/ (implicit HEAD, top tree) ok 69 - feeds: OPML ok 70 - feed: RSS ok 71 - feed: Atom ok 72 - encode(commit): utf8 ok 73 - encode(commit): iso-8859-1 ok 74 - encode(log): utf-8 and iso-8859-1 ok 75 - opt: log --no-merges ok 76 - opt: atom --no-merges ok 77 - opt: "file" history --no-merges ok 78 - opt: log --no-such-option (invalid option) ok 79 - opt: tree --no-merges (invalid option for action) ok 80 - URL: no project URLs, no base URL ok 81 - URL: project URLs via gitweb.url ok 82 - URL: project URLs via cloneurl file ok 83 - config override: projects list (implicit) ok 84 - config override: tree view, features not overridden in repo config ok 85 - config override: tree view, features disabled in repo config ok 86 - config override: tree view, features enabled in repo config (1) ok 87 - config override: tree view, features enabled in repo config (2) ok 88 - README.html with non-ASCII characters (utf-8) Skipping syntax highlighting test, because 'highlight' was not found ok 89 # skip syntax highlighting (no highlight) (missing HIGHLIGHT) ok 90 # skip syntax highlighting (highlighted) (missing HIGHLIGHT) # passed all 90 test(s) 1..90 make[2]: Leaving directory `/home/portage/dev-vcs/git-1.7.3.4-r1/work/git-1.7.3.4/t' make[1]: *** [all] Error 2 make[1]: Leaving directory `/home/portage/dev-vcs/git-1.7.3.4-r1/work/git-1.7.3.4/t' make: *** [test] Error 2 emake failed make -j6 BLK_SHA1=YesPlease NO_FINK=YesPlease NO_DARWIN_PORTS=YesPlease INSTALL=install TAR=tar SHELL_PATH=/bin/sh SANE_TOOL_PATH= OLD_ICONV= NO_EXTERNAL_GREP= NO_TCLTK=YesPlease INSTALLDIRS=vendor THREADED_DELTA_SEARCH=YesPlease ASCIIDOC_NO_ROFF=YesPlease DESTDIR=/home/portage/dev-vcs/git-1.7.3.4-r1/image/ 'OPTCFLAGS=-O2 -march=pentium-m -pipe -fomit-frame-pointer' 'OPTLDFLAGS=-Wl,-O1 -Wl,--as-needed -Wl,--hash-style=gnu' OPTCC=i686-pc-linux-gnu-gcc OPTAR=i686-pc-linux-gnu-ar prefix=/usr htmldir=/usr/share/doc/git-1.7.3.4-r1/html sysconfdir=/etc PYTHON_PATH=/usr/bin/python 'PERL_PATH=/usr/bin/env perl' PERL_MM_OPT= GIT_TEST_OPTS=--no-color aggregate-results for f in test-results/t*-*.counts; do \ echo "$f"; \ done | '/bin/sh' ./aggregate-results.sh fixed 0 success 6069 failed 12 broken 24 total 6193 * ERROR: dev-vcs/git-1.7.3.4-r1 failed: * tests failed. Please file a bug. * * Call stack: * ebuild.sh, line 56: Called src_test * environment, line 3113: Called die * The specific snippet of code: * [ $rc -eq 0 ] || die "tests failed. Please file a bug." * * If you need support, post the output of 'emerge --info =dev-vcs/git-1.7.3.4-r1', * the complete build log and the output of 'emerge -pqv =dev-vcs/git-1.7.3.4-r1'. * The complete build log is located at '/home/portage/dev-vcs/git-1.7.3.4-r1/temp/build.log'. * The ebuild environment file is located at '/home/portage/dev-vcs/git-1.7.3.4-r1/temp/environment'. * S: '/home/portage/dev-vcs/git-1.7.3.4-r1/work/git-1.7.3.4'