Go to:
Gentoo Home
Documentation
Forums
Lists
Bugs
Planet
Store
Wiki
Get Gentoo!
Gentoo's Bugzilla – Attachment 257532 Details for
Bug 349045
<dev-vcs/git-{1.6.4.4-r1,1.7.2.4-r1,1.7.3.4}: gitweb cross-site scripting vulnerability (CVE-2010-3906)
Home
|
New
–
[Ex]
|
Browse
|
Search
|
Privacy Policy
|
[?]
|
Reports
|
Requests
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
=dev-vcs/git-1.7.3.4-r1 test failures on SPARC
build.log (text/plain), 166.96 KB, created by
Alex Buell
on 2010-12-19 10:58:23 UTC
(
hide
)
Description:
=dev-vcs/git-1.7.3.4-r1 test failures on SPARC
Filename:
MIME Type:
Creator:
Alex Buell
Created:
2010-12-19 10:58:23 UTC
Size:
166.96 KB
patch
obsolete
>[32;01m * [39;49;00mPackage: dev-vcs/git-1.7.3.4-r1 >[32;01m * [39;49;00mRepository: gentoo >[32;01m * [39;49;00mMaintainer: robbat2@gentoo.org ricmm@gentoo.org >[32;01m * [39;49;00mUSE: blksha1 curl elibc_glibc gtk iconv kernel_linux multilib perl sparc test threads userland_GNU webdav > [33;01m*[0m When migrating to the new sparc mutlilib profile please keep in mind that it > [33;01m*[0m is still in an experimental state. Also note that you need to follow the > [33;01m*[0m migration guide [0], otherwise important packages such as gcc or glibc will > [33;01m*[0m fail to compile and most other packages will be installed incorrectly. > [33;01m*[0m > [33;01m*[0m [0] http://sparc.gentoo.org/multilib.xml > >>>> Unpacking source... >>>> Unpacking git-1.7.3.4.tar.bz2 to /var/tmp/portage/dev-vcs/git-1.7.3.4-r1/work >>>> Unpacking git-manpages-1.7.3.4.tar.bz2 to /var/tmp/portage/dev-vcs/git-1.7.3.4-r1/work/git-1.7.3.4 >>>> Source unpacked in /var/tmp/portage/dev-vcs/git-1.7.3.4-r1/work >>>> Preparing source in /var/tmp/portage/dev-vcs/git-1.7.3.4-r1/work/git-1.7.3.4 ... > [32;01m*[0m Applying git-1.7.2-always-install-js.patch ... >[A[124C [34;01m[ [32;01mok[34;01m ][0m > [32;01m*[0m Applying git-1.7.3.2-interix.patch ... >[A[124C [34;01m[ [32;01mok[34;01m ][0m >>>> Source prepared. >>>> Configuring source in /var/tmp/portage/dev-vcs/git-1.7.3.4-r1/work/git-1.7.3.4 ... >>>> Source configured. >>>> Compiling source in /var/tmp/portage/dev-vcs/git-1.7.3.4-r1/work/git-1.7.3.4 ... >make -j8 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 NO_SVN_TESTS=YesPlease ASCIIDOC_NO_ROFF=YesPlease DESTDIR=/var/tmp/portage/dev-vcs/git-1.7.3.4-r1/image/ 'OPTCFLAGS=-O2 -mcpu=ultrasparc -pipe -ggdb' 'OPTLDFLAGS=-Wl,-O1 -Wl,--as-needed' OPTCC=sparc-unknown-linux-gnu-gcc OPTAR=sparc-unknown-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-lost-found > GEN git-filter-branch > GEN git-merge-octopus > GEN git-merge-one-file > GEN git-merge-resolve > GEN git-pull > GEN git-mergetool > 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 >/usr/bin/env perl Makefile.PL PREFIX='/usr' INSTALL_BASE='' > GEN git-remote-testgit > SUBDIR gitweb > GEN git-parse-remote > GEN git-mergetool--lib > GEN git-sh-setup > SUBDIR ../ > GEN common-cmds.h > CC builtin/add.o > CC builtin/annotate.o > CC builtin/apply.o > CC builtin/archive.o >distcc[29368] ERROR: nonblocking connect to 192.168.1.101:3632 failed: Connection refused >distcc[29368] Warning: failed to distribute builtin/annotate.c to lithium, running locally instead > CC builtin/bisect--helper.o > CC builtin/blame.o >make[2]: `GIT-VERSION-FILE' is up to date. > GEN gitweb.cgi > CC builtin/branch.o >Writing perl.mak for Git > CC builtin/bundle.o > CC builtin/cat-file.o >distcc[29457] ERROR: nonblocking connect to 192.168.1.127:3632 failed: No route to host >distcc[29457] Warning: failed to distribute builtin/branch.c to fluorine, running locally instead >distcc[29467] ERROR: nonblocking connect to 192.168.1.127:3632 failed: No route to host >distcc[29467] Warning: failed to distribute builtin/cat-file.c to fluorine, running locally instead >distcc[29372] ERROR: nonblocking connect to 192.168.1.127:3632 failed: No route to host >distcc[29372] Warning: failed to distribute builtin/apply.c to fluorine, running locally instead > CC builtin/check-attr.o >distcc[29421] (dcc_select_for_write) ERROR: IO timeout >distcc[29421] ERROR: timeout while connecting to 192.168.1.127:3632 >distcc[29421] Warning: failed to distribute builtin/bisect--helper.c to fluorine, running locally instead > 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 > CC builtin/merge-ours.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-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 >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/pack-redundant.o > CC builtin/pack-refs.o > CC builtin/patch-id.o > CC builtin/prune-packed.o > CC builtin/prune.o > CC builtin/push.o > CC builtin/read-tree.o > CC builtin/receive-pack.o > CC builtin/reflog.o > CC builtin/remote.o > CC builtin/replace.o > CC builtin/rerere.o > CC builtin/reset.o > CC builtin/rev-list.o > CC builtin/rev-parse.o > CC builtin/revert.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/rm.o > CC builtin/send-pack.o > CC builtin/shortlog.o > CC builtin/show-branch.o > CC builtin/show-ref.o > CC builtin/stripspace.o >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 >distcc[30021] ERROR: nonblocking connect to 192.168.1.101:3632 failed: Connection refused >distcc[30021] Warning: failed to distribute builtin/verify-tag.c to lithium, running locally instead > CC builtin/write-tree.o > CC test-chmtime.o > CC test-date.o > CC test-ctype.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 >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 vcs-svn/svndump.o > CC test-match-trees.o > CC test-obj-pool.o >distcc[30131] ERROR: nonblocking connect to 192.168.1.127:3632 failed: No route to host >distcc[30131] Warning: failed to distribute test-match-trees.c to fluorine, running locally instead >distcc[30139] ERROR: nonblocking connect to 192.168.1.127:3632 failed: No route to host >distcc[30139] Warning: failed to distribute test-obj-pool.c to fluorine, running locally instead >distcc[30113] ERROR: nonblocking connect to 192.168.1.127:3632 failed: No route to host >distcc[30113] Warning: failed to distribute vcs-svn/fast_export.c to fluorine, running locally instead > 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-treap > GEN bin-wrappers/test-svn-fe > CC fast-import.o > GEN bin-wrappers/test-index-version > 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 > 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 >fast-import.c: In function 'parse_progress': >fast-import.c:2696: warning: ignoring return value of 'fwrite', declared with attribute warn_unused_result > 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 >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 hex.o >grep.c: In function 'std_output': >grep.c:798: warning: ignoring return value of 'fwrite', declared with attribute warn_unused_result > CC ident.o > CC levenshtein.o > CC list-objects.o > CC ll-merge.o > CC lockfile.o > CC log-tree.o > CC mailmap.o > CC match-trees.o > CC merge-file.o >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 merge-recursive.o > CC name-hash.o > CC notes.o > CC notes-cache.o > CC object.o > CC pack-check.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 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 >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 refs.o > CC remote.o > CC replace_object.o >distcc[30881] ERROR: nonblocking connect to 192.168.1.101:3632 failed: Connection refused >distcc[30881] Warning: failed to distribute replace_object.c to lithium, running locally instead > CC rerere.o > CC resolve-undo.o > CC revision.o > CC run-command.o > CC server-info.o > CC setup.o > CC sha1-lookup.o > CC sha1_file.o > CC sha1_name.o > CC shallow.o > CC sideband.o > CC sigchain.o > CC strbuf.o > CC string-list.o >distcc[30951] ERROR: nonblocking connect to 192.168.1.127:3632 failed: No route to host >distcc[30951] Warning: failed to distribute shallow.c to fluorine, running locally instead >distcc[30967] ERROR: nonblocking connect to 192.168.1.127:3632 failed: No route to host >distcc[30967] Warning: failed to distribute sigchain.c to fluorine, running locally instead >distcc[30942] ERROR: nonblocking connect to 192.168.1.127:3632 failed: No route to host >distcc[30942] Warning: failed to distribute sha1_name.c to fluorine, running locally instead > CC submodule.o > CC symlinks.o > CC tag.o > CC trace.o > CC transport.o > CC transport-helper.o > CC tree-diff.o > CC tree.o > CC tree-walk.o > CC unpack-trees.o > CC url.o > CC 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 >submodule.c: In function 'show_submodule_summary': >submodule.c:207: warning: ignoring return value of 'fwrite', declared with attribute warn_unused_result > 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-http-fetch > LINK git-daemon > LINK git-remote-http > LINK test-chmtime > LINK test-ctype > LINK test-date > LINK test-delta > LINK test-dump-cache-tree > LINK test-genrandom > LINK test-match-trees > LINK test-line-buffer > 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 > LN/CP git-remote-https > LN/CP git-remote-ftp > LN/CP git-remote-ftps > LINK git > LINK git-http-push > BUILTIN git-annotate > BUILTIN git-add > BUILTIN git-apply > BUILTIN git-archive > BUILTIN git-bisect--helper > BUILTIN git-blame > BUILTIN git-branch > BUILTIN git-bundle > BUILTIN git-check-attr > BUILTIN git-cat-file > BUILTIN git-check-ref-format > BUILTIN git-checkout-index > BUILTIN git-checkout > BUILTIN git-clone > BUILTIN git-clean > BUILTIN git-commit-tree > BUILTIN git-commit > BUILTIN git-config > BUILTIN git-count-objects > BUILTIN git-describe > BUILTIN git-diff-index > BUILTIN git-diff-files > BUILTIN git-diff-tree > BUILTIN git-diff > BUILTIN git-fast-export > BUILTIN git-fetch > BUILTIN git-fetch-pack > BUILTIN git-fmt-merge-msg > BUILTIN git-for-each-ref > BUILTIN git-fsck > BUILTIN git-hash-object > BUILTIN git-grep > BUILTIN git-gc > BUILTIN git-help > BUILTIN git-init-db > BUILTIN git-index-pack > BUILTIN git-log > BUILTIN git-ls-files > BUILTIN git-ls-tree > BUILTIN git-ls-remote > BUILTIN git-mailsplit > BUILTIN git-mailinfo > BUILTIN git-merge > BUILTIN git-merge-base > BUILTIN git-merge-file > BUILTIN git-merge-index > BUILTIN git-merge-recursive > BUILTIN git-merge-ours > BUILTIN git-mktag > BUILTIN git-merge-tree > BUILTIN git-mv > BUILTIN git-mktree > BUILTIN git-name-rev > BUILTIN git-notes > BUILTIN git-pack-objects > BUILTIN git-pack-redundant > BUILTIN git-patch-id > BUILTIN git-pack-refs > BUILTIN git-prune > BUILTIN git-prune-packed > BUILTIN git-push > BUILTIN git-receive-pack > BUILTIN git-read-tree > BUILTIN git-reflog > BUILTIN git-remote > BUILTIN git-rerere > BUILTIN git-replace > BUILTIN git-rev-parse > BUILTIN git-reset > BUILTIN git-rev-list > BUILTIN git-revert > BUILTIN git-send-pack > BUILTIN git-rm > BUILTIN git-shortlog > BUILTIN git-show-ref > BUILTIN git-show-branch > BUILTIN git-symbolic-ref > BUILTIN git-stripspace > 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-var > BUILTIN git-upload-archive > BUILTIN git-verify-pack > BUILTIN git-verify-tag > BUILTIN git-write-tree > BUILTIN git-cherry > BUILTIN git-format-patch > BUILTIN git-cherry-pick > BUILTIN git-get-tar-commit-id > BUILTIN git-fsck-objects > BUILTIN git-init > BUILTIN git-merge-subtree > BUILTIN git-peek-remote > BUILTIN git-repo-config > BUILTIN git-show > BUILTIN git-status > BUILTIN git-stage > BUILTIN git-whatchanged > 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. > [32;01m*[0m Disabling CVS tests (needs dev-vcs/cvs[USE=server]) > [32;01m*[0m Disabled tests: > [32;01m*[0m Disabled t9200-git-cvsexportcommit.sh > [32;01m*[0m Disabled t9400-git-cvsserver-server.sh > [32;01m*[0m Disabled t9401-git-cvsserver-crlf.sh > [32;01m*[0m Disabled t9600-cvsimport.sh > [32;01m*[0m Disabled t9601-cvsimport-vendor-branch.sh > [32;01m*[0m Disabled t9602-cvsimport-branches-tags.sh > [32;01m*[0m Disabled t9603-cvsimport-patchsets.sh > [32;01m*[0m Start test run >make -j8 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 NO_SVN_TESTS=YesPlease ASCIIDOC_NO_ROFF=YesPlease DESTDIR=/var/tmp/portage/dev-vcs/git-1.7.3.4-r1/image/ 'OPTCFLAGS=-O2 -mcpu=ultrasparc -pipe -ggdb' 'OPTLDFLAGS=-Wl,-O1 -Wl,--as-needed' OPTCC=sparc-unknown-linux-gnu-gcc OPTAR=sparc-unknown-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 `/var/tmp/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 `/var/tmp/portage/dev-vcs/git-1.7.3.4-r1/work/git-1.7.3.4/t' >*** t0000-basic.sh *** >*** t0001-init.sh *** >*** t0002-gitfile.sh *** >*** t0003-attributes.sh *** >*** t0004-unwritable.sh *** >*** t0005-signals.sh *** >*** t0006-date.sh *** >*** t0010-racy-git.sh *** >ok 1 - initial setup >ok 1 - .git/objects should be empty after git init in an empty repo. >ok 2 - .git/objects should have 3 subdirectories. >ok 3 - success is reported like this >not ok 4 - pretend we have a known breakage # TODO known breakage >ok 1 - setup >ok 2 - bad setup: invalid .git file format >ok 3 - bad setup: invalid .git file path >ok 1 - sigchain works >ok 1 - relative date (5 seconds ago) ># passed all 1 test(s) >1..1 >ok 4 - final setup + check rev-parse --git-dir >ok 1 - plain >ok 2 - relative date (5 minutes ago) >ok 1 - setup >ok 1 - Racy GIT trial #0 part A >*** t0020-crlf.sh *** >ok 3 - relative date (5 hours ago) >ok 5 - check hash-object >ok 2 - write-tree should notice unwritable repository >ok 2 - plain with GIT_WORK_TREE >ok 4 - relative date (5 days ago) >ok 6 - check cat-file >ok 3 - commit should notice unwritable repository >ok 5 - relative date (3 weeks ago) >ok 6 - relative date (5 months ago) >ok 7 - check update-index >ok 5 - pretend we have fixed a known breakage (run in sub test-lib) >ok 4 - update-index should notice unwritable repository >ok 6 - test runs if prerequisite is satisfied >ok 7 # skip unmet prerequisite causes test to be skipped (missing DONTHAVEIT) >ok 7 - relative date (1 year, 2 months ago) >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 3 - plain bare >ok 11 - tests clean up after themselves >ok 12 - tests clean up even after a failure >ok 8 - relative date (1 year, 9 months ago) >ok 5 - add should notice unwritable repository >ok 13 - failure to clean up causes the test to fail >ok 8 - check write-tree ># passed all 5 test(s) >1..5 >ok 9 - relative date (20 years ago) >ok 4 - plain bare with GIT_WORK_TREE >ok 14 - git update-index without --add should fail adding. >ok 10 - relative date (12 months ago) >ok 9 - check commit-tree >*** t0021-conversion.sh *** >ok 15 - git update-index with --add should succeed. >ok 11 - parse date (2008) >ok 10 - check rev-list ># passed all 10 test(s) >1..10 >ok 16 - writing tree out with git write-tree >ok 12 - parse date (2008-02) >ok 17 - validate object ID of a known tree. >ok 13 - parse date (2008-02-14) >ok 5 - GIT_DIR bare >*** t0022-crlf-rename.sh *** >ok 18 - git update-index without --remove should fail removing. >ok 14 - parse date (2008-02-14 20:30:45) >ok 2 - attribute test >ok 19 - git update-index with --remove should be able to remove. >ok 15 - parse date (2008-02-14 20:30:45 -0500) >ok 3 - attribute test: read paths from stdin >ok 20 - git write-tree should be able to write an empty tree. >ok 21 - validate object ID of a known tree. >ok 16 - parse date (2008-02-14 20:30:45 TZ=EST5) >ok 17 - parse approxidate (now) >ok 6 - init --bare >ok 4 - root subdir attribute test >ok 18 - parse approxidate (5 seconds ago) >ok 22 - adding various types of objects with git update-index --add. >ok 19 - parse approxidate (5.seconds.ago) >ok 23 - showing stage with git ls-files --stage >ok 24 - validate git ls-files output for a known tree. >ok 20 - parse approxidate (10.minutes.ago) >ok 5 - setup bare >ok 25 - writing tree out with git write-tree. >ok 26 - validate object ID for a known tree. >ok 21 - parse approxidate (yesterday) >ok 1 - setup >ok 7 - GIT_DIR non-bare >ok 27 - showing tree with git ls-tree >ok 22 - parse approxidate (3.days.ago) >ok 28 - git ls-tree output for a known tree. >ok 23 - parse approxidate (3.weeks.ago) >ok 29 - showing tree with git ls-tree -r >ok 2 - Racy GIT trial #0 part B >ok 1 - setup >ok 30 - git ls-tree -r output for a known tree. >ok 24 - parse approxidate (3.months.ago) >ok 2 - safecrlf: autocrlf=input, all CRLF >ok 31 - showing tree with git ls-tree -r -t >ok 32 - git ls-tree -r output for a known tree. >ok 3 - Racy GIT trial #1 part A >ok 25 - parse approxidate (2.years.3.months.ago) >ok 1 - setup >ok 33 - writing partial tree out with git write-tree --prefix. >ok 34 - validate object ID for a known tree. >ok 26 - parse approxidate (6am yesterday) >ok 8 - GIT_DIR & GIT_WORK_TREE (1) >ok 6 - bare repository: check that .gitattribute is ignored >ok 2 - diff -M ># passed all 2 test(s) >1..2 >ok 3 - safecrlf: autocrlf=input, mixed LF/CRLF >ok 27 - parse approxidate (6pm yesterday) >ok 35 - writing partial tree out with git write-tree --prefix. >ok 36 - validate object ID for a known tree. >ok 2 - check >ok 9 - GIT_DIR & GIT_WORK_TREE (2) >ok 28 - parse approxidate (3:00) >*** t0023-crlf-am.sh *** >ok 37 - put invalid objects into the index. >ok 29 - parse approxidate (15:00) >ok 38 - writing this tree without --missing-ok. >ok 30 - parse approxidate (noon today) >ok 4 - safecrlf: autocrlf=true, all LF >ok 39 - writing this tree with --missing-ok. >ok 31 - parse approxidate (noon yesterday) >ok 7 - bare repository: test info/attributes ># passed all 7 test(s) >1..7 >ok 10 - reinit >ok 32 - parse approxidate (last tuesday) >ok 3 - expanded_in_repo ># passed all 3 test(s) >1..3 >ok 33 - parse approxidate (July 5th) >ok 40 - git read-tree followed by write-tree should be idempotent. >*** t0024-crlf-archive.sh *** >ok 5 - safecrlf: autocrlf=true mixed LF/CRLF >ok 11 - init with --template >ok 34 - parse approxidate (06/05/2009) >ok 41 - validate git diff-files output for a know cache/work tree state. >*** t0025-crlf-auto.sh *** >ok 35 - parse approxidate (06.05.2009) >ok 42 - git update-index --refresh should succeed. >ok 36 - parse approxidate (Jun 6, 5AM) >ok 43 - no diff after checkout and git update-index --refresh. >ok 12 - init with --template (blank) >ok 37 - parse approxidate (5AM Jun 6) >ok 6 - safecrlf: print warning only once >ok 38 - parse approxidate (6AM, June 7, 2009) ># passed all 38 test(s) >1..38 >ok 1 - setup >ok 44 - git commit-tree records the correct tree in a commit. >ok 13 - init with init.templatedir set >*** t0026-eol-config.sh *** >ok 7 - switch off autocrlf, safecrlf, reset HEAD >ok 45 - git commit-tree records the correct parent in a commit. >ok 1 - setup >ok 2 - tar archive >ok 4 - Racy GIT trial #1 part B >ok 46 - git commit-tree omits duplicated parent in a commit. >ok 8 - update with autocrlf=input >ok 14 - init --bare/--shared overrides system/global config >ok 3 - zip archive ># passed all 3 test(s) >1..3 >ok 5 - Racy GIT trial #2 part A >ok 1 - setup >ok 47 - update-index D/F conflict >*** t0030-stripspace.sh *** >ok 15 - init honors global core.sharedRepository >ok 1 - setup >ok 9 - update with autocrlf=true >ok 16 - init rejects insanely long --template >ok 2 - default settings cause no changes >ok 48 - absolute path works as expected >ok 17 - init creates a new directory >ok 3 - crlf=true causes a CRLF file to be normalized >ok 18 - init creates a new bare directory >ok 2 - am >ok 2 - eol=lf puts LFs in normalized file ># passed all 2 test(s) >1..2 >ok 49 - very long name in the index handled sanely >ok 4 - text=true causes a CRLF file to be normalized ># still have 1 known breakage(s) ># passed all remaining 48 test(s) >1..49 >*** t0040-parse-options.sh *** >ok 19 - init recreates a directory >ok 1 - long lines without spaces should be unchanged >*** t0050-filesystem.sh *** >ok 10 - checkout with autocrlf=true >ok 3 - eol=crlf puts CRLFs in normalized file >ok 20 - init recreates a new bare directory >ok 5 - eol=crlf gives a normalized file CRLFs with autocrlf=false >ok 2 - lines with spaces at the beginning should be unchanged >ok 21 - init creates a new deep directory >ok 6 - eol=crlf gives a normalized file CRLFs with autocrlf=input >ok 3 - lines with intermediate spaces should be unchanged >ok 4 - autocrlf=true overrides eol=lf >ok 1 - test help >ok 6 - Racy GIT trial #2 part B >ok 22 - init creates a new deep directory (umask vs. shared) >ok 1 - see what we expect >ok 7 - eol=lf gives a normalized file LFs with autocrlf=true >ok 11 - checkout with autocrlf=input >ok 2 - detection of case insensitive filesystem during repo init >ok 2 - short options >ok 23 - init notices EEXIST (1) >ok 3 - detection of filesystem w/o symlink support during repo init >ok 7 - Racy GIT trial #3 part A >ok 3 - long options >ok 24 - init notices EEXIST (2) >ok 5 - autocrlf=true overrides unset eol ># passed all 5 test(s) >1..5 >ok 12 - apply patch (autocrlf=input) >ok 25 - init notices EPERM >ok 4 - missing required value >*** t0055-beyond-symlinks.sh *** >ok 8 - autocrlf=true does not normalize CRLF files >ok 5 - intermingled arguments >ok 26 - init creates a new bare directory with global --bare >ok 6 - unambiguously abbreviated option >ok 13 - apply patch --cached (autocrlf=input) >ok 7 - unambiguously abbreviated option with "=" >ok 27 - init prefers command line to GIT_DIR ># passed all 27 test(s) >1..27 >ok 8 - ambiguously abbreviated option >ok 9 - non ambiguous option (after two options it abbreviates) >ok 4 - consecutive blank lines should be unified >ok 10 - detect possible typos >ok 9 - text=auto, autocrlf=true _does_ normalize CRLF files >ok 4 - setup case tests >*** t0060-path-utils.sh *** >ok 11 - keep some options as arguments >ok 1 - setup >ok 14 - apply patch --index (autocrlf=input) >ok 5 - rename (case change) >ok 12 - OPT_DATE() and OPT_SET_PTR() work >ok 10 - text=auto, autocrlf=true does not normalize binary files >ok 13 - OPT_CALLBACK() and OPT_BIT() work >ok 2 - update-index --add beyond symlinks >ok 14 - OPT_CALLBACK() and callback errors work >ok 3 - add beyond symlinks >ok 11 - eol=crlf _does_ normalize binary files >ok 15 - apply patch (autocrlf=true) ># passed all 11 test(s) >1..11 ># passed all 3 test(s) >1..3 >ok 6 - merge (case change) >ok 15 - OPT_BIT() and OPT_SET_INT() work >ok 5 - only consecutive blank lines should be completely removed >ok 16 - OPT_NEGBIT() and OPT_SET_INT() work >*** t0061-run-command.sh *** >*** t0070-fundamental.sh *** >ok 17 - OPT_BIT() works >ok 1 - normalize path: => >ok 16 - apply patch --cached (autocrlf=true) >ok 18 - OPT_NEGBIT() works >ok 2 - normalize path: . => >ok 8 - Racy GIT trial #3 part B >not ok 7 - add (with different case) # TODO known breakage >ok 19 - OPT_BOOLEAN() with PARSE_OPT_NODASH works >ok 3 - normalize path: ./ => >ok 4 - normalize path: ./. => >ok 9 - Racy GIT trial #4 part A >ok 20 - OPT_NUMBER_CALLBACK() works >ok 21 - negation of OPT_NONEG flags is not ambiguous >ok 5 - normalize path: ./.. => ++failed++ ># passed all 21 test(s) >1..21 >ok 17 - apply patch --index (autocrlf=true) >ok 1 - character classes (isspace, isalpha etc.) >ok 6 - normalize path: ../. => ++failed++ ># passed all 1 test(s) >1..1 >*** t0080-vcs-svn.sh *** >ok 7 - normalize path: ./../.// => ++failed++ >*** t0100-previous.sh *** >ok 1 - start_command reports ENOENT ># passed all 1 test(s) >1..1 >ok 8 - normalize path: dir/.. => >ok 18 - .gitattributes says two is binary >ok 9 - normalize path: dir/sub/../.. => >*** t0101-at-syntax.sh *** >ok 6 - consecutive blank lines at the beginning should be removed >ok 10 - normalize path: dir/sub/../../.. => ++failed++ >ok 19 - .gitattributes says two is input >ok 11 - normalize path: dir => dir >ok 12 - normalize path: dir// => dir/ >ok 20 - .gitattributes says two and three are text >ok 13 - normalize path: ./dir => dir >ok 8 - setup unicode normalization tests >ok 14 - normalize path: dir/. => dir/ >ok 15 - normalize path: dir///./ => dir/ >ok 1 - obj pool: store data >ok 9 - rename (silent unicode normalization) >ok 16 - normalize path: dir//sub/.. => dir/ >ok 2 - obj pool: NULL is offset ~0 >ok 17 - normalize path: dir/sub/../ => dir/ >ok 21 - in-tree .gitattributes (1) >ok 3 - obj pool: out-of-bounds access >ok 18 - normalize path: dir/sub/../. => dir/ >ok 4 - obj pool: high-water mark >ok 19 - normalize path: dir/s1/../s2/ => dir/s2/ >ok 10 - merge (silent unicode normalization) ># still have 1 known breakage(s) ># passed all remaining 9 test(s) >1..10 >ok 20 - normalize path: d1/s1///s2/..//../s3/ => d1/s3/ >ok 22 - in-tree .gitattributes (2) >ok 21 - normalize path: d1/s1//../s2/../../d2 => d2 >*** t1000-read-tree-m-3way.sh *** >ok 22 - normalize path: d1/.../d2 => d1/.../d2 >ok 23 - normalize path: d1/..././../d2 => d1/d2 >ok 1 - setup >ok 1 - branch -d @{-1} >ok 7 - consecutive blank lines at the end should be removed >ok 23 - in-tree .gitattributes (3) >ok 2 - @{0} shows current >ok 24 - normalize path: / => / >ok 10 - Racy GIT trial #4 part B >ok 25 - normalize path: // => / >ok 3 - @{1} shows old ># passed all 10 test(s) >1..10 >ok 5 - line buffer >ok 26 - normalize path: /// => / >ok 4 - @{now} shows current >*** t1001-read-tree-m-2way.sh *** >ok 27 - normalize path: /. => / >ok 24 - in-tree .gitattributes (4) >ok 5 - @{2001-09-17} (before the first commit) shows old >ok 8 - text without newline at end should end with newline >ok 28 - normalize path: /./ => / >ok 6 - silly approxidates work >ok 2 - branch -d @{-12} when there is not enough switches yet >ok 29 - normalize path: /./.. => ++failed++ >ok 1 - adding test file NN and Z/NN >ok 7 - notice misspelled upstream >ok 30 - normalize path: /../. => ++failed++ >ok 6 - string pool >ok 8 - complain about total nonsense ># passed all 8 test(s) >1..8 >ok 31 - normalize path: /./../.// => ++failed++ >ok 2 - adding test file ND and Z/ND >ok 7 - treap sort ># passed all 7 test(s) >1..7 >ok 32 - normalize path: /dir/.. => / >*** t1002-read-tree-m-u-2way.sh *** >ok 33 - normalize path: /dir/sub/../.. => / >ok 3 - adding test file NM and Z/NM >*** t1003-read-tree-prefix.sh *** >ok 9 - text plus spaces without newline at end should end with newline >ok 34 - normalize path: /dir/sub/../../.. => ++failed++ >ok 35 - normalize path: /dir => /dir >ok 4 - adding test file DN and Z/DN >ok 36 - normalize path: /dir// => /dir/ >ok 37 - normalize path: /./dir => /dir >ok 5 - adding test file DD and Z/DD >ok 38 - normalize path: /dir/. => /dir/ >ok 6 - adding test file DM and Z/DM >ok 25 - checkout with existing .gitattributes >ok 39 - normalize path: /dir///./ => /dir/ >ok 10 - text plus spaces without newline at end should not show spaces >ok 40 - normalize path: /dir//sub/.. => /dir/ >ok 7 - adding test file MN and Z/MN >ok 41 - normalize path: /dir/sub/../ => /dir/ >ok 1 - setup >ok 1 - setup >ok 42 - normalize path: //dir/sub/../. => /dir/ >ok 8 - adding test file MD and Z/MD >ok 43 - normalize path: /dir/s1/../s2/ => /dir/s2/ >ok 2 - read-tree --prefix ># passed all 2 test(s) >1..2 >ok 44 - normalize path: /d1/s1///s2/..//../s3/ => /d1/s3/ >ok 9 - adding test file MM and Z/MM >ok 3 - merge @{-1} >*** t1004-read-tree-m-u-wf.sh *** >ok 45 - normalize path: /d1/s1//../s2/../../d2 => /d2 >ok 10 - adding test file SS >ok 26 - checkout when deleting .gitattributes >ok 11 - text plus spaces without newline should show the correct lines >ok 11 - adding test file TT >ok 46 - normalize path: /d1/.../d2 => /d1/.../d2 >ok 27 - invalid .gitattributes (must not crash) >ok 1 - setup >ok 47 - normalize path: /d1/..././../d2 => /d1/d2 >ok 12 - prepare initial tree >ok 48 - longest ancestor: / => -1 >ok 13 - change in branch A (removal) >ok 49 - longest ancestor: / / => -1 >ok 2 - 1, 2, 3 - no carry forward >ok 14 - change in branch A (modification) >ok 15 - change in branch A (modification) >ok 50 - longest ancestor: /foo => -1 >ok 16 - change in branch A (modification) >ok 51 - longest ancestor: /foo : => -1 >ok 17 - change in branch A (modification) >ok 52 - longest ancestor: /foo ::. => -1 >ok 12 - text plus spaces at end should not show spaces >ok 53 - longest ancestor: /foo ::..:: => -1 >ok 18 - change in branch A (modification) >ok 28 - setting up for new autocrlf tests >ok 2 - 1, 2, 3 - no carry forward >ok 4 - merge @{-1} when there is not enough switches yet ># passed all 4 test(s) >1..4 >ok 54 - longest ancestor: /foo / => 0 >ok 19 - change in branch A (modification) >ok 29 - report no change after setting autocrlf >ok 20 - change in branch A (addition) >ok 55 - longest ancestor: /foo /fo => -1 >*** t1005-read-tree-reset.sh *** >ok 21 - change in branch A (addition) >ok 56 - longest ancestor: /foo /foo => -1 >ok 3 - 4 - carry forward local addition. >ok 30 - files are clean after checkout >ok 57 - longest ancestor: /foo /foo/ => -1 >ok 31 - LF only file gets CRLF with autocrlf >ok 22 - change in branch A (addition) >ok 32 - Mixed file is still mixed with autocrlf >ok 33 - CRLF only file has CRLF with autocrlf >ok 58 - longest ancestor: /foo /bar => -1 >ok 23 - change in branch A (addition) >ok 13 - text plus spaces at end should be cleaned and newline must remain >ok 59 - longest ancestor: /foo /bar/ => -1 >ok 60 - longest ancestor: /foo /foo/bar => -1 >ok 61 - longest ancestor: /foo /foo:/bar/ => -1 >ok 62 - longest ancestor: /foo /foo/:/bar/ => -1 >ok 1 - two-way setup >ok 63 - longest ancestor: /foo /foo::/bar/ => -1 >ok 3 - 4 - carry forward local addition. >ok 24 - change in branch A (addition) >ok 2 - two-way not clobbering >ok 64 - longest ancestor: /foo /:/foo:/bar/ => 0 >ok 65 - longest ancestor: /foo /foo:/:/bar/ => 0 >ok 3 - two-way with incorrect --exclude-per-directory (1) >ok 25 - change in branch A (edit) >ok 66 - longest ancestor: /foo /:/bar/:/foo => 0 >ok 4 - two-way with incorrect --exclude-per-directory (2) >ok 26 - change in branch A (change file to directory) >ok 5 - two-way clobbering a ignored file >ok 67 - longest ancestor: /foo/bar => -1 >ok 34 - New CRLF file gets LF in repo >ok 14 - spaces with newline at end should be replaced with empty string ># passed all 34 test(s) >1..34 >ok 68 - longest ancestor: /foo/bar / => 0 >ok 27 - recording branch A tree >ok 69 - longest ancestor: /foo/bar /fo => -1 >*** t1006-cat-file.sh *** >ok 4 - 5 - carry forward local addition. >ok 70 - longest ancestor: /foo/bar foo => -1 >ok 28 - reading original tree and checking out >ok 71 - longest ancestor: /foo/bar /foo => 4 >ok 4 - 5 - carry forward local addition. >ok 29 - change in branch B (removal) >ok 15 - spaces without newline at end should not show spaces >ok 72 - longest ancestor: /foo/bar /foo/ => 4 >ok 30 - change in branch B (modification) >ok 73 - longest ancestor: /foo/bar /foo/ba => -1 >ok 1 - setup >ok 31 - change in branch B (modification) >ok 74 - longest ancestor: /foo/bar /:/fo => 0 >ok 6 - three-way not complaining on an untracked path in both >ok 32 - change in branch B (modification) >ok 75 - longest ancestor: /foo/bar /foo:/foo/ba => 4 >ok 2 - reset should work >ok 5 - 6 - local addition already has the same. >ok 33 - change in branch B (modification) >ok 16 - spaces without newline at end should be replaced with empty string >ok 76 - longest ancestor: /foo/bar /bar => -1 >ok 34 - change in branch B (modification) >ok 5 - 6 - local addition already has the same. >ok 77 - longest ancestor: /foo/bar /bar/ => -1 >ok 1 - setup >ok 7 - three-way not clobbering a working tree file >ok 35 - change in branch B (modification) >ok 78 - longest ancestor: /foo/bar /fo: => -1 >ok 2 - blob exists >ok 36 - change in branch B (addition) >ok 79 - longest ancestor: /foo/bar :/fo => -1 >ok 3 - Type of blob is correct >ok 37 - change in branch B (addition) >ok 80 - longest ancestor: /foo/bar /foo:/bar/ => 4 >ok 4 - Size of blob is correct >ok 38 - change in branch B (addition) >ok 81 - longest ancestor: /foo/bar /:/foo:/bar/ => 4 >ok 5 - Content of blob is correct >ok 8 - three-way not complaining on an untracked file >ok 3 - reset should remove remnants from a failed merge >ok 39 - change in branch B (addition) >ok 6 - 7 - local addition already has the same. >ok 17 - consecutive text lines should be unchanged >ok 82 - longest ancestor: /foo/bar /foo:/:/bar/ => 4 >ok 6 - 7 - local addition already has the same. >ok 6 - Pretty content of blob is correct >ok 83 - longest ancestor: /foo/bar /:/bar/:/fo => 0 >ok 40 - change in branch B (addition and modification) >ok 84 - longest ancestor: /foo/bar /:/bar/ => 0 >ok 18 - strip comments, too ># passed all 18 test(s) >1..18 >ok 7 - --batch output of blob is correct >ok 85 - longest ancestor: /foo/bar .:/foo/. => 4 >ok 41 - change in branch B (modification) >ok 8 - --batch-check output of blob is correct >ok 7 - 8 - conflicting addition. >*** t1007-hash-object.sh *** >ok 86 - longest ancestor: /foo/bar .:/foo/.:.: => 4 >ok 7 - 8 - conflicting addition. >ok 42 - change in branch B (addition of a file to conflict with directory) >ok 87 - longest ancestor: /foo/bar /foo/./:.:/bar => 4 >ok 9 - tree exists >ok 43 - recording branch B tree >ok 88 - longest ancestor: /foo/bar .:/bar => -1 >ok 8 - 9 - conflicting addition. >ok 4 - Porcelain reset should remove remnants too >ok 10 - Type of tree is correct >ok 89 - strip_path_suffix ># passed all 89 test(s) >1..89 >ok 9 - 3-way not overwriting local changes (setup) >ok 11 - Size of tree is correct >ok 8 - 9 - conflicting addition. >*** t1008-read-tree-overlay.sh *** >ok 12 - Pretty content of tree is correct >ok 10 - 3-way not overwriting local changes (our side) >ok 9 - 10 - path removed. >ok 13 - --batch-check output of tree is correct >ok 1 - multiple '--stdin's are rejected >ok 11 - 3-way not overwriting local changes (their side) >ok 44 - keep contents of 3 trees for easy access >ok 14 - commit exists >ok 5 - Porcelain checkout -f should remove remnants too >ok 10 - 11 - dirty path removed. >ok 2 - Can't use --stdin and --stdin-paths together >ok 9 - 10 - path removed. >ok 15 - Type of commit is correct >ok 3 - Can't pass filenames as arguments with --stdin-paths >ok 16 - Size of commit is correct >ok 4 - Can't use --path with --stdin-paths >ok 45 - 3-way merge with git read-tree -m, empty cache >ok 11 - 12 - unmatching local changes being removed. >ok 5 - Can't use --path with --no-filters >ok 10 - 11 - dirty path removed. >ok 17 - Content of commit is correct >ok 12 - 13 - unmatching local changes being removed. >ok 6 - hash a file >ok 6 - Porcelain checkout -f HEAD should remove remnants too ># passed all 6 test(s) >1..6 >ok 46 - 3-way merge with git read-tree -m, match H >ok 18 - Pretty content of commit is correct >ok 7 - blob does not exist in database >ok 11 - 12 - unmatching local changes being removed. >*** t1009-read-tree-new-index.sh *** >ok 8 - hash from stdin >ok 47 - 1 - must not have an entry not in A. >ok 9 - blob does not exist in database >ok 12 - funny symlink in work tree >ok 19 - --batch output of commit is correct >ok 10 - hash a file and write to database >ok 20 - --batch-check output of commit is correct >ok 48 - 2 - must match B in !O && !A && B case. >ok 11 - blob exists in database >ok 12 - 13 - unmatching local changes being removed. >ok 1 - setup >ok 13 - funny symlink in work tree, un-unlink-able >ok 21 - tag exists >ok 49 - 2 - matching B alone is OK in !O && !A && B case. >ok 13 - 14 - unchanged in two heads. >ok 22 - Type of tag is correct >ok 2 - multi-read ># passed all 2 test(s) >1..2 >ok 23 - Size of tag is correct >ok 12 - git hash-object --stdin file1 <file0 first operates on file0, then file1 >ok 50 - 3 - must match A in !O && A && !B case. >*** t1010-mktree.sh *** >ok 24 - Content of tag is correct >ok 1 - setup >ok 2 - non-existent index file >ok 51 - 3 - matching A alone is OK in !O && A && !B case. >ok 14 - D/F setup >ok 3 - empty index file ># passed all 3 test(s) >1..3 >ok 13 - 14 - unchanged in two heads. >ok 25 - Pretty content of tag is correct >*** t1011-read-tree-sparse-checkout.sh *** >ok 52 - 3 (fail) - must match A in !O && A && !B case. >ok 14 - 15 - unchanged in two heads. >ok 26 - --batch output of tag is correct >ok 13 - check that appropriate filter is invoke when --path is used >ok 27 - --batch-check output of tag is correct >ok 15 - 16 - conflicting local change. >ok 15 - D/F >ok 53 - 4 - must match and be up-to-date in !O && A && B && A!=B case. >ok 28 - Reach a blob from a tag pointing to it >ok 29 - Passing -t with --batch fails >ok 30 - Passing --batch with -t fails >ok 54 - 4 (fail) - must match and be up-to-date in !O && A && B && A!=B case. >ok 31 - Passing -s with --batch fails >ok 14 - 15 - unchanged in two heads. >ok 16 - 17 - conflicting local change. >ok 32 - Passing --batch with -s fails >ok 33 - Passing -e with --batch fails >ok 55 - 4 (fail) - must match and be up-to-date in !O && A && B && A!=B case. >ok 34 - Passing --batch with -e fails >ok 14 - check that --no-filters option works >ok 35 - Passing -p with --batch fails >ok 36 - Passing --batch with -p fails >ok 15 - 16 - conflicting local change. >ok 16 - D/F resolve >ok 37 - Passing <type> with --batch fails >ok 38 - Passing --batch with <type> fails >ok 56 - 5 - must match in !O && A && B && A==B case. >ok 17 - 18 - local change already having a good result. >ok 39 - Passing sha1 with --batch fails >ok 40 - Passing -t with --batch-check fails >ok 16 - 17 - conflicting local change. >ok 15 - check that --no-filters option works with --stdin-paths >ok 17 - D/F recursive >ok 41 - Passing --batch-check with -t fails ># passed all 17 test(s) >1..17 >ok 42 - Passing -s with --batch-check fails >ok 57 - 5 - must match in !O && A && B && A==B case. >ok 43 - Passing --batch-check with -s fails >*** t1012-read-tree-df.sh *** >ok 44 - Passing -e with --batch-check fails >ok 58 - 5 (fail) - must match A in !O && A && B && A==B case. >ok 16 - hash from stdin and write to database (-w --stdin) >ok 45 - Passing --batch-check with -e fails >ok 17 - blob exists in database >ok 46 - Passing -p with --batch-check fails >ok 1 - setup >ok 18 - 19 - local change already having a good result, further modified. >ok 47 - Passing --batch-check with -p fails >ok 59 - 6 - must not exist in O && !A && !B case >ok 48 - Passing <type> with --batch-check fails >ok 17 - 18 - local change already having a good result. >ok 49 - Passing --batch-check with <type> fails >ok 18 - hash from stdin and write to database (--stdin -w) >ok 1 - setup >ok 60 - 7 - must not exist in O && !A && B && O!=B case >ok 50 - Passing sha1 with --batch-check fails >ok 2 - read-tree without .git/info/sparse-checkout >ok 19 - blob exists in database >ok 2 - ls-tree piped to mktree (1) >ok 51 - --batch-check for a non-existent named object >ok 3 - ls-tree piped to mktree (2) >ok 61 - 8 - must not exist in O && !A && B && O==B case >ok 20 - hash two files with names on stdin >ok 52 - --batch-check for a non-existent hash >ok 3 - read-tree with .git/info/sparse-checkout but disabled >ok 19 - 20 - no local change, use new tree. >ok 4 - ls-tree output in wrong order given to mktree (1) >ok 53 - --batch for an existent and a non-existent hash >ok 5 - ls-tree output in wrong order given to mktree (2) >ok 54 - --batch-check for an emtpy line >ok 21 - hash two files with names on stdin and write to database (-w --stdin-paths) >ok 4 - read-tree --no-sparse-checkout with empty .git/info/sparse-checkout and enabled >ok 20 - 21 - no local change, dirty cache. >ok 62 - 9 - must match and be up-to-date in O && A && !B && O!=A case >ok 6 - allow missing object with --missing >ok 22 - blob exists in database >ok 18 - 19 - local change already having a good result, further modified. >ok 7 - mktree refuses to read ls-tree -r output (1) >ok 23 - blob exists in database >ok 55 - --batch with multiple sha1s gives correct format >ok 56 - --batch-check with multiple sha1s gives correct format ># passed all 56 test(s) >1..56 >ok 8 - mktree refuses to read ls-tree -r output (2) ># passed all 8 test(s) >1..8 >*** t1020-subdirectory.sh *** >ok 63 - 9 (fail) - must match and be up-to-date in O && A && !B && O!=A case >ok 24 - hash two files with names on stdin and write to database (--stdin-paths -w) >*** t1100-commit-tree-options.sh *** >ok 5 - read-tree with empty .git/info/sparse-checkout >ok 25 - blob exists in database >ok 64 - 9 (fail) - must match and be up-to-date in O && A && !B && O!=A case >ok 26 - blob exists in database ># passed all 26 test(s) >1..26 >ok 6 - match directories with trailing slash >ok 21 - DF vs DF/DF case setup. >*** t1200-tutorial.sh *** >ok 19 - 20 - no local change, use new tree. >not ok 7 - match directories without trailing slash # TODO known breakage >ok 65 - 10 - must match and be up-to-date in O && A && !B && O==A case >ok 1 - setup >ok 8 - checkout area changes >ok 1 - test preparation: write empty tree >ok 22 - DF vs DF/DF case test. >ok 66 - 10 (fail) - must match and be up-to-date in O && A && !B && O==A case ># passed all 22 test(s) >1..22 >ok 20 - 21 - no local change, dirty cache. >ok 2 - construct commit >ok 9 - read-tree updates worktree, absent case >*** t1300-repo-config.sh *** >ok 67 - 10 (fail) - must match and be up-to-date in O && A && !B && O==A case >ok 3 - read commit >ok 4 - compare commit ># passed all 4 test(s) >1..4 >ok 2 - update-index and ls-files >ok 10 - read-tree updates worktree, dirty case >*** t1301-shared-repo.sh *** >ok 1 - blob >ok 21 - 22 - local change cache updated. >ok 11 - read-tree removes worktree, dirty case >ok 68 - 11 - must match and be up-to-date in O && A && B && O!=A && O!=B && A!=B case >ok 2 - blob 557db03 >ok 3 - cat-file >ok 69 - 11 (fail) - must match and be up-to-date in O && A && B && O!=A && O!=B && A!=B case >ok 3 - git diff-files -p >ok 12 - read-tree adds to worktree, absent case >ok 4 - git diff >ok 70 - 11 (fail) - must match and be up-to-date in O && A && B && O!=A && O!=B && A!=B case >ok 5 - tree >ok 1 - initial >ok 13 - read-tree adds to worktree, dirty case >ok 4 - diff-files >ok 22 - DF vs DF/DF case setup. >ok 2 - mixed case >ok 1 - shared = 0400 (faulty permission u-w) >ok 71 - 12 - must match A in O && A && B && O!=A && A==B case >ok 3 - similar section >ok 5 - write-tree >ok 14 - index removal and worktree narrowing at the same time >ok 6 - git diff-index -p HEAD >ok 4 - similar section >ok 5 - replace with non-match >ok 7 - git diff HEAD >ok 6 - checkout-index >ok 23 - DF vs DF/DF case test. >ok 6 - replace with non-match (actually matching) >ok 2 - shared=1 does not clear bits preset by umask 002 >ok 72 - 12 - must match A in O && A && B && O!=A && A==B case >ok 7 - non-match result >ok 8 - git whatchanged -p --root >ok 15 - read-tree --reset removes outside worktree ># still have 1 known breakage(s) ># passed all remaining 14 test(s) >1..15 >ok 8 - unset with cont. lines >ok 9 - unset with cont. lines is correct >ok 9 - git tag my-first-tag >ok 73 - 12 (fail) - must match A in O && A && B && O!=A && A==B case >ok 10 - multiple unset >*** t1302-repo-version.sh *** >ok 11 - multiple unset is correct >ok 10 - git checkout -b mybranch >ok 7 - read-tree >ok 3 - shared=1 does not clear bits preset by umask 022 >ok 12 - --replace-all missing value >ok 11 - git branch >ok 74 - 13 - must match A in O && A && B && O!=A && O==B case >ok 13 - --replace-all >ok 8 - no file/rev ambiguity check inside .git >ok 24 - a/b (untracked) vs a case setup. >ok 14 - all replaced >ok 4 - shared=all >ok 15 - really mean test >ok 25 - a/b (untracked) vs a, plus c/d case test. >ok 75 - 13 - must match A in O && A && B && O!=A && O==B case >ok 16 - really really mean test >ok 17 - get value >ok 76 - 14 - must match and be up-to-date in O && A && B && O==A && O!=B case >ok 9 - no file/rev ambiguity check inside a bare repo >ok 5 - update-server-info honors core.sharedRepository >ok 6 - shared = 0660 (r--r-----) ro >ok 18 - unset >ok 12 - git resolve now fails >ok 7 - shared = 0660 (rw-rw----) rw >ok 26 - a/b vs a, plus c/d case setup. >ok 19 - multivar >ok 20 - non-match >ok 8 - shared = 0640 (r--r-----) ro >ok 21 - non-match value >ok 27 - a/b vs a, plus c/d case test. >ok 13 - git show-branch >ok 22 - ambiguous get >ok 23 - get multivar >ok 77 - 14 - may match B in O && A && B && O==A && O!=B case >ok 24 - multivar replace >ok 9 - shared = 0640 (rw-r-----) rw >ok 1 - setup >ok 25 - ambiguous value >ok 26 - ambiguous unset >ok 10 - detection should not be fooled by a symlink >ok 78 - 14 (fail) - must match and be up-to-date in O && A && B && O==A && O!=B case ># passed all 10 test(s) >1..10 >ok 27 - invalid unset >ok 14 - git resolve >ok 2 - gitdir selection on normal repos >ok 10 - shared = 0600 (r--------) ro >ok 15 - git show-branch (part 2) >ok 79 - 14 (fail) - must match and be up-to-date in O && A && B && O==A && O!=B case >ok 28 - multivar unset >ok 3 - gitdir selection on unsupported repo >*** t1303-wacky-config.sh *** >ok 29 - invalid key >ok 16 - git show-branch (part 3) >ok 11 - shared = 0600 (rw-------) rw >ok 30 - correct key >ok 31 - hierarchical section >ok 32 - hierarchical section value >ok 4 - gitdir not required mode >ok 80 - 15 - must match A in O && A && B && O==A && O==B case >ok 33 - working --list >ok 12 - shared = 0666 (r--r--r--) ro >ok 5 - gitdir required mode ># passed all 5 test(s) >1..5 >ok 34 - --get-regexp >ok 13 - shared = 0666 (rw-rw-rw-) rw >ok 17 - rewind to "Some fun." and "Some work." >ok 81 - 15 - must match A in O && A && B && O==A && O==B case >ok 28 - -m references the correct modified tree ># passed all 28 test(s) >1..28 >*** t1304-default-acl.sh *** >ok 35 - --add >ok 18 - git show-branch (part 4) >ok 82 - 15 (fail) - must match A in O && A && B && O==A && O==B case >ok 1 - modify same key >ok 36 - get variable with no value >ok 14 - shared = 0664 (r--r--r--) ro >*** t1400-update-ref.sh *** >ok 37 - get variable with empty value >ok 15 - shared = 0664 (rw-rw-r--) rw >ok 19 - manual merge >ok 38 - get-regexp variable with no value >ok 2 - add key in same section >ok 39 - get-regexp variable with empty value >ok 20 - git ls-files --stage >ok 16 - git reflog expire honors core.sharedRepository >ok 40 - get bool variable with no value >ok 21 - git ls-files --unmerged >ok 41 - get bool variable with empty value >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 3 - add key in different section >ok 83 - 16 - A matches in one and B matches in another. ># passed all 3 test(s) >1..3 ># passed all 83 test(s) >1..83 >ok 42 - no arguments, but no crash >*** t1401-symbolic-ref.sh *** >ok 4 - make sure git config escapes section names properly >ok 43 - new section is partial match of another >ok 22 - git-merge-index >*** t1402-check-ref-format.sh *** >ok 23 - git ls-files --stage (part 2) >ok 5 - do not crash on special long config line ># passed all 5 test(s) >1..5 >ok 44 - new variable inserts into proper section >ok 45 - alternative GIT_CONFIG (non-existing file should fail) >*** t1410-reflog.sh *** >ok 46 - alternative GIT_CONFIG >ok 47 - alternative GIT_CONFIG (--file) >ok 1 - symbolic-ref writes HEAD >ok 48 - refer config from subdirectory >ok 1 - ref name 'heads/foo' is valid >ok 2 - ref name 'foo' is not valid >ok 2 - symbolic-ref reads HEAD >ok 3 - ref name 'foo/bar/baz' is valid >ok 49 - --set in alternative GIT_CONFIG >ok 4 - ref name 'refs///heads/foo' is valid >ok 3 - symbolic-ref refuses non-ref for HEAD >ok 5 - ref name 'heads/foo/' is not valid >ok 50 - rename section >ok 24 - git repack >ok 51 - rename succeeded >ok 6 - ref name './foo' is not valid >ok 52 - rename non-existing section >ok 7 - ref name '.refs/foo' is not valid >ok 25 - git prune-packed >ok 53 - rename succeeded >ok 17 - forced modes ># passed all 17 test(s) >1..17 >ok 8 - ref name 'heads/foo..bar' is not valid >ok 1 - setup >ok 1 - setup >ok 54 - rename another section >ok 9 - ref name 'heads/foo?bar' is not valid >ok 4 - symbolic-ref refuses bare sha1 >ok 55 - rename succeeded ># passed all 4 test(s) >1..4 >ok 26 - -> only packed objects ># passed all 26 test(s) >1..26 >ok 10 - ref name 'foo./bar' is valid >ok 2 - create refs/heads/master >ok 56 - rename a section with a var on the same line >*** t1411-reflog-show.sh *** >*** t1412-reflog-loop.sh *** >ok 11 - ref name 'heads/foo.lock' is not valid >ok 57 - rename succeeded >*** t1420-lost-found.sh *** >ok 58 - remove section >ok 12 - ref name 'heads/foo@bar' is valid >ok 3 - create refs/heads/master >ok 59 - section was removed properly >ok 13 - ref name 'heads/v@{ation' is not valid >ok 4 - fail to delete refs/heads/master with stale ref >ok 14 - ref name 'heads/foo\bar' is not valid >ok 2 - 3-way (1) >ok 5 - delete refs/heads/master >ok 60 - section ending >ok 6 - delete refs/heads/master without oldvalue verification >ok 7 - fail to create refs/heads/gu/fixes >ok 1 - setup >ok 61 - numbers >ok 8 - create refs/heads/master (by HEAD) >ok 3 - 3-way (2) >ok 2 - log -g shows reflog headers >ok 9 - create refs/heads/master (by HEAD) >ok 62 - invalid unit >ok 3 - oneline reflog format >ok 10 - fail to delete refs/heads/master (by HEAD) with stale ref >ok 1 - setup commits >ok 4 - using @{now} syntax shows reflog date (multiline) >ok 11 - delete refs/heads/master (by HEAD) >ok 15 - check-ref-format --branch @{-1} >ok 1 - setup >ok 5 - using @{now} syntax shows reflog date (oneline) >ok 12 - delete symref without dereference >ok 4 - 3-way (3) >ok 6 - using --date= shows reflog date (multiline) >ok 7 - using --date= shows reflog date (oneline) >ok 13 - delete symref without dereference when the referred ref is packed >ok 8 - empty reflog file >ok 2 - lost and found something ># passed all 8 test(s) >1..8 ># passed all 2 test(s) >1..2 >ok 2 - setup reflog with alternating commits >ok 14 - (not) create HEAD with old sha1 >ok 15 - (not) prior created .git/refs/heads/master >*** t1450-fsck.sh *** >ok 3 - reflog shows all entries >*** t1500-rev-parse.sh *** ># passed all 3 test(s) >1..3 >ok 5 - 2-way (1) ># passed all 5 test(s) >1..5 >ok 16 - create HEAD >ok 16 - check-ref-format --branch from subdir >ok 17 - (not) change HEAD with wrong SHA1 >ok 18 - (not) changed .git/refs/heads/master >*** t1501-worktree.sh *** >ok 17 - ref name 'heads/foo' simplifies to 'heads/foo' >*** t1502-rev-parse-parseopt.sh *** >ok 18 - ref name 'refs///heads/foo' simplifies to 'refs/heads/foo' >ok 19 - create refs/heads/master (logged by touch) >ok 19 - check-ref-format --print rejects 'foo' >ok 63 - bool >ok 20 - check-ref-format --print rejects 'heads/foo/../bar' >ok 20 - update refs/heads/master (logged by touch) >ok 21 - check-ref-format --print rejects 'heads/./foo' >ok 64 - invalid bool (--get) >ok 22 - check-ref-format --print rejects 'heads\foo' >ok 65 - invalid bool (set) ># passed all 22 test(s) >1..22 >ok 21 - set refs/heads/master (logged by touch) >ok 22 - verifying refs/heads/master's log >ok 1 - toplevel: is-bare-repository >*** t1503-rev-parse-verify.sh *** >ok 2 - toplevel: is-inside-git-dir >ok 23 - enable core.logAllRefUpdates >ok 3 - toplevel: is-inside-work-tree >ok 1 - test --parseopt help output >ok 24 - create refs/heads/master (logged by config) >ok 4 - toplevel: prefix >ok 2 - test --parseopt >ok 5 - toplevel: git-dir >ok 25 - update refs/heads/master (logged by config) >ok 6 - .git/: is-bare-repository >ok 3 - test --parseopt with mixed options and arguments >ok 1 - setup >ok 2 - setup: helper for testing rev-parse >ok 7 - .git/: is-inside-git-dir >ok 3 - setup: core.worktree = relative path >ok 8 - .git/: is-inside-work-tree >ok 9 - .git/: prefix >ok 26 - set refs/heads/master (logged by config) >ok 27 - verifying refs/heads/master's log >ok 4 - test --parseopt with -- >ok 10 - .git/: git-dir >ok 66 - set --bool >ok 5 - test --parseopt --stop-at-non-option >ok 4 - outside >ok 11 - .git/objects/: is-bare-repository >ok 6 - test --parseopt --keep-dashdash >ok 12 - .git/objects/: is-inside-git-dir >ok 1 - setup >ok 7 - test --parseopt --keep-dashdash --stop-at-non-option with -- >ok 28 - Query "master@{May 25 2005}" (before history) >ok 13 - .git/objects/: is-inside-work-tree >ok 67 - set --int >ok 14 - .git/objects/: prefix >ok 8 - test --parseopt --keep-dashdash --stop-at-non-option without -- ># passed all 8 test(s) >1..8 >ok 29 - Query master@{2005-05-25} (before history) >ok 15 - .git/objects/: git-dir >ok 5 - inside work tree >ok 1 - setup >*** t1504-ceiling-dirs.sh *** >ok 16 - subdirectory: is-bare-repository >ok 30 - Query "master@{May 26 2005 23:31:59}" (1 second before history) >not ok 6 - empty prefix is actually written out # TODO known breakage >ok 17 - subdirectory: is-inside-git-dir >ok 31 - Query "master@{May 26 2005 23:32:00}" (exactly history start) >ok 18 - subdirectory: is-inside-work-tree >ok 68 - get --bool-or-int >ok 2 - loose objects borrowed from alternate are not missing >ok 19 - subdirectory: prefix >ok 32 - Query "master@{May 26 2005 23:32:30}" (first non-creation change) >ok 1 - set up basic repo with 1 file (hello) and 4 commits >ok 20 - subdirectory: git-dir >ok 3 - HEAD is part of refs, valid objects appear valid >ok 4 - setup: helpers for corruption tests >ok 7 - subdir of work tree >ok 33 - Query "master@{2005-05-26 23:33:01}" (middle of history with gap) >ok 21 - core.bare = true: is-bare-repository >ok 8 - setup: core.worktree = absolute path >ok 22 - core.bare = true: is-inside-git-dir >ok 34 - Query "master@{2005-05-26 23:38:00}" (middle of history) >ok 1 - no_ceil >ok 23 - core.bare = true: is-inside-work-tree >ok 2 - ceil_empty >ok 35 - Query "master@{2005-05-26 23:43:00}" (exact end of history) >ok 69 - set --bool-or-int >ok 3 - ceil_at_parent >ok 2 - works with one good rev >ok 24 - core.bare undefined: is-bare-repository >ok 4 - ceil_at_parent_slash >ok 36 - Query "master@{2005-05-28}" (past end of history) >ok 25 - core.bare undefined: is-inside-git-dir >ok 5 - ceil_at_trash >ok 70 - set --path >ok 26 - core.bare undefined: is-inside-work-tree >ok 9 - outside >ok 6 - ceil_at_trash_slash >ok 7 - ceil_at_sub >ok 27 - GIT_DIR=../.git, core.bare = false: is-bare-repository >ok 71 - get --path >ok 3 - fails with any bad rev or many good revs >ok 8 - ceil_at_sub_slash >ok 28 - GIT_DIR=../.git, core.bare = false: is-inside-git-dir >ok 10 - inside work tree >ok 9 - subdir_no_ceil >ok 29 - GIT_DIR=../.git, core.bare = false: is-inside-work-tree >ok 10 - subdir_ceil_empty >ok 30 - GIT_DIR=../.git, core.bare = false: prefix >ok 72 - get --path copes with unset $HOME >ok 11 - subdir_ceil_at_trash: prefix >ok 5 - object with bad sha1 >ok 12 - subdir_ceil_at_trash_slash: prefix >ok 31 - GIT_DIR=../.git, core.bare = true: is-bare-repository >ok 13 - subdir_ceil_at_sub: prefix >ok 32 - GIT_DIR=../.git, core.bare = true: is-inside-git-dir >ok 14 - subdir_ceil_at_sub_slash: prefix >ok 11 - subdir of work tree >ok 37 - creating initial files >ok 4 - fails silently when using -q >ok 2 - rewind >ok 33 - GIT_DIR=../.git, core.bare = true: is-inside-work-tree >ok 15 - subdir_ceil_at_subdir >ok 38 - git commit logged updates >ok 6 - branch pointing to non-commit >ok 73 - quoting >ok 12 - setup: GIT_WORK_TREE=relative (override core.worktree) >ok 34 - GIT_DIR=../.git, core.bare = true: prefix >ok 16 - subdir_ceil_at_subdir_slash >ok 39 - git cat-file blob master:F (expect OTHER) >ok 74 - key with newline >ok 3 - corrupt and check >ok 75 - value with newline >ok 17 - subdir_ceil_at_su >ok 40 - git cat-file blob master@{2005-05-26 23:30}:F (expect TEST) >ok 35 - GIT_DIR=../.git, core.bare undefined: is-bare-repository >ok 18 - subdir_ceil_at_su_slash >ok 41 - git cat-file blob master@{2005-05-26 23:42}:F (expect OTHER) >ok 76 - value continued on next line ># passed all 41 test(s) >1..41 >ok 36 - GIT_DIR=../.git, core.bare undefined: is-inside-git-dir >ok 19 - subdir_ceil_at_sub_di >ok 5 - no stdout output on error >ok 4 - reflog expire --dry-run should not touch reflog >ok 37 - GIT_DIR=../.git, core.bare undefined: is-inside-work-tree >ok 77 - --null --list >*** t1505-rev-parse-last.sh *** >ok 20 - subdir_ceil_at_sub_di_slash >ok 38 - GIT_DIR=../.git, core.bare undefined: prefix >ok 78 - --null --get-regexp >ok 13 - outside >ok 21 - subdir_ceil_at_subdi >ok 7 - email without @ is okay >ok 5 - reflog expire >ok 22 - subdir_ceil_at_subdi_slash >ok 39 - GIT_DIR=../repo.git, core.bare = false: is-bare-repository >ok 79 - inner whitespace kept verbatim >ok 23 - second_of_two: prefix >ok 24 - first_of_two: prefix >ok 40 - GIT_DIR=../repo.git, core.bare = false: is-inside-git-dir >ok 25 - second_of_three: prefix >ok 41 - GIT_DIR=../repo.git, core.bare = false: is-inside-work-tree >ok 26 - git_dir_specified >ok 14 - inside work tree >ok 42 - GIT_DIR=../repo.git, core.bare = false: prefix >ok 27 - sd_no_ceil >ok 6 - use --default >ok 80 - symlinked configuration >ok 28 - sd_ceil_empty >ok 43 - GIT_DIR=../repo.git, core.bare = true: is-bare-repository >ok 29 - sd_ceil_at_trash: prefix >ok 44 - GIT_DIR=../repo.git, core.bare = true: is-inside-git-dir >ok 8 - email with embedded > is not okay >ok 30 - sd_ceil_at_trash_slash: prefix >ok 45 - GIT_DIR=../repo.git, core.bare = true: is-inside-work-tree >ok 31 - sd_ceil_at_s: prefix >ok 15 - subdir of work tree >ok 46 - GIT_DIR=../repo.git, core.bare = true: prefix >ok 32 - sd_ceil_at_s_slash: prefix >ok 16 - setup: GIT_WORK_TREE=absolute, below git dir >ok 33 - sd_ceil_at_sd >ok 7 - master@{n} for various n >ok 47 - GIT_DIR=../repo.git, core.bare undefined: is-bare-repository ># passed all 7 test(s) >1..7 >ok 81 - check split_cmdline return >ok 34 - sd_ceil_at_sd_slash >ok 48 - GIT_DIR=../repo.git, core.bare undefined: is-inside-git-dir >ok 9 - tag pointing to nonexistent >ok 35 - sd_ceil_at_su >ok 17 - outside >*** t1506-rev-parse-diagnosis.sh *** >ok 49 - GIT_DIR=../repo.git, core.bare undefined: is-inside-work-tree >ok 6 - prune and fsck >ok 36 - sd_ceil_at_su_slash >ok 50 - GIT_DIR=../repo.git, core.bare undefined: prefix ># passed all 50 test(s) >1..50 >ok 37 - sd_ceil_at_s_di >ok 7 - recover and check >*** t1507-rev-parse-upstream.sh *** >ok 38 - sd_ceil_at_s_di_slash >ok 82 - git -c "key=value" support ># passed all 82 test(s) >1..82 >ok 39 - sd_ceil_at_sdi >ok 40 - sd_ceil_at_sdi_slash ># passed all 40 test(s) >1..40 >*** t1508-at-combinations.sh *** >ok 10 - tag pointing to something else than its type >ok 1 - setup >*** t1509-root-worktree.sh *** >ok 11 - cleaned up ># passed all 11 test(s) >1..11 >ok 2 - @{-1} works >ok 18 - in repo.git >*** t2000-checkout-cache-clash.sh *** >ok 3 - @{-1}~2 works >ok 1 - set up basic repo >ok 4 - @{-1}^2 works ># passed all 0 test(s) >1..0 # SKIP Dangerous test skipped. Read this test if you want to execute it >ok 19 - inside work tree >ok 5 - @{-1}@{1} works >ok 2 - correct file objects >*** t2001-checkout-cache-clash.sh *** >ok 6 - @{-2} works >ok 7 - @{-3} fails ># passed all 7 test(s) >1..7 >ok 3 - incorrect revision id >ok 1 - git update-index --add various paths. >*** t2002-checkout-cache-u.sh *** >ok 20 - subdir of work tree >ok 2 - git checkout-index without -f should fail on conflicting work tree. >ok 8 - delete >ok 3 - git checkout-index with -f should succeed. >ok 4 - git checkout-index conflicting paths. >ok 21 - find work tree from repo >ok 4 - incorrect file in sha1:path >ok 9 - rewind2 >ok 5 - checkout-index -f twice with --prefix ># passed all 5 test(s) >1..5 >ok 10 - --expire=never >ok 22 - find work tree from work tree >ok 1 - git update-index --add path0/file0 >*** t2003-checkout-cache-mkdir.sh *** >ok 2 - writing tree out with git write-tree >ok 23 - _gently() groks relative GIT_DIR & GIT_WORK_TREE >ok 11 - gc.reflogexpire=never >ok 3 - git update-index --add path1/file1 >ok 1 - preparation >ok 4 - writing tree out with git write-tree >ok 24 - diff-index respects work tree under .git dir >ok 25 - diff-files respects work tree under .git dir >ok 5 - read previously written tree and checkout. >ok 2 - without -u, git checkout-index smudges stat information. >ok 26 - git diff respects work tree under .git dir >ok 27 - git grep >ok 28 - git commit >ok 29 - absolute pathspec should fail gracefully >ok 3 - with -u, git checkout-index picks up stat information from new files. >ok 1 - setup ># passed all 3 test(s) >1..3 >ok 30 - make_relative_path handles double slashes in GIT_DIR >ok 1 - setup ># still have 1 known breakage(s) ># passed all remaining 29 test(s) >1..30 >ok 6 - git update-index --add a symlink. >ok 2 - @{upstream} resolves to correct full name >ok 12 - gc.reflogexpire=false >ok 7 - writing tree out with git write-tree >*** t2004-checkout-cache-temp.sh *** ># passed all 12 test(s) >1..12 >ok 3 - @{u} resolves to correct full name >ok 2 - have symlink in place where dir is expected. >ok 5 - incorrect file in :path and :N:path >*** t2005-checkout-index-symlinks.sh *** >ok 8 - read previously written tree and checkout. >ok 9 - checking out conflicting path with -f ># passed all 9 test(s) >1..9 >ok 4 - my-side@{upstream} resolves to correct full name >ok 3 - use --prefix=path2/ >*** t2007-checkout-symlink.sh *** >ok 4 - use --prefix=tmp- >ok 6 - invalid @{n} reference >*** t2008-checkout-subdir.sh *** ># passed all 6 test(s) >1..6 >ok 5 - use --prefix=tmp- but with a conflicting file and dir >*** t2009-checkout-statinfo.sh *** >ok 6 - use --prefix=tmp/orary/ where tmp is a symlink >ok 7 - use --prefix=tmp/orary- where tmp is a symlink >ok 8 - use --prefix=tmp- where tmp-path1 is a symlink ># passed all 8 test(s) >1..8 >ok 1 - preparation >*** t2010-checkout-ambiguous.sh *** >ok 2 - the checked-out symlink must be a file >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 1 - preparation >ok 1 - setup >*** t2011-checkout-invalid-head.sh *** >ok 2 - HEAD = new-two >ok 1 - setup >ok 3 - @{1} = new-one >ok 6 - not-tracking@{u} fails >ok 2 - checkout one stage 0 to temporary file >ok 4 - @{-1} = old-two >ok 1 - setup >ok 5 - @{-1}@{1} = old-one >ok 2 - remove and restore with relative path >ok 6 - @{u} = upstream-two >ok 1 - setup >ok 7 - @{u}@{1} = upstream-one >ok 3 - checkout with empty prefix >ok 1 - setup >ok 8 - @{-1}@{u} = master-two >ok 1 - setup >ok 2 - reference must be a tree >ok 2 - switch from symlink to dir >ok 2 - checkout should not start branch from a tree >ok 9 - @{-1}@{u}@{1} = master-one >ok 7 - <branch>@{u}@{1} resolves correctly >ok 4 - checkout with simple prefix >ok 3 - Remove temporary directories & switch to master >ok 10 - @{u}@{-1} is nonsensical >ok 3 - checkout master from invalid HEAD ># passed all 3 test(s) >1..3 >ok 5 - relative path outside tree should fail >ok 11 - @{1}@{u} is nonsensical ># passed all 11 test(s) >1..11 >ok 6 - incorrect relative path to file should fail (1) >ok 4 - switch from dir to symlink >ok 2 - branch switching >ok 3 - checkout all stage 0 to temporary files ># passed all 4 test(s) >1..4 >ok 3 - branch switching >*** t2012-checkout-last.sh *** >ok 8 - @{u} without specifying branch fails on a detached HEAD >ok 7 - incorrect relative path should fail (2) >ok 4 - prepare 3-way merge >ok 4 - checkout world from the index >*** t2013-checkout-submodule.sh *** >ok 8 - incorrect relative path should fail (3) >*** t2014-switch.sh *** ># passed all 8 test(s) >1..8 >ok 5 - non ambiguous call >*** t2015-checkout-unborn.sh *** >ok 5 - checkout one stage 2 to temporary file >ok 9 - checkout -b new my-side@{u} forks from the same >ok 6 - allow the most common case >ok 7 - check ambiguity >ok 3 - path checkout >ok 8 - disambiguate checking out from a tree-ish ># passed all 3 test(s) >1..3 ># passed all 8 test(s) >1..8 >*** t2016-checkout-patch.sh *** >*** t2017-checkout-orphan.sh *** >ok 6 - checkout all stage 2 to temporary files >ok 7 - checkout all stages/one file to nothing >ok 10 - merge my-side@{u} records the correct name >ok 1 - setup >ok 1 - setup >ok 2 - check all changes are staged >ok 2 - "checkout -" does not work initially >ok 8 - checkout all stages/one file to temporary files >ok 3 - first branch switch >ok 3 - second commit >ok 11 - branch -d other@{u} >ok 4 - check ># passed all 4 test(s) >1..4 >ok 1 - setup >ok 4 - "checkout -" switches back >ok 9 - checkout some stages/one file to temporary files >*** t2018-checkout-branch.sh *** >ok 2 - checkout from unborn preserves untracked files >ok 10 - checkout all stages/all files to temporary files >ok 5 - "checkout -" switches forth >ok 1 - setup >ok 11 - -- path0: no entry >ok 1 - Setup >ok 12 - checkout other@{u} >ok 3 - checkout from unborn preserves index contents >ok 6 - detach HEAD >ok 12 - -- path1: all 3 stages >ok 13 - log -g other@{u} >ok 14 - log -g other@{u}@{now} ># passed all 14 test(s) >1..14 >ok 13 - -- path2: no stage 1, have stage 2 and 3 >ok 4 - checkout from unborn merges identical index contents >ok 1 - setup >ok 7 - "checkout -" attaches again ># passed all 4 test(s) >1..4 >ok 14 - -- path3: no stage 2, have stage 1 and 3 >ok 2 - "reset <submodule>" updates the index >*** t2030-unresolve-info.sh *** >ok 2 - --orphan creates a new orphan branch from HEAD >*** t2050-git-dir-relative.sh *** >ok 15 - -- path4: no stage 3, have stage 1 and 3 >ok 16 - -- asubdir/path5: no stage 2 and 3 have stage 1 >ok 8 - "checkout -" detaches again >ok 17 - checkout --temp within subdir >ok 3 - "checkout <submodule>" updates the index only >ok 3 - --orphan creates a new orphan branch from <start_point> >ok 1 - Setting up post-commit hook >ok 4 - "checkout <submodule>" honors diff.ignoreSubmodules >ok 1 - setup >ok 4 - --orphan must be rejected with -b >ok 18 - checkout --temp symlink ># passed all 18 test(s) >1..18 >ok 2 - post-commit hook used ordinarily >ok 5 - "checkout <submodule>" honors submodule.*.ignore from .gitmodules >*** t2100-update-cache-badpath.sh *** >ok 2 - checkout -b to a new branch, set to HEAD >ok 5 - --orphan must be rejected with -t >ok 3 - post-commit-hook created and used from top dir >ok 6 - "checkout <submodule>" honors submodule.*.ignore from .git/config ># passed all 6 test(s) >1..6 >*** t2101-update-index-reupdate.sh *** >ok 4 - post-commit-hook from sub dir ># passed all 4 test(s) >1..4 >ok 3 - checkout -b to a new branch, set to an explicit ref >ok 6 - --orphan ignores branch.autosetupmerge >*** t2102-update-index-symlinks.sh *** >ok 1 - git update-index --add to add various paths. >ok 2 - git update-index to add conflicting path path0/file0 should fail. >ok 3 - git update-index to add conflicting path path1/file1 should fail. >ok 4 - checkout -b to a new branch with unmergeable changes fails >ok 4 - git update-index to add conflicting path path2 should fail. >ok 9 - more switches >ok 5 - git update-index to add conflicting path path3 should fail. ># passed all 5 test(s) >1..5 >ok 7 - --orphan makes reflog by default >ok 2 - saying "n" does nothing >ok 1 - update-index --add >*** t2103-update-index-ignore-missing.sh *** >ok 1 - setup >ok 5 - checkout -f -b to a new branch with unmergeable changes discards changes >ok 2 - update-index --again >ok 1 - preparation >ok 2 - modify the symbolic link >ok 3 - update-index --remove --again >ok 8 - --orphan does not make reflog when core.logAllRefUpdates = false >ok 3 - the index entry must still be a symbolic link ># passed all 3 test(s) >1..3 >ok 4 - first commit >*** t2104-update-index-skip-worktree.sh *** >ok 6 - checkout -b to a new branch preserves mergeable changes >ok 5 - update-index again >ok 9 - --orphan with -l makes reflog when core.logAllRefUpdates = false >ok 6 - update-index --update from subdir >ok 10 - giving up --orphan not committed when -l and core.logAllRefUpdates = false deletes reflog >ok 7 - update-index --update with pathspec ># passed all 7 test(s) >1..7 >ok 1 - setup >ok 2 - index is at version 2 >*** t2105-update-index-gitfile.sh *** >ok 7 - checkout -f -b to a new branch with mergeable changes discards changes >ok 11 - --orphan is rejected with an existing name >ok 3 - update-index --skip-worktree >ok 2 - add records switch clears >ok 8 - checkout -b to an existing branch fails >ok 4 - index is at version 3 after having some skip-worktree entries >ok 5 - ls-files -t >ok 1 - basics >ok 10 - switch to the last >ok 6 - update-index --no-skip-worktree >ok 7 - index version is back to 2 when there is no skip-worktree entry ># passed all 7 test(s) >1..7 >ok 9 - checkout -B to an existing branch resets branch to HEAD >ok 12 - --orphan refuses to switch if a merge is needed ># passed all 12 test(s) >1..12 >ok 3 - git checkout -p >*** t2106-update-index-assume-unchanged.sh *** >ok 2 - --ignore-missing --refresh >*** t2200-add-update.sh *** >ok 1 - submodule with absolute .git file >ok 2 - add gitlink to absolute .git file >ok 10 - checkout -B to an existing branch from detached HEAD resets branch to HEAD >ok 3 - --unmerged --refresh >ok 4 - --ignore-submodules --refresh (1) >ok 3 - submodule with relative .git file >ok 4 - add gitlink to relative .git file >ok 11 - checkout -B to an existing branch with an explicit ref resets branch to that ref ># passed all 4 test(s) >1..4 >ok 1 - setup >ok 1 - setup >ok 2 - update >*** t2201-add-update-typechange.sh *** >ok 3 - update noticed a removal >ok 4 - update touched correct path >ok 12 - checkout -B to an existing branch with unmergeable changes fails >ok 5 - --ignore-submodules --refresh (2) ># passed all 5 test(s) >1..5 >ok 2 - do not switch branches with dirty file ># passed all 2 test(s) >1..2 >ok 5 - update did not touch other tracked files >*** t2202-add-addremove.sh *** >ok 6 - update did not touch untracked files >*** t2203-add-intent.sh *** >ok 13 - checkout -f -B to an existing branch with unmergeable changes discards changes >ok 3 - rm records reset clears >ok 7 - cache tree has not been corrupted >ok 11 - switch to second from the last >ok 8 - update from a subdirectory >ok 9 - change gets noticed >ok 10 - replace a file with a symlink >ok 1 - setup >ok 4 - git checkout -p with staged changes >ok 11 - add everything changed >ok 1 - intent to add >ok 14 - checkout -B to an existing branch preserves mergeable changes >ok 2 - check result of "add -N" >ok 1 - setup >ok 12 - touch and then add -u >ok 3 - intent to add is just an ordinary empty blob >ok 13 - touch and then add explicitly >ok 2 - git add --all ># passed all 2 test(s) >1..2 >ok 15 - checkout -f -B to an existing branch with mergeable changes discards changes ># passed all 15 test(s) >1..15 >ok 4 - intent to add does not clobber existing paths >*** t2204-add-ignored.sh *** >ok 14 - add -n -u should not add but just report >*** t2300-cd-to-toplevel.sh *** >ok 4 - plumbing clears >ok 5 - cannot commit with i-t-a entry >ok 2 - modify >ok 3 - diff-files >ok 1 - setup >ok 4 - diff-index >ok 2 - no complaints for unignored file >ok 5 - add -u >ok 6 - can commit with an unrelated i-t-a entry in index >ok 3 - no complaints for unignored dir/file >ok 12 - switch to third from the last >ok 4 - no complaints for unignored dir >ok 7 - can "commit -a" with an i-t-a entry ># passed all 7 test(s) >1..7 >ok 1 - at physical root >ok 5 - no complaints for unignored d* >ok 15 - add -u resolves unmerged paths >ok 6 - commit -a ># passed all 6 test(s) >1..6 >*** t3000-ls-files-others.sh *** >ok 2 - at physical subdir >ok 5 - add records checkout -m undoes >ok 16 - "add -u non-existent" should fail >ok 6 - complaints for ignored ign ># passed all 16 test(s) >1..16 >*** t3001-ls-files-others-exclude.sh *** >*** t3002-ls-files-dashpath.sh *** >ok 7 - complaints for ignored ign with unignored file >ok 3 - at symbolic root >ok 5 - git checkout -p HEAD with NO staged changes: abort >ok 8 - complaints for ignored dir/ign >ok 9 - complaints for ignored dir/ign with unignored file >ok 4 - at symbolic subdir >ok 1 - setup >ok 1 - setup >ok 2 - setup: expected output >ok 1 - git ls-files --others with various exclude options. >ok 2 - git ls-files without path restriction. >ok 3 - ls-files --others >ok 10 - complaints for ignored dir/sub >ok 2 - git ls-files --others with \r\n line endings. >ok 3 - git ls-files with path restriction. >ok 4 - ls-files --others --directory >ok 11 - complaints for ignored dir/sub with unignored file >ok 5 - --no-empty-directory hides empty directory >ok 4 - git ls-files with path restriction with --. ># passed all 5 test(s) >1..5 >ok 6 - unmerge with plumbing >ok 5 - at internal symbolic subdir >ok 3 - setup skip-worktree gitignore ># passed all 5 test(s) >1..5 >ok 5 - git ls-files with path restriction with -- --. >*** t3003-ls-files-exclude.sh *** >ok 4 - git ls-files --others with various exclude options. >ok 6 - git ls-files with no path restriction. >ok 12 - complaints for ignored dir/sub/ign >*** t3010-ls-files-killed-modified.sh *** ># passed all 6 test(s) >1..6 >ok 5 - restore gitignore >*** t3020-ls-files-error-unmatch.sh *** >ok 13 - complaints for ignored dir/sub/ign with unignored file >ok 6 - git status honors core.excludesfile >ok 13 - switch to fourth from the last >ok 7 - trailing slash in exclude allows directory match(1) >ok 14 - complaints for ignored sub/file >ok 8 - trailing slash in exclude allows directory match (2) >ok 9 - trailing slash in exclude forces directory match (1) >ok 15 - complaints for ignored sub/file with unignored file >ok 10 - trailing slash in exclude forces directory match (2) >ok 1 - create repo with file >ok 1 - git update-index --add to add various paths. >ok 11 - negated exclude matches can override previous ones >ok 2 - ls-files output contains file (cached) >ok 16 - complaints for ignored sub >ok 3 - ls-files output contains file (modified) >ok 4 - add file to gitignore >ok 1 - setup >ok 12 - subdirectory ignore (setup) >ok 5 - ls-files output contains file (cached) >ok 2 - git ls-files --error-unmatch should fail with unmatched path. >ok 2 - git ls-files -k to show killed files. >ok 17 - complaints for ignored sub with unignored file >ok 13 - subdirectory ignore (toplevel) >ok 3 - validate git ls-files -k output. >ok 3 - git ls-files --error-unmatch should succeed eith matched paths. ># passed all 3 test(s) >1..3 >ok 6 - ls-files output contains file (modified) >ok 4 - git ls-files -m to show modified files. >ok 14 - subdirectory ignore (l1/l2) >ok 5 - validate git ls-files -m output. ># passed all 5 test(s) >ok 18 - complaints for ignored sub/file >1..5 >*** t3030-merge-recursive.sh *** >ok 7 - ls-files -i lists only tracked-but-ignored files ># passed all 7 test(s) >1..7 >ok 15 - subdirectory ignore (l1) ># passed all 15 test(s) >1..15 >ok 6 - git checkout -p HEAD with NO staged changes: apply >*** t3031-merge-criscross.sh *** >*** t3040-subprojects-basic.sh *** >ok 19 - complaints for ignored sub/file with unignored file >*** t3050-subprojects-fetch.sh *** >ok 20 - complaints for ignored sub/ign >ok 7 - rerere and rerere forget >ok 21 - complaints for ignored sub/ign with unignored file >ok 22 - complaints for ignored sub in dir >ok 1 - Super project creation >ok 23 - complaints for ignored sub/file in dir >ok 14 - switch to twelfth from the last >ok 24 - complaints for ignored sub/ign in dir >ok 1 - setup >ok 25 - complaints for ignored ign in sub >ok 15 - merge base test setup >ok 26 - complaints for ignored file in sub ># passed all 26 test(s) >1..26 >*** t3060-ls-files-with-tree.sh *** >ok 16 - another...master >ok 2 - create subprojects >ok 7 - git checkout -p HEAD with change already staged >ok 3 - check if fsck ignores the subprojects >ok 8 - rerere and rerere forget (subdirectory) ># passed all 8 test(s) >1..8 >ok 17 - ...master >ok 2 - clone >ok 4 - check if commit in a subproject detected >*** t3100-ls-tree-restrict.sh *** >ok 1 - setup 1 >ok 5 - check if a changed subproject HEAD can be committed >ok 6 - check if diff-index works for subproject elements >ok 3 - advance >ok 7 - check if diff-tree works for subproject elements >ok 18 - master... ># passed all 18 test(s) >1..18 >ok 8 - check if git diff works for subproject elements >ok 1 - setup >*** t3101-ls-tree-dirname.sh *** >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 >*** t3200-branch.sh *** >ok 9 - check if clone works >ok 2 - setup 2 >ok 1 - setup >ok 2 - ls-tree plain >ok 3 - ls-tree recursive >ok 4 - fetch >ok 1 - setup ># passed all 4 test(s) >1..4 >ok 10 - removing and adding subproject >ok 4 - ls-tree recursive with -t >ok 1 - setup repo with criss-cross history >ok 2 - ls-tree plain >ok 5 - ls-tree recursive with -d >*** t3201-branch-contains.sh *** >ok 11 - checkout in superproject >ok 2 - recursive merge between F and G, causes segfault ># passed all 11 test(s) >1..11 ># passed all 2 test(s) >1..2 >ok 6 - ls-tree filtered with path >ok 8 - git checkout -p HEAD^ >ok 3 - ls-tree recursive >ok 7 - ls-tree filtered with path1 path0 >*** t3202-show-branch-octopus.sh *** >ok 4 - ls-tree filter 1.txt >*** t3203-branch-output.sh *** >ok 1 - prepare a trivial repository >ok 8 - ls-tree filtered with path0/ >ok 5 - ls-tree filter path1/b/c/1.txt >ok 3 - setup 3 >ok 9 - ls-tree filtered with path2 >ok 6 - ls-tree filter all 1.txt files >ok 10 - ls-tree filtered with path2/ >ok 7 - ls-tree filter directories >ok 11 - ls-tree filtered with path2/baz >ok 8 - ls-tree filter odd names >ok 12 - ls-tree filtered with path2/bak >ok 9 - ls-tree filter missing files and extra slashes >ok 13 - ls-tree -t filtered with path2/bak >ok 1 - make commits >ok 10 - ls-tree filter is leading path match >ok 14 - ls-tree with one path a prefix of the other ># passed all 14 test(s) >1..14 >ok 2 - make branches >ok 11 - ls-tree --full-name >*** t3210-pack-refs.sh *** >ok 2 - git branch --help should not have created a bogus branch >ok 4 - setup 4 >ok 3 - git branch abc should create a branch >ok 12 - ls-tree --full-tree >ok 1 - setup >ok 4 - git branch a/b/c should create a branch >ok 2 - branch --contains=master >ok 3 - make remote branches >ok 13 - ls-tree --full-tree -r >ok 3 - branch --contains master >ok 5 - git branch -l d/e/f should create a branch and a log >ok 4 - git branch shows local branches >ok 4 - branch --contains=side >ok 14 - ls-tree --abbrev=5 >ok 6 - git branch -d d/e/f should delete a branch and a log >ok 5 - git branch -r shows remote branches >ok 5 - side: branch --merged >ok 15 - ls-tree --name-only >ok 6 - side: branch --no-merged >ok 6 - git branch -a shows local and remote branches >ok 16 - ls-tree --name-only -r >ok 7 - git branch j/k should work after branch j has been deleted ># passed all 16 test(s) >1..16 >ok 7 - git branch -v shows branch summaries >ok 7 - master: branch --merged >*** t3300-funny-names.sh *** >ok 1 - prepare a trivial repository >ok 8 - master: branch --no-merged ># passed all 8 test(s) >1..8 >ok 9 - git checkout -p handles deletion >ok 8 - git branch shows detached HEAD properly ># passed all 8 test(s) >1..8 >ok 8 - git branch l should work after branch l/m has been deleted >*** t3301-notes.sh *** >ok 2 - see if git show-ref works as expected >*** t3302-notes-index-expensive.sh *** >ok 5 - setup 5 >ok 9 - git branch -m m m/m should work >ok 3 - see if a branch still exists when packed >ok 10 - git branch -m n/n n should work >ok 1 - setup expect >ok 1 - setup / mkdir >ok 1 - cannot annotate non-existing HEAD >ok 2 - git ls-files no-funny >ok 3 - setup expect >ok 11 - git branch -m o/o o should fail when o/p exists >ok 4 - git branch c/d should barf if branch c exists >ok 4 - git ls-files with-funny >ok 5 - setup expect >ok 6 - setup 6 >ok 6 - git ls-files -z with-funny >ok 12 - git branch -m q r/q should fail when r exists >ok 2 - setup >ok 7 - setup expect >ok 5 - see if a branch still exists after git pack-refs --prune >ok 3 - need valid notes ref >ok 4 - refusing to add notes in refs/heads/ >ok 10 - path limiting works: dir >ok 13 - git branch -m q q2 without config should succeed >ok 5 - refusing to edit notes in refs/remotes/ >ok 8 - git ls-tree with funny >ok 6 - handle empty notes gracefully >ok 9 - setup expect >ok 2 - setup 10 >ok 7 - show non-existent notes entry with %N >ok 10 - git diff-index with-funny >ok 6 - see if git pack-refs --prune remove ref files >ok 11 - git diff-tree with-funny >ok 12 - setup expect >ok 3 - notes work >ok 4 # skip notes timing with /usr/bin/time (missing USR_BIN_TIME of USR_BIN_TIME,NOT_EXPENSIVE) >ok 5 - teardown / cd .. >ok 6 # skip setup / mkdir (missing EXPENSIVE) >ok 7 # skip setup 100 (missing EXPENSIVE) >ok 8 # skip notes work (missing EXPENSIVE) >ok 9 # skip notes timing with /usr/bin/time (missing EXPENSIVE,USR_BIN_TIME of USR_BIN_TIME,EXPENSIVE) >ok 10 # skip teardown / cd .. (missing EXPENSIVE) >ok 11 # skip setup / mkdir (missing EXPENSIVE) >ok 12 # skip setup 1000 (missing EXPENSIVE) >ok 13 # skip notes work (missing EXPENSIVE) >ok 14 # skip notes timing with /usr/bin/time (missing EXPENSIVE,USR_BIN_TIME of USR_BIN_TIME,EXPENSIVE) >ok 15 # skip teardown / cd .. (missing EXPENSIVE) >ok 16 # skip setup / mkdir (missing EXPENSIVE) >ok 17 # skip setup 10000 (missing EXPENSIVE) >ok 18 # skip notes work (missing EXPENSIVE) >ok 19 # skip notes timing with /usr/bin/time (missing EXPENSIVE,USR_BIN_TIME of USR_BIN_TIME,EXPENSIVE) >ok 20 # skip teardown / cd .. (missing EXPENSIVE) >ok 7 - setup 7 ># passed all 20 test(s) >1..20 >ok 13 - git diff-index -z with-funny >ok 7 - see if git pack-refs --prune removes empty dirs >ok 14 - git diff-tree -z with-funny >ok 15 - setup expect >*** t3303-notes-subtrees.sh *** >ok 14 - git branch -m s/s s should work when s/t is deleted >ok 1 - setup >ok 15 - config information was renamed, too >ok 16 - git diff-tree -C with-funny >ok 17 - setup expect >ok 8 - setup 8 >ok 2 - show-branch with more than 8 branches >ok 8 - create notes >ok 18 - git diff-tree delete with-funny >ok 16 - renaming a symref is not allowed >ok 9 - show notes entry with %N >ok 19 - setup expect >ok 10 - create reflog entry >ok 20 - git diff-tree delete with-funny >ok 21 - setup expect >ok 17 - git branch -m u v should fail when the reflog for u is a symlink >ok 8 - git branch g should work when git branch g/h has been deleted >ok 9 - setup 9 >ok 22 - git diff-tree delete with-funny >ok 23 - setup expect >ok 24 - git diff-tree rename with-funny applied >ok 25 - setup expect >ok 11 - path limiting works: -- dir >ok 10 - merge-recursive simple >ok 11 - edit existing notes >ok 26 - git diff-tree delete with-funny applied >ok 9 - git branch i/j/k should barf if branch i exists >ok 11 - merge-recursive result >ok 27 - git apply non-git diff ># passed all 27 test(s) >1..27 >*** t3304-notes-mixed.sh *** >ok 3 - show-branch with showbranch.default ># passed all 3 test(s) >1..3 >ok 12 - cannot add note where one exists >ok 18 - test tracking setup via --track >*** t3305-notes-fanout.sh *** >ok 10 - test git branch k after branch k/l/m and k/lm have been deleted >ok 12 - fail if the index has unresolved entries >ok 13 - merge-recursive remove conflict >ok 13 - can overwrite existing note with "git notes add -f" >ok 19 - test tracking setup (non-wildcard, matching) >ok 14 - merge-recursive remove conflict >ok 14 - show notes >ok 1 - setup: create a couple of commits >ok 15 - create multi-line notes (setup) >ok 15 - merge-recursive d/f simple >ok 20 - test tracking setup (non-wildcard, not matching) >ok 12 - path limiting works: HEAD^ -- dir >ok 11 - test git branch n after some branch deletion and pruning >ok 16 - show multi-line notes >ok 16 - merge-recursive result >ok 2 - create a notes tree with both notes and non-notes >ok 3 - verify contents of notes >ok 12 - see if up-to-date packed refs are preserved >ok 17 - create -F notes (setup) >ok 17 - merge-recursive d/f conflict >ok 21 - test tracking setup via config >ok 18 - show -F notes >ok 18 - merge-recursive d/f conflict result >ok 19 - git log --pretty=raw does not show notes >ok 4 - verify contents of non-notes >ok 13 - pack, prune and repack >ok 20 - git log --show-notes ># passed all 13 test(s) >1..13 >ok 19 - merge-recursive d/f conflict the other way >ok 5 - git-notes preserves non-notes >ok 20 - merge-recursive d/f conflict result the other way >ok 21 - git log --no-notes >*** t3306-notes-prune.sh *** >ok 22 - git format-patch does not show notes >ok 22 - test overriding tracking setup via --no-track >ok 23 - git format-patch --show-notes does show notes >ok 6 - verify contents of non-notes after git-notes >ok 21 - merge-recursive d/f conflict >ok 24 - git show does show notes ># passed all 6 test(s) >1..6 >ok 1 - setup: create 100 commits >ok 22 - merge-recursive d/f conflict result >ok 25 - git show --pretty does not show notes >*** t3307-notes-man.sh *** >ok 26 - git show --pretty=raw does not show notes >ok 13 - path limiting works: foo inside dir >ok 23 - no tracking without .fetch entries >ok 27 - git show --pretty=short does not show notes >ok 23 - merge-recursive d/f conflict >ok 14 - none of this moved HEAD ># passed all 14 test(s) >1..14 >ok 28 - git show --pretty=medium does not show notes >ok 24 - merge-recursive d/f conflict result >ok 29 - git show --pretty=full does not show notes >*** t3400-rebase.sh *** >ok 30 - git show --pretty=fuller does not show notes >ok 25 - reset and 3-way merge >ok 31 - git show --pretty=format:%s does not show notes >ok 32 - git show --oneline does not show notes >ok 24 - test tracking setup via --track but deeper >ok 1 - setup: create a few commits with notes >ok 2 - verify commits and notes >ok 25 - test deleting branch deletes branch config >ok 33 - create -m notes (setup) >ok 34 - show -m notes >ok 26 - test deleting branch without config >ok 35 - remove note with add -f -F /dev/null (setup) >ok 1 - setup >ok 26 - reset and bind merge >ok 36 - verify note removal with -F /dev/null >ok 2 - example 1: notes to add an Acked-by line >ok 27 - test --track without .fetch entries >ok 37 - do not create empty note with -m "" (setup) >ok 38 - verify non-creation of note with -m "" >ok 28 - branch from non-branch HEAD w/autosetupmerge=always >ok 29 - branch from non-branch HEAD w/--track causes failure >ok 39 - create note with combination of -m and -F >ok 27 - merge removes empty directories >ok 30 - git checkout -b g/h/i -l should create a branch and a log >ok 3 - example 2: binary notes ># passed all 3 test(s) >1..3 >ok 40 - remove note with "git notes remove" (setup) >not ok 28 - merge-recursive simple w/submodule # TODO known breakage >ok 3 - remove some commits >*** t3401-rebase-partial.sh *** >not ok 29 - merge-recursive simple w/submodule result # TODO known breakage >ok 41 - verify note removal with "git notes remove" >ok 31 - checkout -b makes reflog by default >ok 4 - verify that commits are gone >ok 42 - removing non-existing note should not create new commit >ok 43 - list notes with "git notes list" >ok 5 - verify that notes are still present >ok 32 - checkout -b does not make reflog when core.logAllRefUpdates = false >ok 44 - list notes with "git notes" >ok 30 - merge-recursive copy vs. rename ># still have 2 known breakage(s) ># passed all remaining 28 test(s) >1..30 >ok 45 - list specific note with "git notes list <object>" >*** t3402-rebase-merge.sh *** >ok 6 - prune -n does not remove notes >ok 46 - listing non-existing notes fails >ok 7 - prune -n lists prunable notes >ok 33 - checkout -b with -l makes reflog when core.logAllRefUpdates = false >ok 8 - prune notes >ok 47 - append to existing note with "git notes append" >ok 9 - verify that notes are gone >ok 48 - "git notes list" does not expand to "git notes list HEAD" >ok 49 - appending empty string does not change existing note >ok 34 - avoid ambiguous track >ok 1 - prepare repository with topic branch >ok 1 - prepare repository with topic branches >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 2 - pick top patch from topic branch into master >ok 2 - rebase on dirty worktree >ok 52 - create other note on a different notes ref (setup) >ok 53 - Do not show note on other ref by default >ok 54 - Do show note when ref is given in GIT_NOTES_REF >ok 10 - remove some commits >ok 55 - Do show note when ref is given in core.notesRef config >ok 11 - prune -v notes >ok 35 - autosetuprebase local on a tracked local branch >ok 3 - rebase on dirty cache >ok 56 - Do not show note when core.notesRef is overridden >ok 12 - verify that notes are gone ># passed all 12 test(s) >1..12 >*** t3403-rebase-skip.sh *** >ok 1 - setup >ok 2 - reference merge >ok 57 - Show all notes when notes.displayRef=refs/notes/* >ok 58 - core.notesRef is implicitly in notes.displayRef >ok 36 - autosetuprebase always on a tracked local branch >ok 59 - notes.displayRef can be given more than once >ok 2 - test notes in 2/38-fanout >ok 3 - rebase topic branch against new master and check git am did not get halted >ok 60 - notes.displayRef respects order >ok 3 - verify notes in 2/38-fanout >ok 61 - GIT_NOTES_DISPLAY_REF works >ok 4 - rebase against master >ok 62 - GIT_NOTES_DISPLAY_REF overrides config >ok 1 - setup >ok 63 - --show-notes=* adds to GIT_NOTES_DISPLAY_REF >ok 64 - --no-standard-notes >ok 37 - autosetuprebase remote on a tracked local branch >ok 65 - --standard-notes >ok 66 - --show-notes=ref accumulates >ok 5 - rebase against master twice >ok 3 - rebase >ok 4 - test-rebase@{1} is pre rebase >ok 5 - merge and rebase should match >ok 4 - rebase --merge topic branch that was partially merged upstream ># passed all 4 test(s) >1..4 >ok 67 - Allow notes on non-commits (trees, blobs, tags) >*** t3404-rebase-interactive.sh *** >ok 38 - autosetuprebase never on a tracked local branch >ok 68 - create note from other note with "git notes add -C" >ok 39 - autosetuprebase local on a tracked remote branch >ok 2 - rebase with git am -3 (default) >ok 69 - create note from non-existing note with "git notes add -C" fails >ok 6 - rebase against master twice with --force >ok 6 - rebase the other way >ok 70 - create note from other note with "git notes add -c" >ok 40 - autosetuprebase never on a tracked remote branch >ok 71 - create note from non-existing note with "git notes add -c" fails >ok 72 - append to note from other note with "git notes append -C" >ok 7 - rebase against master twice from another branch >ok 41 - autosetuprebase remote on a tracked remote branch >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 42 - autosetuprebase always on a tracked remote branch >ok 3 - rebase --skip with am -3 >ok 8 - rebase fast-forward to master >ok 7 - rebase -Xtheirs >ok 9 - the rebase operation should not have destroyed author information >ok 8 - merge and rebase should match >ok 10 - the rebase operation should not have destroyed author information (2) >ok 11 - HEAD was detached during rebase >ok 75 - copy note with "git notes copy" >ok 43 - autosetuprebase unconfigured on a tracked remote branch >ok 76 - prevent overwrite with "git notes copy" >ok 77 - allow overwrite with "git notes copy -f" >ok 78 - cannot copy note from object without notes >ok 44 - autosetuprebase unconfigured on a tracked local branch >ok 4 - test notes in 2/2/36-fanout >ok 45 - autosetuprebase unconfigured on untracked local branch >ok 9 - picking rebase >ok 79 - git notes copy --stdin >ok 5 - verify notes in 2/2/36-fanout >ok 12 - rebase after merge master >ok 46 - autosetuprebase unconfigured on untracked remote branch >ok 80 - git notes copy --for-rewrite (unconfigured) >ok 1 - setup >ok 47 - autosetuprebase never on an untracked local branch >ok 81 - git notes copy --for-rewrite (enabled) >ok 82 - git notes copy --for-rewrite (disabled) >ok 48 - autosetuprebase local on an untracked local branch >ok 10 - rebase -s funny -Xopt ># passed all 10 test(s) >1..10 >*** t3405-rebase-malformed.sh *** >ok 83 - git notes copy --for-rewrite (overwrite) >ok 49 - autosetuprebase remote on an untracked local branch >ok 84 - git notes copy --for-rewrite (ignore) >ok 4 - rebase moves back to skip-reference >ok 5 - checkout skip-merge >ok 85 - git notes copy --for-rewrite (append) >not ok - 2 rebase -i with the exec command ># ># git checkout master && ># ( ># FAKE_LINES="1 exec_>touch-one ># 2 exec_>touch-two exec_false exec_>touch-three ># 3 4 exec_>\"touch-file__name_with_spaces\";_>touch-after-semicolon 5" && ># export FAKE_LINES && ># test_must_fail git rebase -i A ># ) && ># test_path_is_file touch-one && ># test_path_is_file touch-two && ># test_path_is_missing touch-three " (should have stopped before)" && ># test $(git rev-parse C) = $(git rev-parse HEAD) || { ># echo "Stopped at wrong revision:" ># echo "($(git describe --tags HEAD) instead of C)" ># false ># } && ># git rebase --continue && ># test_path_is_file touch-three && ># test_path_is_file "touch-file name with spaces" && ># test_path_is_file touch-after-semicolon && ># test $(git rev-parse master) = $(git rev-parse HEAD) || { ># echo "Stopped at wrong revision:" ># echo "($(git describe --tags HEAD) instead of master)" ># false ># } && ># rm -f touch-* ># >ok 50 - autosetuprebase always on an untracked local branch >ok 1 - setup >ok 6 - rebase with --merge >ok 86 - git notes copy --for-rewrite (append two to one) >ok 51 - autosetuprebase never on an untracked remote branch >ok 13 - rebase of history with merges is linearized >not ok - 3 rebase -i with the exec command runs from tree root ># ># git checkout master && ># mkdir subdir && (cd subdir && ># FAKE_LINES="1 exec_>touch-subdir" \ ># git rebase -i HEAD^ ># ) && ># test_path_is_file touch-subdir && ># rm -fr subdir ># >ok 87 - git notes copy --for-rewrite (append empty) >ok 88 - GIT_NOTES_REWRITE_MODE works >ok 52 - autosetuprebase local on an untracked remote branch >ok 89 - GIT_NOTES_REWRITE_REF works >not ok - 4 rebase -i with the exec command checks tree cleanness >ok 7 - rebase --skip with --merge ># ># git checkout master && ># ( ># FAKE_LINES="exec_echo_foo_>file1 1" && ># export FAKE_LINES && ># test_must_fail git rebase -i HEAD^ ># ) && ># test $(git rev-parse master^) = $(git rev-parse HEAD) || { ># echo "Stopped at wrong revision:" ># echo "($(git describe --tags HEAD) instead of master^)" ># false ># } && ># git reset --hard && ># git rebase --continue ># >ok 53 - autosetuprebase remote on an untracked remote branch >ok 8 - merge and reference trees equal >ok 9 - moved back to branch correctly ># passed all 9 test(s) >1..9 >*** t3406-rebase-message.sh *** >ok 90 - GIT_NOTES_REWRITE_REF overrides config >ok 2 - rebase >ok 91 - git notes copy diagnoses too many or too few parameters ># passed all 2 test(s) >1..2 ># passed all 91 test(s) >1..91 >*** t3407-rebase-abort.sh *** >ok 54 - autosetuprebase always on an untracked remote branch >*** t3408-rebase-multi-line.sh *** >not ok - 5 no changes are a nop ># ># git checkout branch2 && ># git rebase -i F && ># test "$(git symbolic-ref -q HEAD)" = "refs/heads/branch2" && ># test $(git rev-parse I) = $(git rev-parse HEAD) ># >ok 55 - detect misconfigured autosetuprebase (bad value) >ok 56 - detect misconfigured autosetuprebase (no value) >ok 57 - attempt to delete a branch without base and unmerged to HEAD >ok 58 - attempt to delete a branch merged to its base >not ok - 6 test the [branch] option ># ># git checkout -b dead-end && ># git rm file6 && ># git commit -m "stop here" && ># git rebase -i F branch2 && ># test "$(git symbolic-ref -q HEAD)" = "refs/heads/branch2" && ># test $(git rev-parse I) = $(git rev-parse branch2) && ># test $(git rev-parse I) = $(git rev-parse HEAD) ># >ok 6 - test notes in 2/2/2/34-fanout >ok 1 - setup >ok 7 - verify notes in 2/2/2/34-fanout >ok 59 - attempt to delete a branch merged to its base ># passed all 59 test(s) >1..59 >ok 1 - setup >*** t3409-rebase-preserve-merges.sh *** >not ok - 7 test --onto <branch> ># ># git checkout -b test-onto branch2 && ># git rebase -i --onto branch1 F && ># test "$(git symbolic-ref -q HEAD)" = "refs/heads/test-onto" && ># test $(git rev-parse HEAD^) = $(git rev-parse branch1) && ># test $(git rev-parse I) = $(git rev-parse branch2) ># >ok 14 - rebase of history with merges after upstream merge is linearized >ok 1 - setup >not ok - 8 rebase on top of a non-conflicting commit ># ># git checkout branch1 && ># git tag original-branch1 && ># git rebase -i branch2 && ># test file6 = $(git diff --name-only original-branch1) && ># test "$(git symbolic-ref -q HEAD)" = "refs/heads/branch1" && ># test $(git rev-parse I) = $(git rev-parse branch2) && ># test $(git rev-parse I) = $(git rev-parse HEAD~2) ># >not ok - 9 reflog for the branch shows state before rebase ># ># test $(git rev-parse branch1@{1}) = $(git rev-parse original-branch1) ># >not ok - 10 exchange two commits ># ># FAKE_LINES="2 1" git rebase -i HEAD~2 && ># test H = $(git cat-file commit HEAD^ | sed -ne \$p) && ># test G = $(git cat-file commit HEAD | sed -ne \$p) ># >ok 2 - rebase ># passed all 2 test(s) >1..2 >*** t3410-rebase-preserve-dropped-merges.sh *** >ok 2 - rebase -m >ok 2 - rebase --abort >not ok - 11 stop on conflicting pick ># ># git tag new-branch1 && ># test_must_fail git rebase -i master && ># test "$(git rev-parse HEAD~3)" = "$(git rev-parse master)" && ># test_cmp expect .git/rebase-merge/patch && ># test_cmp expect2 file1 && ># test "$(git diff --name-status | ># sed -n -e "/^U/s/^U[^a-z]*//p")" = file1 && ># test 4 = $(grep -v "^#" < .git/rebase-merge/done | wc -l) && ># test 0 = $(grep -c "^[^#]" < .git/rebase-merge/git-rebase-todo) ># >ok 1 - setup for merge-preserving rebase >ok 15 - rebase a single mode change >not ok - 12 abort ># ># git rebase --abort && ># test $(git rev-parse new-branch1) = $(git rev-parse HEAD) && ># test "$(git symbolic-ref -q HEAD)" = "refs/heads/branch1" && ># test_path_is_missing .git/rebase-merge ># >ok 3 - rebase --stat >ok 1 - setup >ok 16 - rebase is not broken by diff.renames >ok 17 - setup: recover >ok 4 - rebase w/config rebase.stat >ok 18 - Show verbose error when HEAD could not be detached >ok 3 - rebase --abort after --skip >not ok - 13 abort with error when new base cannot be checked out ># ># git rm --cached file1 && ># git commit -m "remove file in base" && ># test_must_fail git rebase -i master > output 2>&1 && ># grep "The following untracked working tree files would be overwritten by checkout:" \ ># output && ># grep "file1" output && ># test_path_is_missing .git/rebase-merge && ># git reset --hard HEAD^ ># >ok 19 - dump usage when upstream arg is missing >ok 2 - rebase -p fakes interactive rebase >ok 5 - rebase -n overrides config rebase.stat config ># passed all 5 test(s) >1..5 >*** t3411-rebase-preserve-around-merges.sh *** >ok 8 - test same notes in no fanout and 2/38-fanout >not ok - 14 retain authorship ># ># echo A > file7 && ># git add file7 && ># test_tick && ># GIT_AUTHOR_NAME="Twerp Snog" git commit -m "different author" && ># git tag twerp && ># git rebase -i --onto master HEAD^ && ># git show HEAD | grep "^Author: Twerp Snog" ># >ok 9 - verify same notes in no fanout and 2/38-fanout >ok 20 - rebase -q is quiet >not ok - 15 squash ># ># git reset --hard twerp && ># echo B > file7 && ># test_tick && ># GIT_AUTHOR_NAME="Nitfol" git commit -m "nitfol" file7 && ># echo "******************************" && ># FAKE_LINES="1 squash 2" EXPECT_HEADER_COUNT=2 \ ># git rebase -i --onto master HEAD~2 && ># test B = $(cat file7) && ># test $(git rev-parse HEAD^) = $(git rev-parse master) ># >not ok - 16 retain authorship when squashing ># ># git show HEAD | grep "^Author: Twerp Snog" ># >ok 1 - setup >not ok - 17 -p handles "no changes" gracefully ># ># HEAD=$(git rev-parse HEAD) && ># git rebase -i -p HEAD^ && ># git update-index --refresh && ># git diff-files --quiet && ># git diff-index --quiet --cached HEAD -- && ># test $HEAD = $(git rev-parse HEAD) ># >ok 4 - rebase --abort after --continue >not ok 18 - exchange two commits with -p # TODO known breakage >ok 2 - skip same-resolution merges with -p >not ok - 19 preserve merges with -p ># ># git checkout -b to-be-preserved master^ && ># : > unrelated-file && ># git add unrelated-file && ># test_tick && ># git commit -m "unrelated" && ># git checkout -b another-branch master && ># echo B > file1 && ># test_tick && ># git commit -m J file1 && ># test_tick && ># git merge to-be-preserved && ># echo C > file1 && ># test_tick && ># git commit -m K file1 && ># echo D > file1 && ># test_tick && ># git commit -m L1 file1 && ># git checkout HEAD^ && ># echo 1 > unrelated-file && ># test_tick && ># git commit -m L2 unrelated-file && ># test_tick && ># git merge another-branch && ># echo E > file1 && ># test_tick && ># git commit -m M file1 && ># git checkout -b to-be-rebased && ># test_tick && ># git rebase -i -p --onto branch1 master && ># git update-index --refresh && ># git diff-files --quiet && ># git diff-index --quiet --cached HEAD -- && ># test $(git rev-parse HEAD~6) = $(git rev-parse branch1) && ># test $(git rev-parse HEAD~4^2) = $(git rev-parse to-be-preserved) && ># test $(git rev-parse HEAD^^2^) = $(git rev-parse HEAD^^^) && ># test $(git show HEAD~5:file1) = B && ># test $(git show HEAD~3:file1) = C && ># test $(git show HEAD:file1) = E && ># test $(git show HEAD:unrelated-file) = 1 ># >ok 21 - Rebase a commit that sprinkles CRs in >not ok - 20 edit ancestor with -p ># ># FAKE_LINES="1 edit 2 3 4" git rebase -i -p HEAD~3 && ># echo 2 > unrelated-file && ># test_tick && ># git commit -m L2-modified --amend unrelated-file && ># git rebase --continue && ># git update-index --refresh && ># git diff-files --quiet && ># git diff-index --quiet --cached HEAD -- && ># test $(git show HEAD:unrelated-file) = 2 ># >ok 5 - rebase --abort does not update reflog >ok 3 - --continue works after a conflict ># passed all 3 test(s) >1..3 >*** t3412-rebase-root.sh *** >ok 6 - rebase --merge --abort >ok 22 - rebase can copy notes >ok 2 - squash F1 into D1 >ok 23 - rebase -m can copy notes ># passed all 23 test(s) >1..23 >*** t3413-rebase-hook.sh *** >ok 1 - prepare repository >not ok - 21 --continue tries to commit ># ># test_tick && ># test_must_fail git rebase -i --onto new-branch1 HEAD^ && ># echo resolved > file1 && ># git add file1 && ># FAKE_COMMIT_MESSAGE="chouette!" git rebase --continue && ># test $(git rev-parse HEAD^) = $(git rev-parse new-branch1) && ># git show HEAD | grep chouette ># >ok 2 - rebase --root expects --onto >ok 3 - setup pre-rebase hook >ok 7 - rebase --merge --abort after --skip >ok 1 - setup >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 4 - rebase --root --onto <newbase> >ok 5 - pre-rebase got correct input (1) >ok 8 - rebase --merge --abort after --continue >ok 2 - rebase >not ok - 22 verbose flag is heeded, even after --continue ># ># git reset --hard HEAD@{1} && ># test_tick && ># test_must_fail git rebase -v -i --onto new-branch1 HEAD^ && ># echo resolved > file1 && ># git add file1 && ># git rebase --continue > output && ># grep "^ file1 | 2 +-$" output ># >ok 3 - keep different-resolution merges with -p ># passed all 3 test(s) >1..3 >*** t3414-rebase-preserve-onto.sh *** >ok 9 - rebase --merge --abort does not update reflog ># passed all 9 test(s) >1..9 >*** t3415-rebase-autosquash.sh *** >ok 6 - rebase --root --onto <newbase> <branch> >ok 7 - pre-rebase got correct input (2) >ok 1 - setup >ok 1 - setup >ok 3 - rebase -i >ok 4 - setup pre-rebase hook >ok 23 - multi-squash only fires up editor once >ok 3 - rebase two levels of merge ># passed all 3 test(s) >1..3 >*** t3416-rebase-onto-threedots.sh *** >ok 8 - rebase -i --root --onto <newbase> >ok 9 - pre-rebase got correct input (3) >ok 5 - pre-rebase hook gets correct input (1) >ok 12 - test same notes in 2/38-fanout and 2/2/36-fanout >ok 13 - verify same notes in 2/38-fanout and 2/2/36-fanout >ok 2 - auto fixup (option) >ok 6 - pre-rebase hook gets correct input (2) >not ok - 24 multi-fixup does not fire up editor ># ># git checkout -b multi-fixup E && ># base=$(git rev-parse HEAD~4) && ># FAKE_COMMIT_AMEND="NEVER" FAKE_LINES="1 fixup 2 fixup 3 fixup 4" \ ># git rebase -i $base && ># test $base = $(git rev-parse HEAD^) && ># test 0 = $(git show | grep NEVER | wc -l) && ># git checkout to-be-rebased && ># git branch -D multi-fixup ># >ok 1 - setup >ok 10 - rebase -i --root --onto <newbase> <branch> >ok 11 - pre-rebase got correct input (4) >ok 7 - pre-rebase hook gets correct input (3) >ok 2 - rebase from B1 onto H1 >ok 2 - rebase --onto master...topic >ok 3 - rebase --onto master... >not ok - 25 commit message used after conflict ># ># git checkout -b conflict-fixup conflict-branch && ># base=$(git rev-parse HEAD~4) && ># ( ># FAKE_LINES="1 fixup 3 fixup 4" && ># export FAKE_LINES && ># test_must_fail git rebase -i $base ># ) && ># echo three > conflict && ># git add conflict && ># FAKE_COMMIT_AMEND="ONCE" EXPECT_HEADER_COUNT=2 \ ># git rebase --continue && ># test $base = $(git rev-parse HEAD^) && ># test 1 = $(git show | grep ONCE | wc -l) && ># git checkout to-be-rebased && ># git branch -D conflict-fixup ># >ok 4 - rebase --onto master...side >ok 8 - pre-rebase hook gets correct input (4) >ok 12 - rebase -i -p with linear history >ok 13 - pre-rebase got correct input (5) >ok 14 - set up merge history >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 3 - rebase from E1 onto H1 >ok 3 - auto fixup (config) >ok 9 - pre-rebase hook gets correct input (5) >ok 5 - rebase -i --onto master...topic >not ok - 26 commit message retained after conflict ># ># git checkout -b conflict-squash conflict-branch && ># base=$(git rev-parse HEAD~4) && ># ( ># FAKE_LINES="1 fixup 3 squash 4" && ># export FAKE_LINES && ># test_must_fail git rebase -i $base ># ) && ># echo three > conflict && ># git add conflict && ># FAKE_COMMIT_AMEND="TWICE" EXPECT_HEADER_COUNT=2 \ ># git rebase --continue && ># test $base = $(git rev-parse HEAD^) && ># test 2 = $(git show | grep TWICE | wc -l) && ># git checkout to-be-rebased && ># git branch -D conflict-squash ># >ok 15 - rebase -i -p with merge >ok 4 - auto squash (option) >ok 16 - set up second root and merge >ok 4 - rebase from C1 onto H1 ># passed all 4 test(s) >1..4 >*** t3417-rebase-whitespace-fix.sh *** >ok 6 - rebase -i --onto master... >ok 10 - pre-rebase hook gets correct input (6) >ok 11 - setup pre-rebase hook that fails >not ok - 27 squash and fixup generate correct log messages ># ># git checkout -b squash-fixup E && ># base=$(git rev-parse HEAD~4) && ># FAKE_COMMIT_AMEND="ONCE" FAKE_LINES="1 fixup 2 squash 3 fixup 4" \ ># EXPECT_HEADER_COUNT=4 \ ># git rebase -i $base && ># git cat-file commit HEAD | sed -e 1,/^\$/d > actual-squash-fixup && ># test_cmp expect-squash-fixup actual-squash-fixup && ># git checkout to-be-rebased && ># git branch -D squash-fixup ># >ok 12 - pre-rebase hook stops rebase (1) >ok 7 - rebase -i --onto master...side ># passed all 7 test(s) >1..7 >*** t3418-rebase-continue.sh *** >ok 13 - pre-rebase hook stops rebase (2) >ok 16 - test notes in no fanout concatenated with 2/38-fanout >ok 1 - setup >ok 17 - verify notes in no fanout concatenated with 2/38-fanout >ok 1 - blank line at end of file; extend at end of file >ok 14 - rebase --no-verify overrides pre-rebase (1) >not ok - 28 squash ignores comments ># ># git checkout -b skip-comments E && ># base=$(git rev-parse HEAD~4) && ># FAKE_COMMIT_AMEND="ONCE" FAKE_LINES="# 1 # squash 2 # squash 3 # squash 4 #" \ ># EXPECT_HEADER_COUNT=4 \ ># git rebase -i $base && ># test $base = $(git rev-parse HEAD^) && ># test 1 = $(git show | grep ONCE | wc -l) && ># git checkout to-be-rebased && ># git branch -D skip-comments ># >ok 2 - interactive rebase --continue works with touched file >ok 2 - two blanks line at end of file; extend at end of file >ok 15 - rebase --no-verify overrides pre-rebase (2) ># passed all 15 test(s) >1..15 >*** t3419-rebase-patch-id.sh *** >ok 17 - rebase -i -p with two roots >ok 18 - setup pre-rebase hook that fails >ok 1 - setup >ok 5 - auto squash (config) >ok 19 - pre-rebase hook stops rebase >ok 3 - same, but do not remove trailing spaces >ok 3 - non-interactive rebase --continue works with touched file ># passed all 3 test(s) >1..3 >*** t3500-cherry.sh *** >ok 20 - pre-rebase hook stops rebase -i >not ok - 29 squash ignores blank lines >ok 21 - remove pre-rebase hook ># ># git checkout -b skip-blank-lines E && ># base=$(git rev-parse HEAD~4) && ># FAKE_COMMIT_AMEND="ONCE" FAKE_LINES="> 1 > squash 2 > squash 3 > squash 4 >" \ ># EXPECT_HEADER_COUNT=4 \ ># git rebase -i $base && ># test $base = $(git rev-parse HEAD^) && ># test 1 = $(git show | grep ONCE | wc -l) && ># git checkout to-be-rebased && ># git branch -D skip-blank-lines ># >ok 22 - set up a conflict >ok 2 - setup: 500 lines >ok 3 - setup attributes >ok 6 - misspelled auto squash ># passed all 6 test(s) >1..6 >*** t3501-revert-cherry-pick.sh *** >ok 1 - prepare repository with topic branch, and check cherry finds the 2 patches from there >ok 2 - check that cherry with limit returns only the top patch >ok 3 - cherry-pick one of the 2 patches, and check cherry recognized one and only one as new ># passed all 3 test(s) >1..3 >*** t3502-cherry-pick-merge.sh *** >ok 23 - rebase --root with conflict (first part) >ok 18 - test notes in no fanout concatenated with 2/2/36-fanout >ok 24 - fix the conflict >ok 4 - at beginning of file ># passed all 4 test(s) >1..4 >ok 1 - setup >ok 19 - verify notes in no fanout concatenated with 2/2/36-fanout >*** t3503-cherry-pick-root.sh *** >ok 4 - detect upstream patch >ok 2 - cherry-pick --nonsense >ok 3 - revert --nonsense >ok 30 - squash works as expected >ok 1 - setup >ok 1 - setup >ok 4 - cherry-pick after renaming branch >ok 2 - cherry-pick a root commit ># passed all 2 test(s) >1..2 >ok 2 - cherry-pick a non-merge with -m should fail >*** t3504-cherry-pick-rerere.sh *** >ok 3 - cherry pick a merge without -m should fail >ok 5 - revert after renaming branch >ok 4 - cherry pick a merge (1) >ok 5 - cherry pick a merge (2) >ok 6 - cherry-pick on stat-dirty working tree >ok 7 - revert forbidden on dirty working tree ># passed all 7 test(s) >1..7 >ok 6 - cherry pick a merge relative to nonexistent parent should fail >ok 1 - setup >ok 2 - conflicting merge >*** t3505-cherry-pick-empty.sh *** >ok 7 - revert a non-merge with -m should fail >ok 3 - fixup >ok 4 - cherry-pick conflict >ok 8 - revert a merge without -m should fail >ok 25 - rebase --root with conflict (second part) >ok 5 - reconfigure >ok 6 - cherry-pick conflict without rerere ># passed all 6 test(s) >1..6 >ok 5 - do not drop patch >ok 6 # skip setup: 50000 lines (missing EXPENSIVE) >ok 7 # skip setup attributes (missing EXPENSIVE) >ok 8 # skip detect upstream patch (missing EXPENSIVE) >ok 9 # skip do not drop patch (missing EXPENSIVE) ># passed all 9 test(s) >1..9 >*** t3506-cherry-pick-ff.sh *** >ok 9 - revert a merge (1) >*** t3507-cherry-pick-conflict.sh *** >ok 1 - setup >ok 10 - revert a merge (2) >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 11 - revert a merge relative to nonexistent parent should fail ># passed all 11 test(s) >1..11 >*** t3508-cherry-pick-many-commits.sh *** >*** t3509-cherry-pick-merge-df.sh *** >ok 1 - setup >ok 1 - creating many notes with git-notes >ok 1 - setup >ok 26 - rebase -i --root with conflict (first part) >ok 27 - fix the conflict >ok 2 - cherry-pick using --ff fast forwards >ok 3 - cherry-pick not using --ff does not fast forwards >ok 2 - failed cherry-pick does not advance HEAD >ok 2 - many notes created correctly with git-notes >ok 1 - Setup rename across paths each below D/F conflicts >ok 1 - setup >ok 3 - many notes created with git-notes triggers fanout >ok 2 - Cherry-pick succeeds with rename across D/F conflicts >ok 3 - advice from failed cherry-pick ># passed all 2 test(s) >1..2 >*** t3600-rm.sh *** >ok 4 - failed cherry-pick produces dirty index >ok 31 - interrupted squash works as expected >ok 2 - cherry-pick first..fourth works >ok 4 - merge setup >ok 1 - Initialize test directory >ok 5 - cherry-pick a non-merge with --ff and -m should fail >ok 2 - add files with funny names >ok 6 - cherry pick a merge with --ff but without -m should fail >ok 3 - Pre-check that foo exists and is in index before git rm foo >ok 4 - Test that git rm foo succeeds >ok 5 - Test that git rm --cached foo succeeds if the index matches the file >ok 7 - cherry pick with --ff a merge (1) >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 7 - Test that git rm --cached foo fails if the index matches neither the file nor HEAD >ok 3 - cherry-pick --strategy resolve first..fourth works >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 - failed cherry-pick describes conflict in work tree >ok 8 - Test that git rm --cached -f foo works in case where --cached only did not >ok 9 - Post-check that foo exists but is not in index after git rm foo >ok 10 - Pre-check that bar exists and is in index before "git rm bar" >ok 11 - Test that "git rm bar" succeeds >ok 12 - Post-check that bar does not exist and is not in index after "git rm -f bar" >ok 13 - Test that "git rm -- -q" succeeds (remove a file that looks like an option) >ok 4 - cherry-pick --ff first..fourth works >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 10 - cherry pick a root commit with --ff ># passed all 10 test(s) >1..10 >ok 16 - When the rm in "git rm -f" fails, it should not remove the file from the index >ok 7 - diff3 -m style >ok 17 - Remove nonexistent file with --ignore-unmatch >*** t3700-add.sh *** >ok 5 - cherry-pick -n first..fourth works >ok 18 - "rm" command printed >ok 1 - Test of git add >ok 2 - Post-check that foo is in the index >ok 28 - rebase -i --root with conflict (second part) >ok 3 - Test that "git add -- -q" works >ok 19 - "rm" command suppressed with --quiet >ok 6 - revert first..fourth works >ok 20 - Re-add foo and baz >ok 20 - test notes in 2/38-fanout concatenated with 2/2/36-fanout >ok 21 - Modify foo -- rm should refuse >ok 4 - git add: Test that executable bit is not used if core.filemode=0 >ok 22 - Modified foo -- rm -f should work >ok 8 - revert also handles conflicts sanely >ok 5 - git add: filemode=0 should not get confused by symlink >ok 21 - verify notes in 2/38-fanout concatenated with 2/2/36-fanout >ok 23 - Re-add foo and baz for HEAD tests >ok 7 - revert ^first fourth works >ok 6 - git update-index --add: Test that executable bit is not used... >ok 24 - foo is different in index from HEAD -- rm should refuse >ok 7 - git add: filemode=0 should not get confused by symlink >ok 25 - but with -f it should work. >ok 9 - revert conflict, diff3 -m style ># passed all 9 test(s) >1..9 >ok 26 - refuse to remove cached empty file with modifications >ok 8 - git update-index --add: Test that executable bit is not used... >ok 9 - .gitignore test setup >*** t3701-add-interactive.sh *** >ok 27 - remove intent-to-add file without --force >ok 10 - .gitignore is honored >ok 29 - rebase -i -p --root with conflict (first part) >ok 11 - error out when attempting to add ignored ones without -f >ok 28 - Recursive test setup >ok 8 - revert fourth fourth~1 fourth~2 works >ok 30 - fix the conflict >ok 29 - Recursive without -r fails >ok 12 - error out when attempting to add ignored ones without -f >ok 30 - Recursive with -r but dirty >ok 31 - Recursive with -r -f >ok 13 - add ignored ones with -f >ok 32 - Remove nonexistent file returns nonzero exit status >ok 14 - add ignored ones with -f >ok 1 - setup (initial) >ok 15 - add ignored ones with -f >ok 33 - Call "rm" from outside the work tree >ok 9 - cherry-pick -3 fourth works >ok 16 - .gitignore with subdirectory >ok 34 - refresh index before checking if it is up-to-date >ok 17 - check correct prefix detection >ok 10 - cherry-pick --stdin works ># passed all 10 test(s) >1..10 >*** t3702-add-edit.sh *** >ok 18 - git add with filemode=0, symlinks=0, and unmerged entries >ok 2 - status works (initial) >ok 3 - setup expected >ok 1 - setup >ok 19 - git add with filemode=0, symlinks=0 prefers stage 2 over stage 1 >ok 2 - add -e ># passed all 2 test(s) >1..2 >ok 32 - interrupted squash works as expected (case 2) >*** t3800-mktag.sh *** >ok 20 - git add --refresh >ok 4 - diff works (initial) >ok 21 - git add should fail atomically upon an unreadable file >ok 22 - git add --ignore-errors >ok 1 - setup >ok 2 - Tag object length check >ok 3 - "object" line label check >ok 4 - "object" line SHA1 check >ok 23 - git add (add.ignore-errors) >ok 5 - "type" line label check >ok 6 - "type" line eol check >ok 7 - "tag" line label check #1 >ok 22 - test notes in 2/2/36-fanout concatenated with 2/2/2/34-fanout >ok 24 - git add (add.ignore-errors = false) >ok 8 - "tag" line label check #2 >ok 5 - revert works (initial) >ok 9 - "type" line type-name length check >ok 10 - verify object (SHA1/type) check >ok 23 - verify notes in 2/2/36-fanout concatenated with 2/2/2/34-fanout >ok 6 - setup (commit) ># passed all 23 test(s) >1..23 >ok 11 - verify tag-name check >ok 25 - --no-ignore-errors overrides config >ok 12 - "tagger" line label check #1 >*** t3900-i18n-commit.sh *** >ok 13 - "tagger" line label check #2 >ok 26 - git add 'fo\[ou\]bar' ignores foobar >ok 14 - disallow missing tag author name >ok 15 - disallow malformed tagger >ok 16 - allow empty tag email >ok 27 - git add to resolve conflicts on otherwise ignored path >ok 17 - disallow spaces in tag email >ok 18 - disallow missing tag timestamp >ok 28 - "add non-existent" should fail >ok 19 - detect invalid tag timestamp1 >ok 29 - git add --dry-run of existing changed file >ok 20 - detect invalid tag timestamp2 >ok 30 - git add --dry-run of non-existing file >ok 1 - setup >ok 21 - detect invalid tag timezone1 >ok 2 - no encoding header for base case >ok 31 - git add --dry-run --ignore-missing of non-existing file ># passed all 31 test(s) >1..31 >ok 22 - detect invalid tag timezone2 >ok 23 - detect invalid tag timezone3 >ok 7 - status works (commit) >*** t3901-i18n-patch.sh *** >ok 8 - setup expected >ok 3 - ISO8859-1 setup >ok 24 - detect invalid header entry >ok 25 - create valid tag >ok 26 - check mytag ># passed all 26 test(s) >1..26 >ok 4 - eucJP setup >*** t3902-quoted.sh *** >ok 5 - ISO-2022-JP setup >ok 6 - check encoding header for ISO8859-1 >ok 7 - check encoding header for eucJP >ok 8 - check encoding header for ISO-2022-JP >ok 9 - config to remove customization >ok 31 - rebase -i -p --root with conflict (second part) ># passed all 31 test(s) >1..31 >ok 10 - ISO8859-1 should be shown in UTF-8 now >ok 33 - ignore patch if in upstream >ok 11 - eucJP should be shown in UTF-8 now >ok 1 - setup >*** t3903-stash.sh *** >ok 2 - setup expected files >ok 12 - ISO-2022-JP should be shown in UTF-8 now >ok 3 - check fully quoted output from ls-files >ok 13 - config to add customization >ok 4 - check fully quoted output from diff-files >ok 1 - setup >ok 5 - check fully quoted output from diff-index >ok 14 - ISO8859-1 should be shown in itself now >ok 9 - diff works (commit) >ok 6 - check fully quoted output from diff-tree >ok 7 - check fully quoted output from ls-tree >ok 15 - eucJP should be shown in itself now >ok 8 - setting core.quotepath >ok 2 - format-patch output (ISO-8859-1) >ok 9 - check fully quoted output from ls-files >ok 16 - ISO-2022-JP should be shown in itself now >ok 10 - check fully quoted output from diff-files >ok 17 - config to tweak customization >ok 11 - check fully quoted output from diff-index >ok 18 - ISO8859-1 should be shown in UTF-8 now >ok 12 - check fully quoted output from diff-tree >ok 3 - format-patch output (UTF-8) >ok 19 - eucJP should be shown in UTF-8 now >ok 13 - check fully quoted output from ls-tree ># passed all 13 test(s) >1..13 >ok 20 - ISO-2022-JP should be shown in UTF-8 now >*** t3904-stash-patch.sh *** >ok 21 - eucJP should be shown in eucJP now >ok 22 - ISO-2022-JP should be shown in eucJP now >ok 23 - eucJP should be shown in ISO-2022-JP now >ok 24 - ISO-2022-JP should be shown in ISO-2022-JP now >ok 25 - No conversion with ISO8859-1 >ok 26 - No conversion with eucJP >ok 27 - No conversion with ISO-2022-JP ># passed all 27 test(s) >1..27 >ok 1 - stash some dirty working directory >*** t4000-diff-format.sh *** >ok 2 - parents of stash >ok 1 - setup >ok 1 - update-index --add two files with and without +x. >ok 3 - apply needs clean working directory >ok 2 - git diff-files -p after editing work tree. >ok 10 - revert works (commit) >ok 11 - setup expected >ok 12 - setup fake editor >ok 3 - validate git diff-files -p output. ># passed all 3 test(s) >1..3 >*** t4001-diff-rename.sh *** >ok 1 - update-index --add a file. >ok 2 - write that tree. >ok 3 - renamed and edited the file. >ok 34 - --continue tries to commit, even for "edit" >ok 4 - apply stashed changes >ok 4 - git diff-index -p -M after rename and editing. >ok 5 - validate the output. >ok 4 - rebase (U/U) >ok 6 - favour same basenames over different ones >ok 13 - dummy edit works >ok 14 - setup patch >ok 7 - favour same basenames even with minor differences ># passed all 7 test(s) >1..7 >ok 15 - setup fake editor >*** t4002-diff-basic.sh *** >ok 2 - saying "n" does nothing >ok 5 - apply stashed changes (including index) >ok 1 - adding test file NN and Z/NN >ok 2 - adding test file ND and Z/ND >ok 3 - adding test file NM and Z/NM >ok 4 - adding test file DN and Z/DN >ok 5 - adding test file DD and Z/DD >ok 6 - adding test file DM and Z/DM >ok 6 - unstashing in a subdirectory >ok 16 - bad edit rejected >ok 7 - adding test file MN and Z/MN >ok 17 - setup patch >ok 8 - adding test file MD and Z/MD >ok 9 - adding test file MM and Z/MM >ok 10 - adding test file SS >ok 11 - adding test file TT >ok 12 - prepare initial tree >ok 13 - change in branch A (removal) >ok 14 - change in branch A (modification) >ok 15 - change in branch A (modification) >ok 16 - change in branch A (modification) >ok 17 - change in branch A (modification) >ok 5 - rebase (U/L) >ok 18 - change in branch A (modification) >ok 19 - change in branch A (modification) >ok 20 - change in branch A (addition) >ok 21 - change in branch A (addition) >ok 22 - change in branch A (addition) >ok 23 - change in branch A (addition) >ok 35 - aborted --continue does not squash commits after "edit" >ok 24 - change in branch A (addition) >ok 25 - change in branch A (edit) >ok 26 - change in branch A (change file to directory) >ok 18 - garbage edit rejected >ok 19 - setup patch >ok 20 - setup expected >ok 27 - recording branch A tree >ok 28 - reading original tree and checking out >ok 29 - change in branch B (removal) >ok 30 - change in branch B (modification) >ok 31 - change in branch B (modification) >ok 32 - change in branch B (modification) >ok 3 - git stash -p >ok 33 - change in branch B (modification) >ok 34 - change in branch B (modification) >ok 35 - change in branch B (modification) >ok 36 - change in branch B (addition) >ok 37 - change in branch B (addition) >ok 38 - change in branch B (addition) >ok 39 - change in branch B (addition) >ok 40 - change in branch B (addition and modification) >ok 21 - real edit works >ok 7 - drop top stash >ok 41 - change in branch B (modification) >ok 42 - change in branch B (addition of a file to conflict with directory) >ok 43 - recording branch B tree >ok 6 - rebase (L/L) >ok 44 - keep contents of 3 trees for easy access >ok 45 - diff-tree of known trees. >ok 46 - diff-tree of known trees. >ok 47 - diff-tree of known trees. >ok 48 - diff-tree of known trees. >ok 49 - diff-tree of known trees. >ok 50 - diff-tree of known trees. >ok 51 - diff-tree --stdin of known trees. >ok 52 - diff-tree --stdin of known trees. >ok 53 - diff-cache O with A in cache >ok 54 - diff-cache O with B in cache >ok 36 - auto-amend only edited commits after "edit" >ok 55 - diff-cache A with B in cache >ok 22 - skip files similarly as commit -a >ok 56 - diff-files with O in cache and A checked out >ok 57 - diff-files with O in cache and B checked out >ok 4 - git stash -p --no-keep-index >ok 4 - deleting most notes with git-notes >ok 5 - none of this moved HEAD ># passed all 5 test(s) >1..5 >*** t4003-diff-rename-1.sh *** >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 58 - diff-files with A in cache and B checked out >ok 59 - diff-tree O A == diff-tree -R A O >ok 60 - diff-tree -r O A == diff-tree -r -R A O >ok 61 - diff-tree B A == diff-tree -R A B >ok 23 - patch does not affect mode >ok 1 - prepare reference tree >ok 62 - diff-tree -r B A == diff-tree -r -R A B >ok 2 - prepare work tree >ok 63 - diff can read from stdin ># passed all 63 test(s) >1..63 >ok 7 - rebase (L/U) >ok 3 - validate output from rename/copy detection (#1) >*** t4004-diff-rename-symlink.sh *** >ok 4 - prepare work tree again >ok 5 - validate output from rename/copy detection (#2) >ok 6 - prepare work tree once again >*** t4005-diff-rename-2.sh *** >ok 37 - rebase a detached HEAD >ok 7 - validate output from rename/copy detection (#3) ># passed all 7 test(s) >1..7 >ok 1 - prepare reference tree >*** t4006-diff-mode.sh *** >ok 2 - prepare work tree >ok 3 - setup diff output >ok 4 - validate diff output >ok 8 - cherry-pick(U/U) ># passed all 4 test(s) >1..4 >ok 1 - prepare reference tree >*** t4007-rename-3.sh *** >ok 24 - stage mode but not hunk >ok 2 - prepare work tree >ok 1 - setup >ok 8 - drop middle stash >ok 2 - chmod >ok 3 - validate output from rename/copy detection (#1) >ok 3 - verify ># passed all 3 test(s) >1..3 >ok 4 - prepare work tree again >*** t4008-diff-break-rewrite.sh *** >ok 5 - validate output from rename/copy detection (#2) >ok 1 - prepare reference tree >ok 6 - prepare work tree once again >ok 2 - prepare work tree >ok 3 - copy detection >ok 7 - validate output from rename/copy detection (#3) >ok 9 - cherry-pick(L/L) ># passed all 7 test(s) >1..7 >*** t4009-diff-rename-4.sh *** >ok 4 - copy detection, cached >ok 1 - setup >ok 5 - copy, limited to a subtree >ok 2 - change file1 with copy-edit of file0 and remove file0 >ok 6 - tweak work tree >ok 3 - run diff with -B >ok 4 - validate result of -B (#1) >ok 7 - rename detection >ok 5 - run diff with -B and -M >ok 38 - rebase a commit violating pre-commit >ok 6 - validate result of -B -M (#2) >ok 8 - rename, limited to a subtree >ok 9 - stash pop >ok 1 - prepare reference tree ># passed all 8 test(s) >1..8 >ok 25 - stage mode and hunk >ok 2 - prepare work tree >*** t4010-diff-pathspec.sh *** >ok 7 - swap file0 and file1 >ok 10 - cherry-pick(U/L) >ok 8 - run diff with -B >ok 26 - setup again >ok 27 - setup patch >ok 9 - validate result of -B (#3) >ok 28 - setup expected >ok 3 - validate output from rename/copy detection (#1) >ok 10 - run diff with -B and -M >ok 4 - prepare work tree again >ok 11 - validate result of -B -M (#4) >ok 12 - make file0 into something completely different >ok 13 - run diff with -B >ok 5 - validate output from rename/copy detection (#2) >ok 14 - validate result of -B (#5) >ok 15 - run diff with -B -M >ok 6 - prepare work tree once again >ok 1 - setup >ok 16 - validate result of -B -M (#6) >ok 17 - run diff with -M >ok 18 - validate result of -M (#7) >ok 7 - validate output from rename/copy detection (#3) >ok 2 - limit to path should show nothing ># passed all 7 test(s) >1..7 >ok 35 - choking "git rm" should not let it die with cruft >*** t4011-diff-symlink.sh *** >ok 3 - limit to path1 should show path1/file1 >ok 36 - rm removes subdirectories recursively >not ok - 39 rebase with a file named HEAD in worktree ># passed all 36 test(s) >1..36 ># ># ># rm -fr .git/hooks && ># git reset --hard && ># git checkout -b branch3 A && ># ># ( ># GIT_AUTHOR_NAME="Squashed Away" && ># export GIT_AUTHOR_NAME && ># >HEAD && ># git add HEAD && ># git commit -m "Add head" && ># >BODY && ># git add BODY && ># git commit -m "Add body" ># ) && ># ># FAKE_LINES="1 squash 2" git rebase -i to-be-rebased && ># test "$(git show -s --pretty=format:%an)" = "Squashed Away" ># ># >ok 11 - cherry-pick(L/U) >ok 19 - file1 edited to look like file0 and file0 rename-edited to file2 >ok 4 - limit to path1/ should show path1/file1 >ok 20 - run diff with -B >ok 21 - validate result of -B (#8) >*** t4012-diff-binary.sh *** >ok 5 - limit to file0 should show file0 >ok 22 - run diff with -B -M >ok 23 - validate result of -B -M (#9) ># passed all 23 test(s) >1..23 >ok 6 - limit to file0/ should emit nothing. >*** t4013-diff-various.sh *** >ok 7 - diff-tree pathspec ># passed all 7 test(s) >1..7 >*** t4014-format-patch.sh *** >ok 29 - add first line works >ok 30 - setup expected >ok 1 - diff new symlink >ok 1 - prepare repository >ok 2 - diff without --binary >ok 2 - diff unchanged symlink >ok 3 - diff with --binary >ok 3 - diff removed symlink >ok 4 - apply detecting corrupt patch correctly >ok 4 - diff identical, but newly created symlink >ok 5 - apply detecting corrupt patch correctly >ok 5 - diff different symlink >ok 6 - initial commit >ok 6 - diff symlinks with non-existing targets >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 >*** t4015-diff-whitespace.sh *** >ok 10 - stash branch >ok 12 - rebase --merge (U/U) >ok 8 - apply binary patch >ok 1 - setup >ok 2 - format-patch --ignore-if-in-upstream >ok 9 - diff --no-index with binary creation >ok 31 - deleting a non-empty file ># passed all 9 test(s) >1..9 >ok 32 - setup expected >ok 3 - format-patch --ignore-if-in-upstream >*** t4016-diff-quote.sh *** >ok 1 - Ray's example without options >ok 2 - Ray's example with -w >ok 3 - Ray's example with -b >ok 4 - another test, without options >ok 5 - another test, with -w >ok 1 - setup >ok 6 - another test, with -w -b >ok 7 - another test, with -w --ignore-space-at-eol >ok 8 - another test, with -w -b --ignore-space-at-eol >ok 2 - git diff-tree initial >ok 9 - another test, with -b >ok 3 - git diff-tree -r initial >ok 10 - another test, with -b --ignore-space-at-eol >ok 1 - setup >ok 2 - setup expected files >ok 11 - another test, with --ignore-space-at-eol >ok 4 - git diff-tree -r --abbrev initial >ok 11 - apply -q is quiet >ok 3 - git diff --summary -M HEAD >ok 4 - setup expected files >ok 12 - check mixed spaces and tabs in indent >ok 13 - check mixed tabs and spaces in indent >ok 5 - git diff --stat -M HEAD ># passed all 5 test(s) >1..5 >ok 5 - git diff-tree -r --abbrev=4 initial >ok 14 - check with no whitespace errors >ok 40 - do "noop" when there is nothing to cherry-pick >*** t4017-diff-retval.sh *** >ok 6 - git diff-tree --root initial >ok 15 - check with trailing whitespace >ok 33 - deleting an empty file >ok 16 - check with space before tab in indent ># passed all 33 test(s) >1..33 >ok 13 - rebase --merge (U/L) >ok 7 - git diff-tree --root --abbrev initial >ok 17 - --check and --exit-code are not exclusive >*** t4018-diff-funcname.sh *** >ok 18 - --check and --quiet are not exclusive >ok 8 - git diff-tree --root -r initial >ok 19 - check staged with no whitespace errors >ok 9 - git diff-tree --root -r --abbrev initial >ok 20 - check staged with trailing whitespace >ok 10 - git diff-tree --root -r --abbrev=4 initial >ok 12 - save -q is quiet >ok 21 - check staged with space before tab in indent >ok 22 - check with no whitespace errors (diff-index) >ok 11 - git diff-tree -p initial >ok 1 - builtin bibtex pattern compiles >ok 1 - setup >ok 2 - builtin bibtex wordRegex pattern compiles >ok 41 - submodule rebase setup >ok 4 - format-patch result applies >ok 23 - check with trailing whitespace (diff-index) >ok 2 - git diff --quiet -w HEAD^^ HEAD^ >ok 12 - git diff-tree --root -p initial >ok 3 - builtin cpp pattern compiles >ok 3 - git diff --quiet HEAD^^ HEAD^ >ok 4 - builtin cpp wordRegex pattern compiles >ok 4 - git diff --quiet -w HEAD^ HEAD >ok 24 - check with space before tab in indent (diff-index) >ok 13 - git diff-tree --patch-with-stat initial >ok 5 - builtin csharp pattern compiles >ok 5 - git diff-tree HEAD^ HEAD >ok 25 - check staged with no whitespace errors (diff-index) >ok 6 - git diff-tree HEAD^ HEAD -- a >ok 6 - builtin csharp wordRegex pattern compiles >ok 14 - git diff-tree --root --patch-with-stat initial >ok 7 - git diff-tree HEAD^ HEAD -- b >ok 7 - builtin fortran pattern compiles >ok 8 - echo HEAD | git diff-tree --stdin >ok 26 - check staged with trailing whitespace (diff-index) >ok 15 - git diff-tree --patch-with-raw initial >ok 8 - builtin fortran wordRegex pattern compiles >ok 9 - git diff-tree HEAD HEAD >ok 10 - git diff-files >ok 9 - builtin html pattern compiles >ok 27 - check staged with space before tab in indent (diff-index) >ok 13 - pop -q is quiet >ok 11 - git diff-index --cached HEAD >ok 16 - git diff-tree --root --patch-with-raw initial >ok 10 - builtin html wordRegex pattern compiles >ok 12 - git diff-index --cached HEAD^ >ok 11 - builtin java pattern compiles >ok 28 - check with no whitespace errors (diff-tree) >ok 17 - git diff-tree --pretty initial >ok 13 - git diff-index --cached HEAD^ >ok 12 - builtin java wordRegex pattern compiles >ok 13 - builtin objc pattern compiles >ok 18 - git diff-tree --pretty --root initial >ok 29 - check with trailing whitespace (diff-tree) >ok 14 - git diff-tree -Stext HEAD^ HEAD -- b >ok 14 - builtin objc wordRegex pattern compiles >ok 15 - git diff-tree -Snot-found HEAD^ HEAD -- b >ok 15 - builtin pascal pattern compiles >ok 19 - git diff-tree --pretty -p initial >ok 30 - check with space before tab in indent (diff-tree) >ok 16 - git diff-files >ok 16 - builtin pascal wordRegex pattern compiles >ok 17 - builtin php pattern compiles >ok 31 - check trailing whitespace (trailing-space: off) >ok 17 - git diff-index --cached HEAD >ok 20 - git diff-tree --pretty --stat initial >ok 18 - builtin php wordRegex pattern compiles >ok 18 - --check --exit-code returns 0 for no difference >ok 14 - rebase --merge (L/L) >ok 19 - builtin python pattern compiles >ok 32 - check trailing whitespace (trailing-space: on) >ok 19 - --check --exit-code returns 1 for a clean difference >ok 21 - git diff-tree --pretty --summary initial >ok 20 - builtin python wordRegex pattern compiles >ok 20 - --check --exit-code returns 3 for a dirty difference >ok 33 - check space before tab in indent (space-before-tab: off) >ok 21 - builtin ruby pattern compiles >ok 21 - --check with --no-pager returns 2 for dirty difference >ok 22 - git diff-tree --pretty --stat --summary initial >ok 22 - check should test not just the last line >ok 22 - builtin ruby wordRegex pattern compiles >ok 34 - check space before tab in indent (space-before-tab: on) >ok 23 - builtin tex pattern compiles >ok 24 - builtin tex wordRegex pattern compiles >ok 23 - git diff-tree --pretty --root -p initial >ok 35 - check spaces as indentation (indent-with-non-tab: off) >ok 25 - default behaviour >ok 5 - format-patch --ignore-if-in-upstream result applies >ok 36 - check spaces as indentation (indent-with-non-tab: on) >ok 26 - preset java pattern >ok 24 - git diff-tree --pretty --root --stat initial >ok 6 - commit did not screw up the log message >ok 7 - format-patch did not screw up the log message >ok 37 - check tabs and spaces as indentation (indent-with-non-tab: on) >ok 27 - custom pattern >ok 25 - git diff-tree --pretty --root --summary initial >ok 8 - replay did not screw up the log message >ok 38 - check tabs as indentation (tab-in-indent: off) >ok 28 - last regexp must not be negated >ok 39 - check tabs as indentation (tab-in-indent: on) >ok 26 - git diff-tree --pretty --root --summary -r initial >ok 23 - check detects leftover conflict markers >ok 29 - pattern which matches to end of line >ok 9 - extra headers >ok 40 - check tabs and spaces as indentation (tab-in-indent: on) >ok 27 - git diff-tree --pretty --root --stat --summary initial >ok 30 - alternation in pattern ># passed all 30 test(s) >1..30 >ok 41 - check tab-in-indent and indent-with-non-tab conflict >*** t4019-diff-wserror.sh *** >ok 28 - git diff-tree --pretty --patch-with-stat initial >ok 42 - check tab-in-indent excluded from wildcard whitespace attribute >ok 10 - extra headers without newlines >ok 43 - line numbers in --check output are correct >ok 14 - pop -q --index works and is quiet >ok 29 - git diff-tree --pretty --root --patch-with-stat initial >ok 44 - checkdiff detects new trailing blank lines (1) >ok 24 - check honors conflict marker length ># passed all 24 test(s) >1..24 >ok 11 - extra headers with multiple To:s >ok 30 - git diff-tree --pretty --patch-with-raw initial >ok 45 - checkdiff detects new trailing blank lines (2) >*** t4020-diff-external.sh *** >ok 12 - additional command line cc >ok 31 - git diff-tree --pretty --root --patch-with-raw initial >ok 46 - checkdiff allows new blank lines >ok 42 - submodule rebase -i >ok 13 - command line headers >ok 1 - setup >ok 32 - git diff-tree --pretty=oneline initial >not ok - 43 avoid unnecessary reset ># ># git checkout master && ># test-chmtime =123456789 file3 && ># git update-index --refresh && ># HEAD=$(git rev-parse HEAD) && ># git rebase -i HEAD~4 && ># test $HEAD = $(git rev-parse HEAD) && ># MTIME=$(test-chmtime -v +0 file3 | sed s/[^0-9].*$//) && ># test 123456789 = $MTIME ># >ok 14 - configuration headers and command line headers >ok 33 - git diff-tree --pretty=oneline --root initial >ok 15 - rebase --merge (L/U) ># passed all 15 test(s) >1..15 >ok 47 - whitespace-only changes not reported >ok 2 - default >ok 15 - command line To: header >ok 34 - git diff-tree --pretty=oneline -p initial >*** t4021-format-patch-numbered.sh *** >ok 16 - configuration To: header >ok 35 - git diff-tree --pretty=oneline --root -p initial >ok 3 - without -trail >ok 17 - --no-to overrides config.to >ok 36 - git diff-tree --pretty=oneline --patch-with-stat initial >ok 1 - setup >ok 48 - whitespace-only changes reported across renames >ok 18 - --no-to and --to replaces config.to >ok 4 - without -trail (attribute) >ok 37 - git diff-tree --pretty=oneline --root --patch-with-stat initial >ok 2 - GIT_EXTERNAL_DIFF environment >ok 3 - GIT_EXTERNAL_DIFF environment should apply only to diff >ok 38 - git diff-tree --pretty=oneline --patch-with-raw initial >ok 19 - --no-cc overrides config.cc >ok 4 - GIT_EXTERNAL_DIFF environment and --no-ext-diff >ok 5 - without -space >ok 20 - --no-add-headers overrides config.headers >ok 15 - drop -q is quiet >ok 39 - git diff-tree --pretty=oneline --root --patch-with-raw initial >ok 49 - rename empty >ok 1 - setup >ok 5 - diff attribute >ok 40 - git diff-tree --pretty side >ok 2 - single patch defaults to no numbers >ok 6 - without -space (attribute) >ok 21 - multiple files >ok 6 - diff attribute should apply only to diff >ok 7 - diff attribute and --no-ext-diff >ok 41 - git diff-tree --pretty -p side >ok 3 - multiple patch defaults to numbered >ok 4 - Use --numbered >ok 7 - with indent-non-tab only >ok 22 - no threading >ok 42 - git diff-tree --pretty --patch-with-stat side >ok 5 - format.numbered = true >ok 8 - diff attribute >ok 6 - format.numbered && single patch >ok 23 - thread >ok 8 - with indent-non-tab only (attribute) >ok 43 - git diff-tree master >ok 9 - diff attribute should apply only to diff >ok 50 - combined diff with autocrlf conversion >ok 7 - format.numbered && --no-numbered >ok 10 - diff attribute and --no-ext-diff >ok 24 - thread in-reply-to >ok 8 - format.numbered && --keep-subject >ok 44 - git diff-tree -p master >ok 11 - no diff with -diff >ok 9 - with cr-at-eol >not ok - 44 reword >ok 12 - force diff with "diff" ># ># git checkout -b reword-branch master && ># FAKE_LINES="1 2 3 reword 4" FAKE_COMMIT_MESSAGE="E changed" git rebase -i A && ># git show HEAD | grep "E changed" && ># test $(git rev-parse master) != $(git rev-parse HEAD) && ># test $(git rev-parse master^) = $(git rev-parse HEAD^) && ># FAKE_LINES="1 2 reword 3 4" FAKE_COMMIT_MESSAGE="D changed" git rebase -i A && ># git show HEAD^ | grep "D changed" && ># FAKE_LINES="reword 1 2 3 4" FAKE_COMMIT_MESSAGE="B changed" git rebase -i A && ># git show HEAD~3 | grep "B changed" && ># FAKE_LINES="1 reword 2 3 4" FAKE_COMMIT_MESSAGE="C changed" git rebase -i A && ># git show HEAD~2 | grep "C changed" ># >ok 45 - git diff-tree -p -m master >ok 9 - format.numbered = auto >ok 25 - thread cover-letter >ok 10 - format.numbered = auto && single patch >ok 46 - git diff-tree -c master >ok 10 - with cr-at-eol (attribute) >ok 26 - thread cover-letter in-reply-to >ok 11 - format.numbered = auto && --no-numbered >ok 13 - GIT_EXTERNAL_DIFF with more than one changed files >ok 16 - stash -k >ok 11 - trailing empty lines (1) >ok 47 - git diff-tree -c --abbrev master >ok 12 - --start-number && --numbered ># passed all 12 test(s) >1..12 >ok 27 - thread explicit shallow >ok 12 - trailing empty lines (2) >ok 51 - setup diff colors >*** t4022-diff-rewrite.sh *** >ok 48 - git diff-tree --cc master >ok 14 - GIT_EXTERNAL_DIFF generates pretty paths >ok 28 - thread deep >ok 13 - checkdiff shows correct line number for trailing blank lines >ok 49 - git diff-tree -c --stat master >ok 29 - thread deep in-reply-to >ok 52 - diff that introduces a line with only tabs ># passed all 52 test(s) >1..52 >ok 15 - external diff with autocrlf = true >ok 50 - git diff-tree --cc --stat master >ok 14 - do not color trailing cr in context >ok 30 - thread deep cover-letter >*** t4023-diff-rename-typechange.sh *** >ok 51 - git diff-tree -c --stat --summary master >ok 16 - diff --cached ># passed all 16 test(s) >1..16 >ok 15 - color new trailing blank lines ># passed all 15 test(s) >1..15 >ok 1 - setup >ok 31 - thread deep cover-letter in-reply-to >ok 52 - git diff-tree --cc --stat --summary master >*** t4024-diff-optimize-common.sh *** >ok 2 - detect rewrite >*** t4025-hunk-header.sh *** ># passed all 2 test(s) >1..2 >ok 32 - thread via config >*** t4026-color.sh *** >ok 53 - git diff-tree -c --stat --summary side >ok 54 - git diff-tree --cc --stat --summary side >ok 33 - thread deep via config >ok 55 - git diff-tree --cc --patch-with-stat master >ok 34 - thread config + override >ok 1 - setup >ok 56 - git diff-tree --cc --patch-with-stat --summary master >ok 1 - reset >ok 2 - hunk header truncation with an overly long line ># passed all 2 test(s) >1..2 >ok 2 - attribute before color name >ok 35 - thread config + --no-thread >ok 57 - git diff-tree --cc --patch-with-stat --summary side >*** t4027-diff-submodule.sh *** >ok 3 - color name before attribute >ok 4 - attr fg bg >ok 58 - git log master >ok 5 - fg attr bg >ok 17 - stash --invalid-option >ok 6 - fg bg attr >ok 7 - fg bg attr... >ok 59 - git log -p master >ok 36 - excessive subject >ok 8 - long color specification >ok 60 - git log --root master >ok 9 - 256 colors >ok 10 - color too small >ok 11 - color too big >ok 61 - git log --root -p master >ok 12 - extra character after color number >ok 13 - extra character after color name >ok 37 - cover-letter inherits diff options >ok 14 - extra character after attribute >ok 62 - git log --patch-with-stat master >ok 38 - shortlog of cover-letter wraps overly-long onelines >ok 15 - unknown color slots are ignored (diff) >ok 63 - git log --root --patch-with-stat master >ok 39 - format-patch respects -U >ok 1 - setup >ok 16 - unknown color slots are ignored (branch) >ok 45 - rebase -i can copy notes >ok 40 - format-patch -p suppresses stat >ok 64 - git log --root --patch-with-stat --summary master >ok 17 - unknown color slots are ignored (status) >ok 1 - setup ># passed all 17 test(s) >1..17 >ok 1 - setup >ok 41 - format-patch from a subdirectory (1) >ok 2 - git diff --raw HEAD >*** t4028-format-patch-mime-headers.sh *** >ok 65 - git log --root -c --patch-with-stat --summary master >ok 3 - git diff-index --raw HEAD >ok 2 - cross renames to be detected for regular files >ok 4 - git diff-files --raw >ok 42 - format-patch from a subdirectory (2) >ok 2 - diff -U0 ># passed all 2 test(s) >1..2 >ok 3 - cross renames to be detected for typechange >ok 66 - git log --root --cc --patch-with-stat --summary master >ok 5 - git diff HEAD >*** t4029-diff-trailing-space.sh *** >ok 4 - moves and renames >ok 43 - format-patch from a subdirectory (3) ># passed all 4 test(s) >1..4 >ok 67 - git log -p --first-parent master >ok 6 - git diff HEAD with dirty submodule (work tree) >ok 44 - format-patch --in-reply-to >*** t4030-diff-textconv.sh *** >ok 68 - git log -m -p --first-parent master >ok 45 - format-patch --signoff >ok 7 - git diff HEAD with dirty submodule (index) >ok 18 - stash an added file >ok 69 - git log -m -p master >ok 70 - git log -SF master >ok 71 - git log -S F master >ok 72 - git log -SF -p master >ok 73 - git log --decorate --all >ok 74 - git log --decorate=full --all >ok 75 - git rev-list --parents HEAD >ok 76 - git rev-list --children HEAD >ok 77 - git whatchanged master >ok 78 - git whatchanged -p master >ok 8 - git diff HEAD with dirty submodule (untracked) >ok 79 - git whatchanged --root master >ok 80 - git whatchanged --root -p master >ok 81 - git whatchanged --patch-with-stat master >ok 46 - options no longer allowed for format-patch >ok 1 - create commit with utf-8 body >ok 82 - git whatchanged --root --patch-with-stat master >ok 2 - patch has mime headers >ok 47 - format-patch --numstat should produce a patch >ok 83 - git whatchanged --root --patch-with-stat --summary master >ok 48 - format-patch -- <path> >ok 3 - patch has mime and extra headers >ok 9 - git diff HEAD with dirty submodule (work tree, refs match) ># passed all 3 test(s) >1..3 >ok 49 - format-patch --ignore-if-in-upstream HEAD >ok 84 - git whatchanged --root -c --patch-with-stat --summary master >*** t4031-diff-rewrite-binary.sh *** >ok 1 - setup binary file with history >ok 50 - format-patch --signature >ok 1 - diff honors config option, diff.suppressBlankEmpty >ok 2 - file is considered binary by porcelain ># passed all 1 test(s) >1..1 >ok 85 - git whatchanged --root --cc --patch-with-stat --summary master >ok 51 - format-patch with format.signature config >*** t4032-diff-inter-hunk-context.sh *** >ok 3 - file is considered binary by plumbing >ok 86 - git whatchanged -SF master >ok 4 - setup textconv filters >ok 52 - format-patch --signature overrides format.signature >ok 87 - git whatchanged -SF -p master >ok 53 - format-patch --no-signature ignores format.signature >ok 88 - git log --patch-with-stat master -- dir/ >ok 5 - diff produces text >ok 54 - format-patch --signature --cover-letter >ok 1 - create binary file with changes >ok 89 - git whatchanged --patch-with-stat master -- dir/ >ok 2 - vanilla diff is binary >ok 6 - diff-tree produces binary >ok 55 - format.signature="" supresses signatures >ok 3 - rewrite diff is binary >ok 1 - diff -U0, 1 common line: count hunks (2) >ok 10 - git diff HEAD with dirty submodule (work tree, refs match) [.git/config] >ok 90 - git log --patch-with-stat --summary master -- dir/ >ok 56 - format-patch --no-signature supresses signatures >ok 4 - rewrite diff can show binary patch >ok 46 - rebase -i can copy notes over a fixup >ok 2 - diff -U0, 1 common line: check output >ok 57 - format-patch --signature="" supresses signatures >ok 5 - setup textconv ># passed all 57 test(s) >1..57 >ok 3 - diff -U0 --inter-hunk-context=0, 1 common line: count hunks (2) >ok 19 - stash rm then recreate >ok 91 - git whatchanged --patch-with-stat --summary master -- dir/ >ok 7 - log produces text >ok 4 - diff -U0 --inter-hunk-context=0, 1 common line: check output >*** t4033-diff-patience.sh *** >ok 8 - format-patch produces binary >ok 92 - git show initial >ok 5 - diff -U0 --inter-hunk-context=1, 1 common line: count hunks (1) >ok 6 - diff -U0 --inter-hunk-context=1, 1 common line: check output >ok 93 - git show --root initial >ok 7 - diff -U0 --inter-hunk-context=2, 1 common line: count hunks (1) >ok 6 - rewrite diff respects textconv ># passed all 6 test(s) >1..6 >ok 8 - diff -U0 --inter-hunk-context=2, 1 common line: check output >ok 94 - git show side >*** t4034-diff-words.sh *** >ok 9 - diff -U1, 1 common line: count hunks (1) >ok 95 - git show master >ok 9 - status -v produces text >ok 1 - patience diff >ok 2 - patience diff output is valid >ok 10 - diffstat does not run textconv >ok 96 - git show -c master >ok 10 - diff -U0, 2 common lines: count hunks (2) >ok 3 - completely different files ># passed all 3 test(s) >1..3 >ok 11 - diff -U0 --inter-hunk-context=0, 2 common lines: count hunks (2) >ok 97 - git show -m master >ok 11 - git diff HEAD with dirty submodule (work tree, refs match) [.gitmodules] >*** t4035-diff-quiet.sh *** >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 98 - git show --first-parent master >ok 1 - setup >ok 14 - diff -U1, 2 common lines: count hunks (1) >ok 11 - textconv does not act on symlinks >ok 2 - word diff with runs of whitespace ># passed all 11 test(s) >1..11 >ok 12 - git diff HEAD with dirty submodule (index, refs match) >ok 99 - git show --stat side >ok 3 - --word-diff=color >*** t4036-format-patch-signer-mime.sh *** >ok 100 - git show --stat --summary side >ok 4 - --color --word-diff=color >ok 15 - diff -U1, 3 common lines: count hunks (2) >ok 5 - --word-diff=porcelain >ok 101 - git show --patch-with-stat side >ok 16 - diff -U1 --inter-hunk-context=0, 3 common lines: count hunks (2) >ok 17 - diff -U1 --inter-hunk-context=1, 3 common lines: count hunks (1) >ok 6 - --word-diff=plain >ok 13 - git diff HEAD with dirty submodule (untracked, refs match) >ok 1 - setup >ok 102 - git show --patch-with-raw side >ok 18 - diff -U1 --inter-hunk-context=2, 3 common lines: count hunks (1) >ok 7 - --word-diff=plain --no-color >ok 2 - git diff-tree HEAD^ HEAD >ok 20 - stash rm and ignore >ok 8 - --word-diff=plain --color >ok 3 - git diff-tree HEAD^ HEAD -- a >ok 103 - git show --patch-with-stat --summary side >ok 9 - word diff without context >ok 4 - git diff-tree HEAD^ HEAD -- b >ok 104 - git format-patch --stdout initial..side >ok 1 - setup >ok 5 - echo HEAD | git diff-tree --stdin >ok 10 - word diff with a regular expression >ok 105 - git format-patch --stdout initial..master^ >ok 2 - format normally >ok 11 - set a diff driver >ok 6 - git diff-tree HEAD HEAD >ok 14 - git diff HEAD with dirty submodule (untracked, refs match) [.git/config] >ok 3 - format with signoff without funny signer name >ok 12 - option overrides .gitattributes >ok 19 - diff -U3, 9 common lines: count hunks (2) >ok 7 - git diff-files >ok 106 - git format-patch --stdout initial..master >ok 4 - format with non ASCII signer name >ok 8 - git diff-index --cached HEAD >ok 20 - diff -U3 --inter-hunk-context=2, 9 common lines: count hunks (2) >ok 13 - use regex supplied by driver >ok 21 - diff -U3 --inter-hunk-context=3, 9 common lines: count hunks (1) ># passed all 21 test(s) >1..21 >ok 9 - git diff-index --cached HEAD^ >ok 5 - attach and signoff do not duplicate mime headers >ok 14 - set diff.wordRegex option >ok 107 - git format-patch --stdout --no-numbered initial..master ># passed all 5 test(s) >1..5 >*** t4037-diff-r-t-dirs.sh *** >*** t4038-diff-combined.sh *** >ok 15 - command-line overrides config >ok 10 - git diff-index --cached HEAD^ >ok 47 - rebase while detaching HEAD >ok 108 - git format-patch --stdout --numbered initial..master >ok 16 - command-line overrides config: --word-diff-regex >ok 11 - git diff-tree -Stext HEAD^ HEAD -- b >ok 109 - git format-patch --attach --stdout initial..side >ok 17 - .gitattributes override config >ok 12 - git diff-tree -Snot-found HEAD^ HEAD -- b >ok 18 - remove diff driver regex >ok 13 - git diff-files >ok 110 - git format-patch --attach --stdout --suffix=.diff initial..side >ok 19 - use configured regex >ok 15 - git diff HEAD with dirty submodule (untracked, refs match) [.gitmodules] >ok 20 - test parsing words for newline >ok 14 - git diff-index --cached HEAD ># passed all 14 test(s) >1..14 >ok 111 - git format-patch --attach --stdout initial..master^ >ok 21 - test when words are only removed at the end >*** t4039-diff-assume-unchanged.sh *** >ok 112 - git format-patch --attach --stdout initial..master >ok 22 - --word-diff=none ># passed all 22 test(s) >1..22 >ok 16 - git diff between submodule commits >*** t4040-whitespace-status.sh *** >ok 113 - git format-patch --inline --stdout initial..side >ok 1 - setup >ok 2 - verify ># passed all 2 test(s) >1..2 >ok 114 - git format-patch --inline --stdout initial..master^ >ok 21 - stash rm and ignore (stage .gitignore) >*** t4041-diff-submodule-option.sh *** >ok 115 - git format-patch --inline --stdout --numbered-files initial..master >ok 17 - git diff between submodule commits [.git/config] >ok 116 - git format-patch --inline --stdout initial..master >ok 1 - setup >ok 117 - git format-patch --inline --stdout --subject-prefix=TESTCASE initial..master >ok 2 - diff-index does not examine assume-unchanged entries >ok 118 - git config format.subjectprefix DIFFERENT_PREFIX >ok 1 - setup >ok 3 - diff-files does not examine assume-unchanged entries ># passed all 3 test(s) >1..3 >ok 2 - diff-tree --exit-code >ok 119 - git format-patch --inline --stdout initial..master^^ >*** t4042-diff-textconv-caching.sh *** >ok 3 - diff-tree -b --exit-code >ok 120 - git format-patch --stdout --cover-letter -n initial..master^ >ok 18 - git diff between submodule commits [.gitmodules] >ok 4 - diff-index --cached --exit-code >ok 121 - git diff --abbrev initial..side >ok 19 - git diff (empty submodule dir) >ok 5 - diff-index -b -p --cached --exit-code >ok 1 - setup >ok 122 - git diff -r initial..side >ok 20 - conflicted submodule setup >ok 6 - diff-index --exit-code >ok 1 - added submodule >ok 21 - combined (empty submodule) >ok 7 - diff-index -b -p --exit-code >ok 123 - git diff --stat initial..side >ok 2 - check combined output (1) >ok 8 - diff-files --exit-code >ok 124 - git diff -r --stat initial..side >ok 9 - diff-files -b -p --exit-code ># passed all 9 test(s) >1..9 >ok 1 - setup >ok 2 - modified submodule(forward) >ok 125 - git diff initial..side >*** t4043-diff-rename-binary.sh *** >ok 22 - combined (with submodule) ># passed all 22 test(s) >1..22 >ok 3 - modified submodule(forward) >ok 3 - check combined output (2) >ok 22 - stash file to symlink >ok 126 - git diff --patch-with-stat initial..side >*** t4044-diff-index-unique-abbrev.sh *** >ok 4 - modified submodule(forward) --submodule >ok 2 - first textconv works >ok 127 - git diff --patch-with-raw initial..side >ok 4 - diagnose truncated file ># passed all 4 test(s) >1..4 >ok 3 - cached textconv produces same output >ok 128 - git diff --patch-with-stat -r initial..side >ok 5 - modified submodule(forward) --submodule=short >*** t4045-diff-relative.sh *** >ok 4 - cached textconv does not run helper >ok 129 - git diff --patch-with-raw -r initial..side >ok 130 - git diff --name-status dir2 dir >ok 1 - prepare repository >ok 6 - modified submodule(backward) >ok 131 - git diff --no-index --name-status dir2 dir >ok 2 - move the files into a "sub" directory >ok 1 - setup >ok 5 - changing textconv invalidates cache >ok 132 - git diff --no-index --name-status -- dir2 dir >ok 3 - git show -C -C report renames ># passed all 3 test(s) >1..3 >ok 2 - diff does not produce ambiguous index line ># passed all 2 test(s) >1..2 >ok 1 - setup >ok 133 - git diff --no-index dir dir3 >*** t4100-apply-stat.sh *** >*** t4101-apply-nonl.sh *** >ok 2 - -p --relative=subdir/ >ok 6 - switching diff driver produces correct results ># passed all 6 test(s) >1..6 >ok 134 - git diff master master^ side >ok 3 - -p --relative=subdir >*** t4102-apply-rename.sh *** >ok 4 - -p --relative=sub >ok 7 - modified submodule(backward and forward) >ok 135 - git diff --dirstat master~1 master~2 >ok 136 - log -S requires an argument ># passed all 136 test(s) >1..136 >ok 5 - --stat --relative=subdir/ >ok 6 - --stat --relative=subdir >*** t4103-apply-binary.sh *** >ok 1 - rename >ok 7 - --stat --relative=sub >ok 2 - rename with recount >ok 8 - --raw --relative=subdir/ >ok 8 - typechanged submodule(submodule->blob), --cached >ok 1 - apply diff between 0 and 1 >ok 3 - copy >ok 9 - typechanged submodule(submodule->blob) >ok 9 - --raw --relative=subdir >ok 4 - copy with recount >ok 2 - apply diff between 0 and 2 >ok 5 - rewrite >ok 10 - --raw --relative=sub >ok 23 - stash file to symlink (stage rm) ># passed all 10 test(s) >1..10 >ok 3 - apply diff between 0 and 3 >ok 1 - setup >ok 6 - rewrite with recount >ok 10 - typechanged submodule(submodule->blob) >ok 2 - apply >ok 4 - apply diff between 1 and 0 >*** t4104-apply-boundary.sh *** >ok 3 - validate >ok 7 - mode >ok 5 - apply diff between 1 and 2 >ok 8 - mode with recount >ok 4 - apply reverse >ok 9 - non git (1) >ok 6 - apply diff between 1 and 3 >ok 10 - non git (1) with recount >ok 5 - apply copy >ok 7 - apply diff between 2 and 0 ># passed all 5 test(s) >1..5 >ok 11 - non git (2) >ok 12 - non git (2) with recount >ok 8 - apply diff between 2 and 1 >*** t4105-apply-fuzz.sh *** >ok 13 - non git (3) >ok 9 - apply diff between 2 and 3 >ok 14 - non git (3) with recount >ok 10 - apply diff between 3 and 0 >ok 48 - always cherry-pick with --no-ff >ok 15 - incomplete (1) >ok 11 - nonexistent commit >ok 11 - apply diff between 3 and 1 >ok 16 - incomplete (1) with recount >ok 17 - incomplete (2) >ok 12 - apply diff between 3 and 2 ># passed all 12 test(s) >1..12 >ok 18 - incomplete (2) with recount ># passed all 18 test(s) >1..18 >*** t4106-apply-stdin.sh *** >ok 12 - typechanged submodule(blob->submodule) >*** t4107-apply-ignore-whitespace.sh *** >ok 13 - submodule is up to date >ok 49 - set up commits with funny messages >ok 1 - setup >ok 14 - submodule contains untracked content >ok 15 - submodule contains untracked content (untracked ignored) >ok 2 - unmodified patch >ok 16 - submodule contains untracked content (dirty ignored) >ok 17 - submodule contains untracked content (all ignored) >ok 3 - minus offset >ok 1 - setup >ok 18 - submodule contains untracked and modifed content >ok 2 - git apply --numstat - < patch >ok 1 - setup >ok 4 - plus offset >ok 3 - git apply --numstat - < patch patch ># passed all 3 test(s) >1..3 >ok 19 - submodule contains untracked and modifed content (untracked ignored) >ok 1 - setup >ok 1 - file creation >ok 20 - submodule contains untracked and modifed content (dirty ignored) >ok 5 - big offset >*** t4109-apply-multifrag.sh *** >ok 2 - patch2 fails (retab) >ok 2 - apply add-a-patch with context >ok 21 - submodule contains untracked and modifed content (all ignored) >ok 2 - stat binary diff -- should not fail. >ok 3 - patch2 applies with --ignore-whitespace >ok 6 - fuzz with no offset >ok 22 - submodule contains modifed content >ok 4 - patch2 reverse applies with --ignore-space-change >ok 24 - stash file to symlink (full stage) >ok 3 - apply add-z-patch with context >ok 3 - stat binary diff (copy) -- should not fail. >ok 5 - patch2 applies (apply.ignorewhitespace = change) >ok 7 - fuzz with minus offset >ok 6 - patch3 fails (missing string at EOL) >ok 7 - patch4 fails (missing EOL at EOF) >ok 4 - apply insert-a-patch with context >ok 4 - check binary diff -- should fail. >ok 8 - patch5 applies (leading whitespace) >ok 23 - submodule is modified >ok 9 - patches do not mangle whitespace >ok 8 - fuzz with plus offset >ok 10 - re-create file (with --ignore-whitespace) >ok 5 - apply mod-a-patch with context >ok 5 - check binary diff (copy) -- should fail. >ok 24 - modified submodule contains untracked content >ok 11 - patch5 fails (--no-ignore-whitespace) ># passed all 11 test(s) >1..11 >ok 9 - fuzz with big offset ># passed all 9 test(s) >1..9 >ok 1 - git apply (1) >*** t4110-apply-scan.sh *** >ok 25 - modified submodule contains untracked content (untracked ignored) >ok 6 - apply mod-z-patch with context >ok 6 - check incomplete binary diff with replacement -- should fail. >*** t4111-apply-subdir.sh *** >ok 26 - modified submodule contains untracked content (dirty ignored) >ok 2 - git apply (2) >ok 27 - modified submodule contains untracked content (all ignored) >ok 3 - git apply (3) >ok 7 - apply del-a-patch with context >ok 7 - check incomplete binary diff with replacement (copy) -- should fail. ># passed all 3 test(s) >1..3 >ok 28 - modified submodule contains untracked and modifed content >*** t4112-apply-renames.sh *** >ok 8 - apply del-z-patch with context >ok 8 - check binary diff with replacement. >ok 29 - modified submodule contains untracked and modifed content (untracked ignored) >ok 30 - modified submodule contains untracked and modifed content (dirty ignored) >ok 9 - apply add-a-patch without context >ok 31 - modified submodule contains untracked and modifed content (all ignored) >ok 1 - git apply scan >ok 9 - check binary diff with replacement (copy). ># passed all 1 test(s) >1..1 >ok 10 - apply add-z-patch without context >ok 1 - setup >ok 2 - setup: subdir >ok 32 - modified submodule contains modifed content >*** t4113-apply-ending.sh *** >ok 10 - apply binary diff -- should fail. >ok 11 - apply insert-a-patch without context >ok 33 - deleted submodule >ok 50 - rebase-i history with funny messages ># still have 1 known breakage(s) ># failed 29 among remaining 49 test(s) >1..50 >make[2]: *** [t3404-rebase-interactive.sh] Error 1 >make[2]: *** Waiting for unfinished jobs.... >ok 11 - apply binary diff -- should fail. >ok 1 - check rename/copy patch >ok 12 - apply mod-a-patch without context >ok 2 - apply rename/copy patch ># passed all 2 test(s) >1..2 >ok 13 - apply mod-z-patch without context >ok 3 - apply from subdir of toplevel >ok 1 - setup >ok 2 - apply at the end >ok 12 - apply binary diff (copy) -- should fail. >ok 25 - stash symlink to file >ok 14 - apply del-a-patch without context >ok 3 - apply at the beginning ># passed all 3 test(s) >1..3 >ok 13 - apply binary diff (copy) -- should fail. >ok 15 - apply del-z-patch without context >ok 34 - multiple submodules >ok 35 - path filter >ok 16 - apply non-git add-a-patch without context >ok 14 - apply binary diff with full-index >ok 4 - apply --cached from subdir of toplevel >ok 36 - given commit >ok 17 - apply non-git add-z-patch without context >ok 37 - given commit --submodule >ok 15 - apply binary diff with full-index (copy) >ok 38 - given commit --submodule=short >ok 18 - apply non-git insert-a-patch without context >ok 39 - setup .git file for sm2 >ok 16 - apply full-index binary diff in new repo >ok 40 - diff --submodule with .git file ># passed all 40 test(s) >1..40 >ok 19 - apply non-git mod-a-patch without context >ok 17 - apply binary diff without replacement. >ok 20 - apply non-git mod-z-patch without context >ok 21 - apply non-git del-a-patch without context >ok 18 - apply binary diff without replacement (copy). >ok 22 - apply non-git del-z-patch without context >ok 19 - apply binary diff. >ok 23 - two lines >ok 5 - apply --index from subdir of toplevel >ok 24 - apply patch with 3 context lines matching at end ># passed all 24 test(s) >1..24 >ok 20 - apply binary diff (copy). ># passed all 20 test(s) >1..20 >ok 6 - apply from .git dir >ok 26 - stash symlink to file (stage rm) >ok 7 - apply from subdir of .git dir >ok 8 - apply --cached from .git dir >ok 9 - apply --cached from subdir of .git dir ># passed all 9 test(s) >1..9 >ok 27 - stash symlink to file (full stage) >not ok 28 - stash directory to file # TODO known breakage >not ok 29 - stash file to directory # TODO known breakage >ok 30 - stash branch - no stashes on stack, stash-like argument >ok 31 - stash branch - stashes on stack, stash-like argument >ok 32 - stash show - stashes on stack, stash-like argument >ok 33 - stash show -p - stashes on stack, stash-like argument >ok 34 - stash show - no stashes on stack, stash-like argument >ok 35 - stash show -p - no stashes on stack, stash-like argument >ok 36 - stash drop - fail early if specified stash is not a stash reference >ok 37 - stash pop - fail early if specified stash is not a stash reference >ok 38 - ref with non-existant reflog >ok 39 - invalid ref of the form stash@{n}, n >= N >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 >make[2]: Leaving directory `/var/tmp/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 `/var/tmp/portage/dev-vcs/git-1.7.3.4-r1/work/git-1.7.3.4/t' >make: *** [test] Error 2 >emake failed > [31;01m*[0m ERROR: dev-vcs/git-1.7.3.4-r1 failed: > [31;01m*[0m tests failed > [31;01m*[0m > [31;01m*[0m Call stack: > [31;01m*[0m ebuild.sh, line 56: Called src_test > [31;01m*[0m environment, line 3108: Called die > [31;01m*[0m The specific snippet of code: > [31;01m*[0m git_emake test || die "tests failed" > [31;01m*[0m > [31;01m*[0m If you need support, post the output of 'emerge --info =dev-vcs/git-1.7.3.4-r1', > [31;01m*[0m the complete build log and the output of 'emerge -pqv =dev-vcs/git-1.7.3.4-r1'. > [31;01m*[0m The complete build log is located at '/var/tmp/portage/dev-vcs/git-1.7.3.4-r1/temp/build.log'. > [31;01m*[0m The ebuild environment file is located at '/var/tmp/portage/dev-vcs/git-1.7.3.4-r1/temp/environment'. > [31;01m*[0m S: '/var/tmp/portage/dev-vcs/git-1.7.3.4-r1/work/git-1.7.3.4'
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Raw
Actions:
View
Attachments on
bug 349045
: 257532 |
257538
|
257697