git-commit-vandalism/t
David Aguilar bb0a484e98 mergetool: Skip autoresolved paths
When mergetool is run without path limiters it loops
over each entry in 'git ls-files -u'.  This includes
autoresolved paths.

Teach mergetool to only merge files listed in 'rerere status'
when rerere is enabled.

There are some subtle but harmless changes in behavior.
We now call cd_to_toplevel when no paths are given.
We do this because 'rerere status' paths are always relative
to the root.  This is beneficial for the non-rerere use as
well in that mergetool now runs against all unmerged files
regardless of the current directory.

This also slightly tweaks the output when run without paths
to be more readable.

The old output:

Merging the files: foo
bar
baz

The new output:

Merging:
foo
bar
baz

Signed-off-by: David Aguilar <davvid@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2010-08-17 13:58:13 -07:00
..
lib-httpd
t1509 Add test for using Git at root of file system 2010-02-16 08:55:56 -08:00
t3900
t4013 format-patch: Add a signature option (--signature) 2010-06-16 10:08:59 -07:00
t4020
t4100
t4101
t4109
t4110
t4252
t5100 mailinfo: do not strip leading spaces even for a header line 2010-02-19 21:55:33 -08:00
t5515
t7004
t7006 t7006-pager: if stdout is not a terminal, make a new one 2010-02-21 11:08:17 -08:00
t7500
t8005
t9110
t9111
t9115
t9121
t9126
t9135
t9136
t9150
t9151 t9151: Add two new svn:mergeinfo test cases 2010-02-26 01:30:23 -08:00
t9153
t9154
t9601/cvsroot
t9602
t9603/cvsroot
t9700 t/t9700/test.pl: don't access private object members, use public access methods 2010-06-29 09:32:56 -07:00
valgrind
.gitattributes
.gitignore tests: Ignore the Test::Harness .prove file 2010-07-25 23:14:48 -07:00
aggregate-results.sh t/aggregate-results: accomodate systems with small max argument list length 2010-06-02 09:36:49 -07:00
annotate-tests.sh
diff-lib.sh
gitweb-lib.sh tests: Use skip_all=* to skip tests 2010-07-08 17:53:12 -07:00
lib-cvs.sh tests: Use skip_all=* to skip tests 2010-07-08 17:53:12 -07:00
lib-git-svn.sh t/lib-git-svn.sh: use $PERL_PATH for perl, not perl from $PATH 2010-08-11 10:41:08 -07:00
lib-httpd.sh t/{t5541,lib-httpd}: replace problematic '!()' notation with test_must_fail 2010-07-20 11:37:45 -07:00
lib-pager.sh t/lib-pager.sh: remove unnecessary '^' from 'expr' regular expression 2010-06-21 11:11:11 -07:00
lib-patch-mode.sh tests: Use skip_all=* to skip tests 2010-07-08 17:53:12 -07:00
lib-read-tree-m-3way.sh
lib-rebase.sh
lib-t6000.sh Merge branch 'gv/portable' 2010-06-21 06:02:44 -07:00
Makefile tests: Ignore the Test::Harness .prove file 2010-07-25 23:14:48 -07:00
README t/README: correct an exception when breaking a && chain in tests 2010-07-21 11:52:26 -07:00
t556x_common
t0000-basic.sh Merge branch 'gv/portable' 2010-06-21 06:02:44 -07:00
t0001-init.sh handle "git --bare init <dir>" properly 2010-05-10 11:25:37 -07:00
t0002-gitfile.sh
t0003-attributes.sh attr: Expand macros immediately when encountered. 2010-04-10 18:36:00 -07:00
t0004-unwritable.sh
t0005-signals.sh t0005: work around strange $? in ksh when program terminated by a signal 2010-07-09 16:27:31 -07:00
t0006-date.sh t/t0006: specify timezone as EST5 not EST to comply with POSIX 2010-07-07 09:13:17 -07:00
t0010-racy-git.sh
t0020-crlf.sh autocrlf: Make it work also for un-normalized repositories 2010-05-11 23:02:49 -07:00
t0021-conversion.sh convert: Keep foreign $Id$ on checkout. 2010-04-10 21:45:01 -07:00
t0022-crlf-rename.sh
t0023-crlf-am.sh
t0024-crlf-archive.sh
t0025-crlf-auto.sh Rename the "crlf" attribute "text" 2010-05-19 20:42:34 -07:00
t0026-eol-config.sh Add "core.eol" config variable 2010-06-06 21:20:04 -07:00
t0030-stripspace.sh
t0040-parse-options.sh print the usage string on stdout instead of stderr 2010-05-31 18:06:41 -07:00
t0050-filesystem.sh t0050: mark non-working test as such 2010-03-13 23:22:50 -08:00
t0055-beyond-symlinks.sh
t0060-path-utils.sh
t0061-run-command.sh
t0070-fundamental.sh
t0100-previous.sh
t0101-at-syntax.sh t0101: use absolute date 2010-01-28 00:58:17 -08:00
t1000-read-tree-m-3way.sh
t1001-read-tree-m-2way.sh Merge remote branch 'ko/master' into jc/read-tree-cache-tree-fix 2010-07-08 18:55:50 -07:00
t1002-read-tree-m-u-2way.sh
t1003-read-tree-prefix.sh
t1004-read-tree-m-u-wf.sh
t1005-read-tree-reset.sh
t1006-cat-file.sh
t1007-hash-object.sh hash-object: support --stdin-paths with --no-filters 2010-03-05 02:57:54 -08:00
t1008-read-tree-overlay.sh
t1009-read-tree-new-index.sh
t1010-mktree.sh t1010-mktree: Adjust expected result to code and documentation 2010-04-17 10:30:00 -07:00
t1011-read-tree-sparse-checkout.sh
t1012-read-tree-df.sh
t1020-subdirectory.sh tests: Say "pass" rather than "ok" on empty lines for TAP 2010-06-25 10:08:24 -07:00
t1100-commit-tree-options.sh
t1200-tutorial.sh
t1300-repo-config.sh Sync with 1.7.1.2 2010-07-27 16:40:23 -07:00
t1301-shared-repo.sh
t1302-repo-version.sh
t1303-wacky-config.sh
t1304-default-acl.sh tests: Skip tests in a way that makes sense under TAP 2010-06-25 10:08:20 -07:00
t1400-update-ref.sh
t1401-symbolic-ref.sh
t1402-check-ref-format.sh Allow "check-ref-format --branch" from subdirectory 2010-08-06 10:01:45 -07:00
t1410-reflog.sh reflog: honor gc.reflogexpire=never 2010-02-28 10:28:26 -08:00
t1411-reflog-show.sh don't use default revision if a rev was specified 2010-03-13 21:23:43 -08:00
t1420-lost-found.sh
t1450-fsck.sh fsck: fix bogus commit header check 2010-05-28 15:08:27 -07:00
t1500-rev-parse.sh
t1501-worktree.sh get_cwd_relative(): do not misinterpret suffix as subdirectory 2010-05-28 15:02:50 -07:00
t1502-rev-parse-parseopt.sh Merge branch 'maint' 2010-07-07 11:18:26 -07:00
t1503-rev-parse-verify.sh
t1504-ceiling-dirs.sh
t1505-rev-parse-last.sh
t1506-rev-parse-diagnosis.sh
t1507-rev-parse-upstream.sh Fix log -g this@{upstream} 2010-01-26 13:49:50 -08:00
t1508-at-combinations.sh reject @{-1} not at beginning of object name 2010-01-28 12:12:50 -08:00
t1509-root-worktree.sh tests: Skip tests in a way that makes sense under TAP 2010-06-25 10:08:20 -07:00
t2000-checkout-cache-clash.sh
t2001-checkout-cache-clash.sh
t2002-checkout-cache-u.sh
t2003-checkout-cache-mkdir.sh
t2004-checkout-cache-temp.sh
t2005-checkout-index-symlinks.sh
t2007-checkout-symlink.sh tests: Skip tests in a way that makes sense under TAP 2010-06-25 10:08:20 -07:00
t2008-checkout-subdir.sh
t2009-checkout-statinfo.sh
t2010-checkout-ambiguous.sh
t2011-checkout-invalid-head.sh
t2012-checkout-last.sh
t2013-checkout-submodule.sh
t2014-switch.sh
t2015-checkout-unborn.sh
t2016-checkout-patch.sh add-interactive: fix bogus diff header line ordering 2010-02-22 19:23:49 -08:00
t2017-checkout-orphan.sh tests: correct "does reflog exist?" tests 2010-07-21 12:54:48 -07:00
t2030-unresolve-info.sh
t2050-git-dir-relative.sh
t2100-update-cache-badpath.sh
t2101-update-index-reupdate.sh
t2102-update-index-symlinks.sh tests: Say "pass" rather than "ok" on empty lines for TAP 2010-06-25 10:08:24 -07:00
t2103-update-index-ignore-missing.sh
t2104-update-index-skip-worktree.sh Introduce "skip-worktree" bit in index, teach Git to get/set this bit 2009-08-23 17:11:28 -07:00
t2105-update-index-gitfile.sh
t2106-update-index-assume-unchanged.sh do not overwrite files marked "assume unchanged" 2010-05-01 12:00:44 -07:00
t2200-add-update.sh test for add with non-existent pathspec 2010-02-16 22:53:40 -08:00
t2201-add-update-typechange.sh
t2202-add-addremove.sh
t2203-add-intent.sh
t2204-add-ignored.sh tests for "git add ignored-dir/file" without -f 2010-03-13 23:23:22 -08:00
t2300-cd-to-toplevel.sh
t3000-ls-files-others.sh t3000 (ls-files -o): modernize style 2010-07-11 23:14:17 -07:00
t3001-ls-files-others-exclude.sh
t3002-ls-files-dashpath.sh
t3003-ls-files-exclude.sh
t3010-ls-files-killed-modified.sh
t3020-ls-files-error-unmatch.sh Use test_expect_success for test setups 2010-03-20 09:15:17 -07:00
t3030-merge-recursive.sh merge-recursive: demonstrate an incorrect conflict with submodule 2010-06-11 09:01:07 -07:00
t3031-merge-criscross.sh
t3040-subprojects-basic.sh
t3050-subprojects-fetch.sh
t3060-ls-files-with-tree.sh
t3100-ls-tree-restrict.sh
t3101-ls-tree-dirname.sh tests: move convenience regexp to match object names to test-lib.sh 2010-01-03 21:17:16 -08:00
t3200-branch.sh tests: correct "does reflog exist?" tests 2010-07-21 12:54:48 -07:00
t3201-branch-contains.sh
t3202-show-branch-octopus.sh
t3203-branch-output.sh
t3210-pack-refs.sh pack-refs: remove newly empty directories 2010-07-07 09:11:37 -07:00
t3300-funny-names.sh tests: Skip tests in a way that makes sense under TAP 2010-06-25 10:08:20 -07:00
t3301-notes.sh t/: work around one-shot variable assignment with test_must_fail 2010-07-21 11:54:34 -07:00
t3302-notes-index-expensive.sh tests: Skip tests in a way that makes sense under TAP 2010-06-25 10:08:20 -07:00
t3303-notes-subtrees.sh Teach notes code to properly preserve non-notes in the notes tree 2010-02-13 19:36:13 -08:00
t3304-notes-mixed.sh builtin-notes: Deprecate the -m/-F options for "git notes edit" 2010-02-13 19:36:16 -08:00
t3305-notes-fanout.sh builtin-notes: Deprecate the -m/-F options for "git notes edit" 2010-02-13 19:36:16 -08:00
t3306-notes-prune.sh notes: dry-run and verbose options for prune 2010-05-19 23:57:18 -07:00
t3307-notes-man.sh Documentation/notes: describe content of notes blobs 2010-05-08 22:30:02 -07:00
t3400-rebase.sh Merge branch 'js/maint-am-rebase-invalid-author' 2010-06-27 12:07:44 -07:00
t3401-rebase-partial.sh
t3402-rebase-merge.sh
t3403-rebase-skip.sh
t3404-rebase-interactive.sh git-rebase--interactive.sh: use printf instead of echo to print commit message 2010-07-25 23:14:18 -07:00
t3405-rebase-malformed.sh
t3406-rebase-message.sh
t3407-rebase-abort.sh
t3408-rebase-multi-line.sh fix portability issues with $ in double quotes 2010-01-26 15:16:54 -08:00
t3409-rebase-preserve-merges.sh
t3410-rebase-preserve-dropped-merges.sh
t3411-rebase-preserve-around-merges.sh
t3412-rebase-root.sh
t3413-rebase-hook.sh
t3414-rebase-preserve-onto.sh
t3415-rebase-autosquash.sh
t3416-rebase-onto-threedots.sh
t3417-rebase-whitespace-fix.sh t3417: Add test cases for "rebase --whitespace=fix" 2010-03-06 23:53:00 -08:00
t3418-rebase-continue.sh Fix git rebase --continue to work with touched files 2010-07-28 13:57:36 -07:00
t3500-cherry.sh war on "sleep" in tests 2010-04-06 21:55:27 -07:00
t3501-revert-cherry-pick.sh Merge branch 'cc/cherry-pick-stdin' 2010-06-30 11:55:39 -07:00
t3502-cherry-pick-merge.sh
t3503-cherry-pick-root.sh
t3504-cherry-pick-rerere.sh Make cherry-pick use rerere for conflict resolution. 2008-08-11 16:42:49 -07:00
t3505-cherry-pick-empty.sh
t3506-cherry-pick-ff.sh cherry-pick: add tests for new --ff option 2010-03-06 23:58:47 -08:00
t3507-cherry-pick-conflict.sh t3507: Make test executable 2010-04-11 12:13:13 -07:00
t3508-cherry-pick-many-commits.sh Merge commit 'v1.7.2-rc0~6^2' into cc/cherry-pick-stdin 2010-06-29 10:22:55 -07:00
t3600-rm.sh tests: Skip tests in a way that makes sense under TAP 2010-06-25 10:08:20 -07:00
t3700-add.sh t3700-add: fix dependence on stdout and stderr buffering 2010-07-25 23:14:18 -07:00
t3701-add-interactive.sh tests: Skip tests in a way that makes sense under TAP 2010-06-25 10:08:20 -07:00
t3702-add-edit.sh
t3800-mktag.sh Use test_expect_success for test setups 2010-03-20 09:15:17 -07:00
t3900-i18n-commit.sh
t3901-8859-1.txt
t3901-i18n-patch.sh
t3901-utf8.txt
t3902-quoted.sh tests: Skip tests in a way that makes sense under TAP 2010-06-25 10:08:20 -07:00
t3903-stash.sh Merge branch 'gv/portable' 2010-06-21 06:02:44 -07:00
t3904-stash-patch.sh
t4000-diff-format.sh
t4001-diff-rename.sh
t4002-diff-basic.sh tests: use "test_cmp", not "diff", when verifying the result 2010-05-31 16:59:27 -07:00
t4003-diff-rename-1.sh
t4004-diff-rename-symlink.sh tests: Skip tests in a way that makes sense under TAP 2010-06-25 10:08:20 -07:00
t4005-diff-rename-2.sh
t4006-diff-mode.sh
t4007-rename-3.sh
t4008-diff-break-rewrite.sh
t4009-diff-rename-4.sh
t4010-diff-pathspec.sh
t4011-diff-symlink.sh tests: Skip tests in a way that makes sense under TAP 2010-06-25 10:08:20 -07:00
t4012-diff-binary.sh
t4013-diff-various.sh show --first-parent/-m: do not default to --cc 2010-03-09 01:11:19 -08:00
t4014-format-patch.sh format-patch: Add a signature option (--signature) 2010-06-16 10:08:59 -07:00
t4015-diff-whitespace.sh Merge branch 'cc/maint-diff-CC-binary' 2010-06-18 11:16:57 -07:00
t4016-diff-quote.sh tests: Skip tests in a way that makes sense under TAP 2010-06-25 10:08:20 -07:00
t4017-diff-retval.sh Merge branch 'jc/conflict-marker-size' into maint 2010-04-09 22:38:34 -07:00
t4018-diff-funcname.sh
t4019-diff-wserror.sh
t4020-diff-external.sh
t4021-format-patch-numbered.sh
t4022-diff-rewrite.sh
t4023-diff-rename-typechange.sh tests: Skip tests in a way that makes sense under TAP 2010-06-25 10:08:20 -07:00
t4024-diff-optimize-common.sh
t4025-hunk-header.sh
t4026-color.sh Merge branch 'jc/color-attrs' into maint 2010-03-24 16:24:13 -07:00
t4027-diff-submodule.sh t4027,4041: Use test -s to test for an empty file 2010-06-25 10:54:04 -07:00
t4028-format-patch-mime-headers.sh
t4029-diff-trailing-space.sh
t4030-diff-textconv.sh
t4031-diff-rewrite-binary.sh
t4032-diff-inter-hunk-context.sh
t4033-diff-patience.sh
t4034-diff-words.sh diff: add --word-diff option that generalizes --color-words 2010-04-14 10:56:53 -07:00
t4035-diff-quiet.sh
t4036-format-patch-signer-mime.sh
t4037-diff-r-t-dirs.sh
t4038-diff-combined.sh combined diff: correctly handle truncated file 2010-04-17 10:23:59 -07:00
t4039-diff-assume-unchanged.sh
t4040-whitespace-status.sh
t4041-diff-submodule-option.sh t4027,4041: Use test -s to test for an empty file 2010-06-25 10:54:04 -07:00
t4042-diff-textconv-caching.sh diff: cache textconv output 2010-04-02 00:05:31 -07:00
t4043-diff-rename-binary.sh diff: fix "git show -C -C" output when renaming a binary file 2010-06-06 15:14:27 -07:00
t4044-diff-index-unique-abbrev.sh diff.c: Ensure "index $from..$to" line contains unambiguous SHA1s 2010-05-31 17:44:01 -07:00
t4045-diff-relative.sh diff: strip extra "/" when stripping prefix 2010-08-11 09:46:47 -07:00
t4100-apply-stat.sh
t4101-apply-nonl.sh
t4102-apply-rename.sh
t4103-apply-binary.sh Use test_expect_success for test setups 2010-03-20 09:15:17 -07:00
t4104-apply-boundary.sh apply: Remove the quick rejection test 2010-03-06 23:53:00 -08:00
t4105-apply-fuzz.sh
t4106-apply-stdin.sh
t4107-apply-ignore-whitespace.sh
t4109-apply-multifrag.sh
t4110-apply-scan.sh
t4112-apply-renames.sh
t4113-apply-ending.sh
t4114-apply-typechange.sh tests: Skip tests in a way that makes sense under TAP 2010-06-25 10:08:20 -07:00
t4115-apply-symlink.sh tests: Skip tests in a way that makes sense under TAP 2010-06-25 10:08:20 -07:00
t4116-apply-reverse.sh
t4117-apply-reject.sh
t4118-apply-empty-context.sh
t4119-apply-config.sh
t4120-apply-popt.sh
t4121-apply-diffs.sh
t4122-apply-symlink-inside.sh tests: Skip tests in a way that makes sense under TAP 2010-06-25 10:08:20 -07:00
t4123-apply-shrink.sh
t4124-apply-ws-rule.sh Merge branch 'gv/portable' 2010-06-21 06:02:44 -07:00
t4125-apply-ws-fuzz.sh fix portability issues with $ in double quotes 2010-01-26 15:16:54 -08:00
t4126-apply-empty.sh
t4127-apply-same-fn.sh tests: use "test_cmp", not "diff", when verifying the result 2010-05-31 16:59:27 -07:00
t4128-apply-root.sh
t4129-apply-samemode.sh
t4130-apply-criss-cross-rename.sh
t4131-apply-fake-ancestor.sh
t4132-apply-removal.sh
t4133-apply-filenames.sh
t4134-apply-submodule.sh Introduce remove_or_warn function 2010-03-28 09:53:04 -07:00
t4150-am.sh fix portability issues with $ in double quotes 2010-01-26 15:16:54 -08:00
t4151-am-abort.sh MERGE_RR is in .git, not .git/rr-cache 2010-07-14 13:04:25 -07:00
t4200-rerere.sh Use test_expect_success for test setups 2010-03-20 09:15:17 -07:00
t4201-shortlog.sh pretty: Respect --abbrev option 2010-05-04 15:38:58 -07:00
t4202-log.sh log.decorate: only ignore it under "log --pretty=raw" 2010-04-08 23:13:48 -07:00
t4203-mailmap.sh
t4204-patch-id.sh patch-id: Add support for mbox format 2010-04-19 13:01:49 -07:00
t4205-log-pretty-formats.sh pretty: add aliases for pretty formats 2010-05-03 09:40:32 -07:00
t4206-log-follow-harder-copies.sh tests: rename duplicate t4205 2010-05-10 11:52:03 -07:00
t4207-log-decoration-colors.sh Add test for correct coloring of git log --decoration 2010-06-30 11:14:44 -07:00
t4252-am-options.sh
t4253-am-keep-cr-dos.sh git-am: Add tests for --keep-cr, --no-keep-cr and am.keepcr 2010-02-28 11:10:39 -08:00
t4300-merge-tree.sh merge-tree: fix where two branches share no changes 2010-07-14 12:56:49 -07:00
t5000-tar-tree.sh archive: simplify archive format guessing 2010-02-07 15:40:27 -08:00
t5001-archive-attr.sh
t5100-mailinfo.sh
t5150-request-pull.sh t/t5150: remove space from sed script 2010-06-02 09:30:35 -07:00
t5300-pack-object.sh tests: use "test_cmp", not "diff", when verifying the result 2010-05-31 16:59:27 -07:00
t5301-sliding-window.sh
t5302-pack-index.sh tests: Skip tests in a way that makes sense under TAP 2010-06-25 10:08:20 -07:00
t5303-pack-corruption-resilience.sh
t5304-prune.sh prune: honor --expire=never 2010-02-28 10:28:05 -08:00
t5305-include-tag.sh
t5306-pack-nobase.sh
t5307-pack-missing-commit.sh
t5400-send-pack.sh
t5401-update-hooks.sh receive-pack: Send internal errors over side-band #2 2010-02-10 09:51:07 -08:00
t5402-post-merge-hook.sh
t5403-post-checkout-hook.sh
t5404-tracking-branches.sh
t5405-send-pack-rewind.sh
t5406-remote-rejects.sh
t5407-post-rewrite-hook.sh rebase -i: make post-rewrite work for 'edit' 2010-03-28 21:34:40 -07:00
t5500-fetch-pack.sh
t5502-quickfetch.sh quickfetch(): Prevent overflow of the rev-list command line 2009-07-10 23:53:17 -07:00
t5503-tagfollow.sh tests: Skip tests in a way that makes sense under TAP 2010-06-25 10:08:20 -07:00
t5505-remote.sh Merge branch 'jn/remote-set-branches' 2010-06-18 11:16:55 -07:00
t5506-remote-groups.sh
t5510-fetch.sh tests: use "test_cmp", not "diff", when verifying the result 2010-05-31 16:59:27 -07:00
t5511-refspec.sh
t5512-ls-remote.sh ls-remote: print URL when no repo is specified 2010-05-11 22:55:44 -07:00
t5513-fetch-track.sh
t5514-fetch-multiple.sh
t5515-fetch-merge-logic.sh
t5516-fetch-push.sh Merge branch 'tr/receive-pack-aliased-update-fix' into maint 2010-07-07 10:25:15 -07:00
t5517-push-mirror.sh
t5518-fetch-exit-status.sh
t5519-push-alternates.sh
t5520-pull.sh tests: use "test_cmp", not "diff", when verifying the result 2010-05-31 16:59:27 -07:00
t5521-pull-options.sh fetch --all/--multiple: keep all the fetched branch information 2010-02-24 11:16:36 -08:00
t5522-pull-symlink.sh tests: Skip tests in a way that makes sense under TAP 2010-06-25 10:08:20 -07:00
t5523-push-upstream.sh
t5524-pull-msg.sh
t5530-upload-pack-error.sh upload-pack: Improve error message when bad ref requested 2010-08-02 15:31:59 -07:00
t5531-deep-submodule-push.sh
t5540-http-push.sh tests: Skip tests in a way that makes sense under TAP 2010-06-25 10:08:20 -07:00
t5541-http-push.sh t/{t5541,lib-httpd}: replace problematic '!()' notation with test_must_fail 2010-07-20 11:37:45 -07:00
t5550-http-fetch.sh tests: Skip tests in a way that makes sense under TAP 2010-06-25 10:08:20 -07:00
t5551-http-fetch.sh tests: Skip tests in a way that makes sense under TAP 2010-06-25 10:08:20 -07:00
t5560-http-backend-noserver.sh
t5561-http-backend.sh tests: Skip tests in a way that makes sense under TAP 2010-06-25 10:08:20 -07:00
t5600-clone-fail-cleanup.sh
t5601-clone.sh decode file:// and ssh:// URLs 2010-05-24 16:48:34 -07:00
t5602-clone-remote-exec.sh
t5700-clone-reference.sh tests: use "test_cmp", not "diff", when verifying the result 2010-05-31 16:59:27 -07:00
t5701-clone-local.sh
t5702-clone-options.sh clone: use --progress to force progress reporting 2009-12-28 18:49:19 -08:00
t5704-bundle.sh t5704 (bundle): add tests for bundle --stdin 2010-04-19 22:14:39 -07:00
t5705-clone-2gb.sh tests: Skip tests in a way that makes sense under TAP 2010-06-25 10:08:20 -07:00
t5706-clone-branch.sh
t5710-info-alternate.sh
t5800-remote-helpers.sh tests: Use skip_all=* to skip tests 2010-07-08 17:53:12 -07:00
t6001-rev-list-graft.sh tests: use "test_cmp", not "diff", when verifying the result 2010-05-31 16:59:27 -07:00
t6002-rev-list-bisect.sh Move t6000lib.sh to lib-* 2010-05-07 21:36:27 -07:00
t6003-rev-list-topo-order.sh Move t6000lib.sh to lib-* 2010-05-07 21:36:27 -07:00
t6004-rev-list-path-optim.sh
t6005-rev-list-count.sh
t6006-rev-list-format.sh Merge branch 'jn/shortlog' into maint 2010-06-16 16:22:51 -07:00
t6007-rev-list-cherry-pick-file.sh rev-list: introduce --count option 2010-06-12 09:39:06 -07:00
t6008-rev-list-submodule.sh
t6009-rev-list-parent.sh
t6010-merge-base.sh git-merge-base/git-show-branch --merge-base: Documentation and test 2009-08-05 10:29:37 -07:00
t6011-rev-list-with-bad-commit.sh
t6012-rev-list-simplify.sh
t6013-rev-list-reverse-parents.sh
t6014-rev-list-all.sh
t6015-rev-list-show-all-parents.sh
t6016-rev-list-graph-simplify-history.sh
t6017-rev-list-stdin.sh
t6018-rev-list-glob.sh t6018: make sure all tested symbolic names are different revs 2010-06-27 11:32:43 -07:00
t6019-rev-list-ancestry-path.sh revision: Turn off history simplification in --ancestry-path mode 2010-06-06 10:16:37 -07:00
t6020-merge-df.sh
t6021-merge-criss-cross.sh
t6022-merge-rename.sh tests: use "test_cmp", not "diff", when verifying the result 2010-05-31 16:59:27 -07:00
t6023-merge-file.sh merge-file --diff3: add a label for ancestor 2010-03-20 20:36:11 -07:00
t6024-recursive-merge.sh
t6025-merge-symlinks.sh
t6026-merge-attr.sh
t6027-merge-binary.sh
t6028-merge-up-to-date.sh
t6029-merge-subtree.sh
t6030-bisect-porcelain.sh Merge branch 'cc/maint-bisect-paths' into maint 2010-03-04 22:25:23 -08:00
t6031-merge-recursive.sh
t6032-merge-large-rename.sh
t6033-merge-crlf.sh
t6034-merge-rename-nocruft.sh
t6035-merge-dir-to-symlink.sh tests: Skip tests in a way that makes sense under TAP 2010-06-25 10:08:20 -07:00
t6036-recursive-corner-cases.sh
t6037-merge-ours-theirs.sh
t6040-tracking-info.sh
t6050-replace.sh index-pack: Don't follow replace refs. 2010-08-12 13:26:05 -07:00
t6101-rev-parse-parents.sh Move t6000lib.sh to lib-* 2010-05-07 21:36:27 -07:00
t6120-describe.sh describe: Break annotated tag ties by tagger date 2010-04-13 13:04:50 -07:00
t6200-fmt-merge-msg.sh t6200: test fmt-merge-msg more 2010-03-24 19:40:27 -07:00
t6300-for-each-ref.sh for-each-ref: Field with abbreviated objectname 2010-05-18 21:49:04 -07:00
t7001-mv.sh
t7003-filter-branch.sh t/t7003: replace \t with literal tab in sed expression 2010-08-12 15:35:04 -07:00
t7004-tag.sh tests: Skip tests in a way that makes sense under TAP 2010-06-25 10:08:20 -07:00
t7005-editor.sh tests: Use skip_all=* to skip tests 2010-07-08 17:53:12 -07:00
t7006-pager.sh Merge branch 'jn/paginate-fix' 2010-07-15 12:09:14 -07:00
t7007-show.sh
t7008-grep-binary.sh grep: support NUL chars in search strings for -F 2010-05-24 11:22:07 -07:00
t7010-setup.sh ls-files: allow relative pathspec 2010-06-05 09:14:31 -07:00
t7011-skip-worktree-reading.sh
t7012-skip-worktree-writing.sh t7012: Mark missing tests as TODO 2010-04-19 18:05:00 -07:00
t7060-wtstatus.sh
t7101-reset.sh
t7102-reset.sh
t7103-reset-bare.sh reset: disallow "reset --keep" outside a work tree 2010-03-06 20:06:50 -08:00
t7104-reset.sh
t7105-reset-patch.sh
t7110-reset-merge.sh reset: disallow using --keep when there are unmerged entries 2010-03-06 20:06:50 -08:00
t7111-reset-table.sh reset: disallow using --keep when there are unmerged entries 2010-03-06 20:06:50 -08:00
t7201-co.sh checkout -m --conflict=diff3: add a label for ancestor 2010-03-20 20:36:11 -07:00
t7300-clean.sh
t7400-submodule-basic.sh git submodule add: Require the new --force option to add ignored paths 2010-07-19 11:10:43 -07:00
t7401-submodule-summary.sh submodule summary: Don't barf when invoked in an empty repo 2010-02-17 11:14:04 -08:00
t7402-submodule-rebase.sh
t7403-submodule-sync.sh
t7405-submodule-merge.sh add missing && to submodule-merge testcase 2010-07-06 21:28:55 -07:00
t7406-submodule-update.sh t7406: Fix submodule init config tests 2010-03-06 20:00:02 -08:00
t7407-submodule-foreach.sh git-submodule foreach: Add $toplevel variable 2010-05-25 09:04:24 -07:00
t7408-submodule-reference.sh
t7500-commit.sh Add option to git-commit to allow empty log messages 2010-04-07 15:22:57 -07:00
t7501-commit.sh commit --amend: copy notes to the new commit 2010-03-12 21:55:40 -08:00
t7502-commit.sh Merge branch 'tc/commit-abbrev-fix' into maint 2010-06-22 09:31:47 -07:00
t7503-pre-commit-hook.sh
t7504-commit-msg-hook.sh
t7505-prepare-commit-msg-hook.sh
t7506-status-submodule.sh Teach diff --submodule and status to handle .git files in submodules 2010-04-10 11:51:56 -07:00
t7507-commit-verbose.sh
t7508-status.sh Merge branch 'jl/status-ignore-submodules' 2010-06-30 11:55:39 -07:00
t7509-commit.sh commit --amend: cope with missing display name 2010-05-04 15:28:08 -07:00
t7600-merge.sh war on "sleep" in tests 2010-04-06 21:55:27 -07:00
t7601-merge-pull-config.sh
t7602-merge-octopus-many.sh
t7603-merge-reduce-heads.sh
t7604-merge-custom-message.sh merge: --log appends shortlog to message if specified 2010-05-10 12:02:20 -07:00
t7605-merge-resolve.sh
t7606-merge-custom.sh
t7607-merge-overwrite.sh
t7608-merge-messages.sh
t7610-mergetool.sh mergetool: Skip autoresolved paths 2010-08-17 13:58:13 -07:00
t7700-repack.sh more war on "sleep" in tests 2010-04-17 18:20:23 -07:00
t7701-repack-unpack-unreachable.sh more war on "sleep" in tests 2010-04-17 18:20:23 -07:00
t7800-difftool.sh tests: Skip tests in a way that makes sense under TAP 2010-06-25 10:08:20 -07:00
t7810-grep.sh Merge branch 'jn/grep-open' 2010-06-30 11:55:38 -07:00
t7811-grep-open.sh grep -O: Do not pass color sequences as filenames to pager 2010-07-07 11:23:17 -07:00
t8001-annotate.sh
t8002-blame.sh
t8003-blame.sh blame: fix indent of line numbers 2010-03-13 12:04:17 -08:00
t8004-blame.sh
t8005-blame-i18n.sh
t8006-blame-textconv.sh t/t8006: test textconv support for blame 2010-06-18 09:41:29 -07:00
t8007-cat-file-textconv.sh t/t8007: test textconv support for cat-file 2010-06-18 12:57:47 -07:00
t9001-send-email.sh Merge branch 'ab/tap' 2010-07-07 11:18:44 -07:00
t9100-git-svn-basic.sh git svn: fix dcommit to work with touched files 2010-08-02 21:21:56 +00:00
t9101-git-svn-props.sh
t9102-git-svn-deep-rmdir.sh
t9103-git-svn-tracked-directory-removed.sh
t9104-git-svn-follow-parent.sh
t9105-git-svn-commit-diff.sh
t9106-git-svn-commit-diff-clobber.sh
t9107-git-svn-migrate.sh
t9108-git-svn-glob.sh
t9109-git-svn-multi-glob.sh
t9110-git-svn-use-svm-props.sh
t9111-git-svn-use-svnsync-props.sh
t9112-git-svn-md5less-file.sh
t9113-git-svn-dcommit-new-file.sh
t9114-git-svn-dcommit-merge.sh
t9115-git-svn-dcommit-funky-renames.sh
t9116-git-svn-log.sh
t9117-git-svn-init-clone.sh
t9118-git-svn-funky-branch-names.sh t9118 (git-svn): prevent early failure from taking down later tests 2010-07-08 20:57:53 +00:00
t9119-git-svn-info.sh tests: Skip tests in a way that makes sense under TAP 2010-06-25 10:08:20 -07:00
t9120-git-svn-clone-with-percent-escapes.sh
t9121-git-svn-fetch-renamed-dir.sh
t9122-git-svn-author.sh
t9123-git-svn-rebuild-with-rewriteroot.sh
t9124-git-svn-dcommit-auto-props.sh
t9125-git-svn-multi-glob-branch-names.sh
t9126-git-svn-follow-deleted-readded-directory.sh
t9127-git-svn-partial-rebuild.sh
t9128-git-svn-cmd-branch.sh
t9129-git-svn-i18n-commitencoding.sh tests: Skip tests in a way that makes sense under TAP 2010-06-25 10:08:20 -07:00
t9130-git-svn-authors-file.sh
t9131-git-svn-empty-symlink.sh
t9132-git-svn-broken-symlink.sh
t9133-git-svn-nested-git-repo.sh
t9134-git-svn-ignore-paths.sh
t9135-git-svn-moved-branch-empty-file.sh
t9136-git-svn-recreated-branch-empty-file.sh
t9137-git-svn-dcommit-clobber-series.sh
t9138-git-svn-authors-prog.sh
t9139-git-svn-non-utf8-commitencoding.sh
t9140-git-svn-reset.sh
t9141-git-svn-multiple-branches.sh
t9142-git-svn-shallow-clone.sh
t9143-git-svn-gc.sh tests: Skip tests in a way that makes sense under TAP 2010-06-25 10:08:20 -07:00
t9144-git-svn-old-rev_map.sh
t9145-git-svn-master-branch.sh
t9146-git-svn-empty-dirs.sh
t9150-svk-mergetickets.sh t9150,t9151: Add rewrite-root option to init 2010-03-13 01:16:17 -08:00
t9151-svn-mergeinfo.sh t9150,t9151: Add rewrite-root option to init 2010-03-13 01:16:17 -08:00
t9152-svn-empty-dirs-after-gc.sh
t9153-git-svn-rewrite-uuid.sh
t9154-git-svn-fancy-glob.sh
t9155-git-svn-fetch-deleted-tag.sh git-svn: fix fetch with deleted tag 2010-08-15 23:43:37 +00:00
t9156-git-svn-fetch-deleted-tag-2.sh git-svn: fix fetch with deleted tag 2010-08-15 23:43:37 +00:00
t9200-git-cvsexportcommit.sh tests: Skip tests in a way that makes sense under TAP 2010-06-25 10:08:20 -07:00
t9300-fast-import.sh fast-import: export correctly marks larger than 2^20-1 2010-08-11 10:45:15 -07:00
t9301-fast-import-notes.sh
t9350-fast-export.sh t9350: fix careless use of "cd" 2010-03-28 17:42:11 -07:00
t9400-git-cvsserver-server.sh tests: Skip tests in a way that makes sense under TAP 2010-06-25 10:08:20 -07:00
t9401-git-cvsserver-crlf.sh tests: Skip tests in a way that makes sense under TAP 2010-06-25 10:08:20 -07:00
t9500-gitweb-standalone-no-errors.sh gitweb: Refactor syntax highlighting support 2010-05-03 09:38:54 -07:00
t9501-gitweb-standalone-http-status.sh Use test_expect_success for test setups 2010-03-20 09:15:17 -07:00
t9502-gitweb-standalone-parse-output.sh
t9600-cvsimport.sh tests: Skip tests in a way that makes sense under TAP 2010-06-25 10:08:20 -07:00
t9601-cvsimport-vendor-branch.sh
t9602-cvsimport-branches-tags.sh
t9603-cvsimport-patchsets.sh
t9700-perl-git.sh tests: Skip tests in a way that makes sense under TAP 2010-06-25 10:08:20 -07:00
test4012.png
test9200a.png
test9200b.png
test-lib.sh Merge branch 'ab/tap' into maint 2010-08-02 11:53:58 -07:00

Core GIT Tests
==============

This directory holds many test scripts for core GIT tools.  The
first part of this short document describes how to run the tests
and read their output.

When fixing the tools or adding enhancements, you are strongly
encouraged to add tests in this directory to cover what you are
trying to fix or enhance.  The later part of this short document
describes how your test scripts should be organized.


Running Tests
-------------

The easiest way to run tests is to say "make".  This runs all
the tests.

    *** t0000-basic.sh ***
    ok 1 - .git/objects should be empty after git init in an empty repo.
    ok 2 - .git/objects should have 3 subdirectories.
    ok 3 - success is reported like this
    ...
    ok 43 - very long name in the index handled sanely
    # fixed 1 known breakage(s)
    # still have 1 known breakage(s)
    # passed all remaining 42 test(s)
    1..43
    *** t0001-init.sh ***
    ok 1 - plain
    ok 2 - plain with GIT_WORK_TREE
    ok 3 - plain bare

Since the tests all output TAP (see http://testanything.org) they can
be run with any TAP harness. Here's an example of parallel testing
powered by a recent version of prove(1):

    $ prove --timer --jobs 15 ./t[0-9]*.sh
    [19:17:33] ./t0005-signals.sh ................................... ok       36 ms
    [19:17:33] ./t0022-crlf-rename.sh ............................... ok       69 ms
    [19:17:33] ./t0024-crlf-archive.sh .............................. ok      154 ms
    [19:17:33] ./t0004-unwritable.sh ................................ ok      289 ms
    [19:17:33] ./t0002-gitfile.sh ................................... ok      480 ms
    ===(     102;0  25/?  6/?  5/?  16/?  1/?  4/?  2/?  1/?  3/?  1... )===

prove and other harnesses come with a lot of useful options. The
--state option in particular is very useful:

    # Repeat until no more failures
    $ prove -j 15 --state=failed,save ./t[0-9]*.sh

You can also run each test individually from command line, like this:

    $ sh ./t3010-ls-files-killed-modified.sh
    ok 1 - git update-index --add to add various paths.
    ok 2 - git ls-files -k to show killed files.
    ok 3 - validate git ls-files -k output.
    ok 4 - git ls-files -m to show modified files.
    ok 5 - validate git ls-files -m output.
    # passed all 5 test(s)
    1..5

You can pass --verbose (or -v), --debug (or -d), and --immediate
(or -i) command line argument to the test, or by setting GIT_TEST_OPTS
appropriately before running "make".

--verbose::
	This makes the test more verbose.  Specifically, the
	command being run and their output if any are also
	output.

--debug::
	This may help the person who is developing a new test.
	It causes the command defined with test_debug to run.

--immediate::
	This causes the test to immediately exit upon the first
	failed test.

--long-tests::
	This causes additional long-running tests to be run (where
	available), for more exhaustive testing.

--valgrind::
	Execute all Git binaries with valgrind and exit with status
	126 on errors (just like regular tests, this will only stop
	the test script when running under -i).  Valgrind errors
	go to stderr, so you might want to pass the -v option, too.

	Since it makes no sense to run the tests with --valgrind and
	not see any output, this option implies --verbose.  For
	convenience, it also implies --tee.

--tee::
	In addition to printing the test output to the terminal,
	write it to files named 't/test-results/$TEST_NAME.out'.
	As the names depend on the tests' file names, it is safe to
	run the tests with this option in parallel.

--with-dashes::
	By default tests are run without dashed forms of
	commands (like git-commit) in the PATH (it only uses
	wrappers from ../bin-wrappers).  Use this option to include
	the build directory (..) in the PATH, which contains all
	the dashed forms of commands.  This option is currently
	implied by other options like --valgrind and
	GIT_TEST_INSTALLED.

--root=<directory>::
	Create "trash" directories used to store all temporary data during
	testing under <directory>, instead of the t/ directory.
	Using this option with a RAM-based filesystem (such as tmpfs)
	can massively speed up the test suite.

You can also set the GIT_TEST_INSTALLED environment variable to
the bindir of an existing git installation to test that installation.
You still need to have built this git sandbox, from which various
test-* support programs, templates, and perl libraries are used.
If your installed git is incomplete, it will silently test parts of
your built version instead.

When using GIT_TEST_INSTALLED, you can also set GIT_TEST_EXEC_PATH to
override the location of the dashed-form subcommands (what
GIT_EXEC_PATH would be used for during normal operation).
GIT_TEST_EXEC_PATH defaults to `$GIT_TEST_INSTALLED/git --exec-path`.


Skipping Tests
--------------

In some environments, certain tests have no way of succeeding
due to platform limitation, such as lack of 'unzip' program, or
filesystem that do not allow arbitrary sequence of non-NUL bytes
as pathnames.

You should be able to say something like

    $ GIT_SKIP_TESTS=t9200.8 sh ./t9200-git-cvsexport-commit.sh

and even:

    $ GIT_SKIP_TESTS='t[0-4]??? t91?? t9200.8' make

to omit such tests.  The value of the environment variable is a
SP separated list of patterns that tells which tests to skip,
and either can match the "t[0-9]{4}" part to skip the whole
test, or t[0-9]{4} followed by ".$number" to say which
particular test to skip.

Note that some tests in the existing test suite rely on previous
test item, so you cannot arbitrarily disable one and expect the
remainder of test to check what the test originally was intended
to check.


Naming Tests
------------

The test files are named as:

	tNNNN-commandname-details.sh

where N is a decimal digit.

First digit tells the family:

	0 - the absolute basics and global stuff
	1 - the basic commands concerning database
	2 - the basic commands concerning the working tree
	3 - the other basic commands (e.g. ls-files)
	4 - the diff commands
	5 - the pull and exporting commands
	6 - the revision tree commands (even e.g. merge-base)
	7 - the porcelainish commands concerning the working tree
	8 - the porcelainish commands concerning forensics
	9 - the git tools

Second digit tells the particular command we are testing.

Third digit (optionally) tells the particular switch or group of switches
we are testing.

If you create files under t/ directory (i.e. here) that is not
the top-level test script, never name the file to match the above
pattern.  The Makefile here considers all such files as the
top-level test script and tries to run all of them.  A care is
especially needed if you are creating a common test library
file, similar to test-lib.sh, because such a library file may
not be suitable for standalone execution.


Writing Tests
-------------

The test script is written as a shell script.  It should start
with the standard "#!/bin/sh" with copyright notices, and an
assignment to variable 'test_description', like this:

	#!/bin/sh
	#
	# Copyright (c) 2005 Junio C Hamano
	#

	test_description='xxx test (option --frotz)

	This test registers the following structure in the cache
	and tries to run git-ls-files with option --frotz.'


Source 'test-lib.sh'
--------------------

After assigning test_description, the test script should source
test-lib.sh like this:

	. ./test-lib.sh

This test harness library does the following things:

 - If the script is invoked with command line argument --help
   (or -h), it shows the test_description and exits.

 - Creates an empty test directory with an empty .git/objects database
   and chdir(2) into it.  This directory is 't/trash
   directory.$test_name_without_dotsh', with t/ subject to change by
   the --root option documented above.

 - Defines standard test helper functions for your scripts to
   use.  These functions are designed to make all scripts behave
   consistently when command line arguments --verbose (or -v),
   --debug (or -d), and --immediate (or -i) is given.

Do's, don'ts & things to keep in mind
-------------------------------------

Here are a few examples of things you probably should and shouldn't do
when writing tests.

Do:

 - Put all code inside test_expect_success and other assertions.

   Even code that isn't a test per se, but merely some setup code
   should be inside a test assertion.

 - Chain your test assertions

   Write test code like this:

	git merge foo &&
	git push bar &&
	test ...

   Instead of:

	git merge hla
	git push gh
	test ...

   That way all of the commands in your tests will succeed or fail. If
   you must ignore the return value of something (e.g., the return
   after unsetting a variable that was already unset is unportable) it's
   best to indicate so explicitly with a semicolon:

	unset HLAGH;
	git merge hla &&
	git push gh &&
	test ...

Don't:

 - exit() within a <script> part.

   The harness will catch this as a programming error of the test.
   Use test_done instead if you need to stop the tests early (see
   "Skipping tests" below).

 - Break the TAP output

   The raw output from your test may be interpreted by a TAP harness. TAP
   harnesses will ignore everything they don't know about, but don't step
   on their toes in these areas:

   - Don't print lines like "$x..$y" where $x and $y are integers.

   - Don't print lines that begin with "ok" or "not ok".

   TAP harnesses expect a line that begins with either "ok" and "not
   ok" to signal a test passed or failed (and our harness already
   produces such lines), so your script shouldn't emit such lines to
   their output.

   You can glean some further possible issues from the TAP grammar
   (see http://search.cpan.org/perldoc?TAP::Parser::Grammar#TAP_Grammar)
   but the best indication is to just run the tests with prove(1),
   it'll complain if anything is amiss.

Keep in mind:

 - Inside <script> part, the standard output and standard error
   streams are discarded, and the test harness only reports "ok" or
   "not ok" to the end user running the tests. Under --verbose, they
   are shown to help debugging the tests.


Skipping tests
--------------

If you need to skip all the remaining tests you should set skip_all
and immediately call test_done. The string you give to skip_all will
be used as an explanation for why the test was skipped. for instance:

	if ! test_have_prereq PERL
	then
	    skip_all='skipping perl interface tests, perl not available'
	    test_done
	fi

End with test_done
------------------

Your script will be a sequence of tests, using helper functions
from the test harness library.  At the end of the script, call
'test_done'.


Test harness library
--------------------

There are a handful helper functions defined in the test harness
library for your script to use.

 - test_expect_success [<prereq>] <message> <script>

   Usually takes two strings as parameter, and evaluates the
   <script>.  If it yields success, test is considered
   successful.  <message> should state what it is testing.

   Example:

	test_expect_success \
	    'git-write-tree should be able to write an empty tree.' \
	    'tree=$(git-write-tree)'

   If you supply three parameters the first will be taken to be a
   prerequisite, see the test_set_prereq and test_have_prereq
   documentation below:

	test_expect_success TTY 'git --paginate rev-list uses a pager' \
	    ' ... '

 - test_expect_failure [<prereq>] <message> <script>

   This is NOT the opposite of test_expect_success, but is used
   to mark a test that demonstrates a known breakage.  Unlike
   the usual test_expect_success tests, which say "ok" on
   success and "FAIL" on failure, this will say "FIXED" on
   success and "still broken" on failure.  Failures from these
   tests won't cause -i (immediate) to stop.

   Like test_expect_success this function can optionally use a three
   argument invocation with a prerequisite as the first argument.

 - test_expect_code [<prereq>] <code> <message> <script>

   Analogous to test_expect_success, but pass the test if it exits
   with a given exit <code>

 test_expect_code 1 'Merge with d/f conflicts' 'git merge "merge msg" B master'

 - test_debug <script>

   This takes a single argument, <script>, and evaluates it only
   when the test script is started with --debug command line
   argument.  This is primarily meant for use during the
   development of a new test script.

 - test_done

   Your test script must have test_done at the end.  Its purpose
   is to summarize successes and failures in the test script and
   exit with an appropriate error code.

 - test_tick

   Make commit and tag names consistent by setting the author and
   committer times to defined stated.  Subsequent calls will
   advance the times by a fixed amount.

 - test_commit <message> [<filename> [<contents>]]

   Creates a commit with the given message, committing the given
   file with the given contents (default for both is to reuse the
   message string), and adds a tag (again reusing the message
   string as name).  Calls test_tick to make the SHA-1s
   reproducible.

 - test_merge <message> <commit-or-tag>

   Merges the given rev using the given message.  Like test_commit,
   creates a tag and calls test_tick before committing.

 - test_set_prereq SOME_PREREQ

   Set a test prerequisite to be used later with test_have_prereq. The
   test-lib will set some prerequisites for you, e.g. PERL and PYTHON
   which are derived from ./GIT-BUILD-OPTIONS (grep test_set_prereq
   test-lib.sh for more). Others you can set yourself and use later
   with either test_have_prereq directly, or the three argument
   invocation of test_expect_success and test_expect_failure.

 - test_have_prereq SOME PREREQ

   Check if we have a prerequisite previously set with
   test_set_prereq. The most common use of this directly is to skip
   all the tests if we don't have some essential prerequisite:

	if ! test_have_prereq PERL
	then
	    skip_all='skipping perl interface tests, perl not available'
	    test_done
	fi

 - test_external [<prereq>] <message> <external> <script>

   Execute a <script> with an <external> interpreter (like perl). This
   was added for tests like t9700-perl-git.sh which do most of their
   work in an external test script.

	test_external \
	    'GitwebCache::*FileCache*' \
	    "$PERL_PATH" "$TEST_DIRECTORY"/t9503/test_cache_interface.pl

   If the test is outputting its own TAP you should set the
   test_external_has_tap variable somewhere before calling the first
   test_external* function. See t9700-perl-git.sh for an example.

	# The external test will outputs its own plan
	test_external_has_tap=1

 - test_external_without_stderr [<prereq>] <message> <external> <script>

   Like test_external but fail if there's any output on stderr,
   instead of checking the exit code.

	test_external_without_stderr \
	    'Perl API' \
	    "$PERL_PATH" "$TEST_DIRECTORY"/t9700/test.pl

 - test_must_fail <git-command>

   Run a git command and ensure it fails in a controlled way.  Use
   this instead of "! <git-command>".  When git-command dies due to a
   segfault, test_must_fail diagnoses it as an error; "! <git-command>"
   treats it as just another expected failure, which would let such a
   bug go unnoticed.

 - test_might_fail <git-command>

   Similar to test_must_fail, but tolerate success, too.  Use this
   instead of "<git-command> || :" to catch failures due to segv.

 - test_cmp <expected> <actual>

   Check whether the content of the <actual> file matches the
   <expected> file.  This behaves like "cmp" but produces more
   helpful output when the test is run with "-v" option.

 - test_when_finished <script>

   Prepend <script> to a list of commands to run to clean up
   at the end of the current test.  If some clean-up command
   fails, the test will not pass.

   Example:

	test_expect_success 'branch pointing to non-commit' '
		git rev-parse HEAD^{tree} >.git/refs/heads/invalid &&
		test_when_finished "git update-ref -d refs/heads/invalid" &&
		...
	'


Tips for Writing Tests
----------------------

As with any programming projects, existing programs are the best
source of the information.  However, do _not_ emulate
t0000-basic.sh when writing your tests.  The test is special in
that it tries to validate the very core of GIT.  For example, it
knows that there will be 256 subdirectories under .git/objects/,
and it knows that the object ID of an empty tree is a certain
40-byte string.  This is deliberately done so in t0000-basic.sh
because the things the very basic core test tries to achieve is
to serve as a basis for people who are changing the GIT internal
drastically.  For these people, after making certain changes,
not seeing failures from the basic test _is_ a failure.  And
such drastic changes to the core GIT that even changes these
otherwise supposedly stable object IDs should be accompanied by
an update to t0000-basic.sh.

However, other tests that simply rely on basic parts of the core
GIT working properly should not have that level of intimate
knowledge of the core GIT internals.  If all the test scripts
hardcoded the object IDs like t0000-basic.sh does, that defeats
the purpose of t0000-basic.sh, which is to isolate that level of
validation in one place.  Your test also ends up needing
updating when such a change to the internal happens, so do _not_
do it and leave the low level of validation to t0000-basic.sh.