1
0
Fork 0
mirror of https://github.com/git/git.git synced 2024-11-04 16:27:54 +01:00
git/t
Jeff King ce06461846 add tests for merge message headings
When calling "git merge $X", we automatically generate a
commit message containing something like "Merge branch
'$X'". This test script checks that those messages say what
they should, and exposes a failure when merging a refname
that is ambiguous between a tag and a branch.

Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2009-08-09 12:34:19 -07:00
..
lib-httpd
t3900 t3900: use ancient iconv names for backward compatibility 2009-05-18 20:53:11 -07:00
t4013 Prettify log decorations even more 2009-05-13 20:55:49 -07:00
t4020
t4100
t4101
t4109
t4110
t4252
t5100 Revert "mailinfo: Remove only one set of square brackets" 2009-07-15 15:10:06 -07:00
t5515
t7004
t7500
t8005 Merge branch 'maint' 2009-07-25 02:16:25 -07:00
t9110
t9111
t9115
t9121
t9126
t9135
t9136
t9700 Git.pm: Always set Repository to absolute path if autodetecting 2009-05-09 08:25:55 -07:00
valgrind
.gitattributes
.gitignore
aggregate-results.sh
annotate-tests.sh t/annotate-tests.sh: avoid passing a non-newline terminated file to sed 2009-05-06 11:50:44 -07:00
diff-lib.sh
lib-git-svn.sh git-svn testsuite: use standard configuration for Subversion tools 2009-05-21 00:31:07 -07:00
lib-httpd.sh test-lib: fix http exit codes 2009-06-01 22:45:01 -07:00
lib-read-tree-m-3way.sh
lib-rebase.sh
Makefile
README
t0000-basic.sh
t0001-init.sh init: Do not segfault on big GIT_TEMPLATE_DIR environment variable 2009-04-18 13:06:40 -07:00
t0002-gitfile.sh
t0003-attributes.sh
t0004-unwritable.sh
t0005-signals.sh
t0010-racy-git.sh
t0020-crlf.sh
t0021-conversion.sh
t0022-crlf-rename.sh
t0023-crlf-am.sh
t0024-crlf-archive.sh
t0030-stripspace.sh
t0040-parse-options.sh parse-opts: add OPT_FILENAME and transition builtins 2009-05-25 01:07:33 -07:00
t0050-filesystem.sh
t0055-beyond-symlinks.sh
t0060-path-utils.sh
t0070-fundamental.sh
t0100-previous.sh
t1000-read-tree-m-3way.sh
t1001-read-tree-m-2way.sh
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
t1008-read-tree-overlay.sh
t1010-mktree.sh mktree --missing: allow missing objects 2009-05-10 17:31:01 -07:00
t1020-subdirectory.sh
t1100-commit-tree-options.sh
t1200-tutorial.sh
t1300-repo-config.sh Merge branch 'maint-1.6.3' into maint 2009-08-05 12:37:24 -07:00
t1301-shared-repo.sh
t1302-repo-version.sh
t1303-wacky-config.sh
t1400-update-ref.sh
t1401-symbolic-ref.sh
t1410-reflog.sh
t1411-reflog-show.sh
t1420-lost-found.sh
t1450-fsck.sh
t1500-rev-parse.sh
t1501-worktree.sh
t1502-rev-parse-parseopt.sh parse-opt: make PARSE_OPT_STOP_AT_NON_OPTION available to git rev-parse 2009-06-13 17:08:37 -07:00
t1503-rev-parse-verify.sh
t1504-ceiling-dirs.sh
t1505-rev-parse-last.sh
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
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 Revert "checkout branch: prime cache-tree fully" 2009-05-12 09:57:21 -07:00
t2050-git-dir-relative.sh
t2100-update-cache-badpath.sh
t2101-update-index-reupdate.sh
t2102-update-index-symlinks.sh
t2103-update-index-ignore-missing.sh
t2200-add-update.sh
t2201-add-update-typechange.sh
t2202-add-addremove.sh
t2203-add-intent.sh
t2300-cd-to-toplevel.sh
t3000-ls-files-others.sh
t3001-ls-files-others-exclude.sh
t3002-ls-files-dashpath.sh
t3010-ls-files-killed-modified.sh
t3020-ls-files-error-unmatch.sh
t3030-merge-recursive.sh refuse to merge during a merge 2009-06-01 19:42:17 -07:00
t3031-merge-criscross.sh merge-recursive: never leave index unmerged while recursing 2009-05-09 21:05:52 -07:00
t3040-subprojects-basic.sh
t3050-subprojects-fetch.sh
t3060-ls-files-with-tree.sh
t3100-ls-tree-restrict.sh
t3101-ls-tree-dirname.sh
t3200-branch.sh
t3201-branch-contains.sh
t3202-show-branch-octopus.sh
t3203-branch-output.sh
t3210-pack-refs.sh
t3300-funny-names.sh
t3400-rebase.sh am, rebase: teach quiet option 2009-06-18 11:54:48 -07:00
t3401-rebase-partial.sh
t3402-rebase-merge.sh
t3403-rebase-skip.sh
t3404-rebase-interactive.sh Remove filename from conflict markers 2009-07-01 19:46:30 -07:00
t3405-rebase-malformed.sh
t3406-rebase-message.sh
t3407-rebase-abort.sh
t3408-rebase-multi-line.sh
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 Fix rebase -p --onto 2009-07-22 11:15:06 -07:00
t3500-cherry.sh
t3501-revert-cherry-pick.sh
t3502-cherry-pick-merge.sh
t3503-cherry-pick-root.sh
t3504-cherry-pick-rerere.sh
t3505-cherry-pick-empty.sh t3505: fix abuse of test_expect_code 2009-06-21 02:01:28 -07:00
t3600-rm.sh
t3700-add.sh Merge branch 'maint' 2009-06-22 00:44:34 -07:00
t3701-add-interactive.sh t3701: ensure correctly set up repository after skipped tests 2009-05-25 11:23:30 -07:00
t3702-add-edit.sh t3702: fix reliance on SHELL_PATH being '/bin/sh' 2009-04-27 18:23:55 -07:00
t3800-mktag.sh
t3900-i18n-commit.sh t3900: use ancient iconv names for backward compatibility 2009-05-18 20:53:11 -07:00
t3901-8859-1.txt
t3901-i18n-patch.sh t3901: Use ISO8859-1 instead of ISO-8859-1 for backward compatibility 2009-05-18 20:53:17 -07:00
t3901-utf8.txt
t3902-quoted.sh
t3903-stash.sh stash: teach quiet option 2009-06-18 11:54:57 -07:00
t4000-diff-format.sh
t4001-diff-rename.sh
t4002-diff-basic.sh
t4003-diff-rename-1.sh
t4004-diff-rename-symlink.sh
t4005-diff-rename-2.sh
t4006-diff-mode.sh
t4007-rename-3.sh Avoid "diff-index --cached" optimization under --find-copies-harder 2009-05-25 11:35:29 -07:00
t4008-diff-break-rewrite.sh
t4009-diff-rename-4.sh
t4010-diff-pathspec.sh Merge branch 'bs/maint-1.6.0-tree-walk-prefix' into maint-1.6.1 2009-05-03 15:01:19 -07:00
t4011-diff-symlink.sh
t4012-diff-binary.sh
t4013-diff-various.sh
t4014-format-patch.sh tests: Add tests for missing format-patch long options 2009-05-16 11:47:19 -07:00
t4015-diff-whitespace.sh
t4016-diff-quote.sh
t4017-diff-retval.sh
t4018-diff-funcname.sh t4018-diff-funcname: add cpp xfuncname pattern to syntax test 2009-05-05 22:49:02 -07:00
t4019-diff-wserror.sh
t4020-diff-external.sh diff: generate pretty filenames in prep_temp_blob() 2009-05-31 17:57:59 -07:00
t4021-format-patch-numbered.sh Merge branch 'jm/format-patch-no-auto-n-when-k-is-given' into maint 2009-05-25 19:03:52 -07:00
t4022-diff-rewrite.sh
t4023-diff-rename-typechange.sh
t4024-diff-optimize-common.sh
t4025-hunk-header.sh
t4026-color.sh
t4027-diff-submodule.sh Merge branch 'maint-1.6.0' into maint-1.6.1 2009-04-29 13:43:13 -07:00
t4028-format-patch-mime-headers.sh
t4029-diff-trailing-space.sh t4029: use sh instead of bash 2009-05-06 18:16:26 -07:00
t4030-diff-textconv.sh
t4031-diff-rewrite-binary.sh
t4032-diff-inter-hunk-context.sh
t4033-diff-patience.sh
t4034-diff-words.sh
t4035-diff-quiet.sh
t4036-format-patch-signer-mime.sh
t4037-diff-r-t-dirs.sh diff-tree -r -t: include added/removed directories in the output 2009-06-13 17:06:09 -07:00
t4038-diff-combined.sh diff --cc: a lost line at the beginning of the file is shown incorrectly 2009-07-22 15:38:22 -07:00
t4100-apply-stat.sh
t4101-apply-nonl.sh
t4102-apply-rename.sh
t4103-apply-binary.sh
t4104-apply-boundary.sh
t4105-apply-fuzz.sh
t4106-apply-stdin.sh
t4109-apply-multifrag.sh
t4110-apply-scan.sh
t4112-apply-renames.sh
t4113-apply-ending.sh
t4114-apply-typechange.sh
t4115-apply-symlink.sh
t4116-apply-reverse.sh
t4117-apply-reject.sh
t4118-apply-empty-context.sh t4118: avoid sed invocation on file without terminating newline 2009-05-06 11:49:14 -07:00
t4119-apply-config.sh
t4120-apply-popt.sh
t4121-apply-diffs.sh
t4122-apply-symlink-inside.sh
t4123-apply-shrink.sh
t4124-apply-ws-rule.sh Fix severe breakage in "git-apply --whitespace=fix" 2009-07-25 01:29:20 -07:00
t4125-apply-ws-fuzz.sh
t4126-apply-empty.sh
t4127-apply-same-fn.sh
t4128-apply-root.sh
t4129-apply-samemode.sh
t4130-apply-criss-cross-rename.sh tests: make test-apply-criss-cross-rename more robust 2009-04-20 13:47:02 -07:00
t4131-apply-fake-ancestor.sh apply, fmt-merge-msg: use relative filenames 2009-05-23 15:45:52 -07:00
t4150-am.sh am, rebase: teach quiet option 2009-06-18 11:54:48 -07:00
t4151-am-abort.sh
t4200-rerere.sh t4200: convert sed expression which operates on non-text file to perl 2009-05-06 16:43:29 -07:00
t4201-shortlog.sh
t4202-log.sh t4202-log.sh: Test git log --no-walk sort order 2009-07-18 16:57:49 -07:00
t4203-mailmap.sh
t4204-patch-id.sh
t4252-am-options.sh
t5000-tar-tree.sh Test git archive --remote 2009-06-27 13:15:39 -07:00
t5001-archive-attr.sh archive test: attributes 2009-04-17 21:05:49 -07:00
t5100-mailinfo.sh
t5300-pack-object.sh
t5301-sliding-window.sh
t5302-pack-index.sh
t5303-pack-corruption-resilience.sh
t5304-prune.sh
t5305-include-tag.sh
t5306-pack-nobase.sh
t5307-pack-missing-commit.sh
t5400-send-pack.sh
t5401-update-hooks.sh
t5402-post-merge-hook.sh
t5403-post-checkout-hook.sh
t5404-tracking-branches.sh
t5405-send-pack-rewind.sh
t5406-remote-rejects.sh
t5500-fetch-pack.sh t5500: Modernize test style 2009-05-27 00:06:12 -07:00
t5502-quickfetch.sh quickfetch(): Prevent overflow of the rev-list command line 2009-07-10 23:53:17 -07:00
t5503-tagfollow.sh
t5505-remote.sh builtin-remote: Show push urls as well 2009-06-13 10:31:33 -07:00
t5506-remote-groups.sh
t5510-fetch.sh Merge branch 'maint-1.6.1' into maint-1.6.2 2009-08-07 20:44:09 -07:00
t5511-refspec.sh
t5512-ls-remote.sh
t5513-fetch-track.sh
t5515-fetch-merge-logic.sh
t5516-fetch-push.sh t5516: Check pushurl config setting 2009-06-09 23:46:47 -07:00
t5517-push-mirror.sh
t5518-fetch-exit-status.sh
t5519-push-alternates.sh
t5520-pull.sh parse-remote: support default reflist in get_remote_merge_branch 2009-06-11 19:50:34 -07:00
t5521-pull-options.sh
t5522-pull-symlink.sh
t5530-upload-pack-error.sh
t5540-http-push.sh http-push: send out fetch requests on queue 2009-06-06 10:56:27 -07:00
t5550-http-fetch.sh t5550-http-fetch: test fetching of packed objects 2009-06-06 10:56:27 -07:00
t5600-clone-fail-cleanup.sh
t5601-clone.sh
t5602-clone-remote-exec.sh
t5700-clone-reference.sh
t5701-clone-local.sh t5701: do not get stuck in empty-push/ 2009-04-27 16:33:53 -07:00
t5702-clone-options.sh
t5704-bundle.sh
t5705-clone-2gb.sh
t5710-info-alternate.sh
t6000lib.sh
t6001-rev-list-graft.sh
t6002-rev-list-bisect.sh
t6003-rev-list-topo-order.sh
t6004-rev-list-path-optim.sh
t6005-rev-list-count.sh
t6006-rev-list-format.sh
t6007-rev-list-cherry-pick-file.sh
t6008-rev-list-submodule.sh
t6009-rev-list-parent.sh
t6010-merge-base.sh
t6011-rev-list-with-bad-commit.sh
t6012-rev-list-simplify.sh
t6013-rev-list-reverse-parents.sh
t6014-rev-list-all.sh
t6020-merge-df.sh
t6021-merge-criss-cross.sh
t6022-merge-rename.sh
t6023-merge-file.sh Merge branch 'cb/maint-1.6.0-xdl-merge-fix' into maint 2009-06-02 07:48:44 -07:00
t6024-recursive-merge.sh Remove filename from conflict markers 2009-07-01 19:46:30 -07:00
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 bisect: use a PRNG with a bias when skipping away from untestable commits 2009-06-13 10:47:34 -07:00
t6031-merge-recursive.sh
t6032-merge-large-rename.sh
t6033-merge-crlf.sh
t6034-merge-rename-nocruft.sh
t6040-tracking-info.sh Merge branch 'mg/track' 2009-05-23 01:44:00 -07:00
t6101-rev-parse-parents.sh
t6120-describe.sh
t6200-fmt-merge-msg.sh Merge branch 'sb/maint-1.6.2-opt-filename-fix' into maint 2009-06-02 07:47:03 -07:00
t6300-for-each-ref.sh
t7001-mv.sh
t7002-grep.sh grep -p: support user defined regular expressions 2009-07-01 19:16:50 -07:00
t7003-filter-branch.sh
t7004-tag.sh
t7005-editor.sh
t7007-show.sh
t7010-setup.sh
t7101-reset.sh
t7102-reset.sh
t7103-reset-bare.sh
t7104-reset.sh
t7201-co.sh test: checkout shouldn't say that HEAD has moved if it didn't 2009-05-16 19:49:25 -07:00
t7300-clean.sh
t7400-submodule-basic.sh Work around ash "alternate value" expansion bug 2009-04-18 21:37:46 -07:00
t7401-submodule-summary.sh
t7402-submodule-rebase.sh
t7403-submodule-sync.sh
t7405-submodule-merge.sh merge-recursive: do not die on a conflicting submodule 2009-04-29 16:50:21 -07:00
t7406-submodule-reference.sh Add --reference option to git submodule. 2009-05-09 08:27:52 -07:00
t7406-submodule-update.sh git-submodule: add support for --merge. 2009-06-03 00:09:16 -07:00
t7500-commit.sh commit: -F overrides -t 2009-05-23 15:45:52 -07:00
t7501-commit.sh
t7502-commit.sh
t7503-pre-commit-hook.sh
t7504-commit-msg-hook.sh
t7505-prepare-commit-msg-hook.sh
t7506-status-submodule.sh
t7507-commit-verbose.sh
t7508-status.sh
t7600-merge.sh
t7601-merge-pull-config.sh
t7602-merge-octopus-many.sh
t7603-merge-reduce-heads.sh
t7604-merge-custom-message.sh
t7605-merge-resolve.sh
t7606-merge-custom.sh
t7607-merge-overwrite.sh
t7608-merge-messages.sh add tests for merge message headings 2009-08-09 12:34:19 -07:00
t7610-mergetool.sh
t7700-repack.sh git repack: keep commits hidden by a graft 2009-07-24 09:10:16 -07:00
t7701-repack-unpack-unreachable.sh
t7800-difftool.sh t7800: respect NO_PERL 2009-04-24 09:24:35 -07:00
t8001-annotate.sh
t8002-blame.sh
t8003-blame.sh blame: correctly handle a path that used to be a directory 2009-06-03 00:49:34 -07:00
t8004-blame.sh
t8005-blame-i18n.sh Merge branch 'maint' 2009-07-25 02:16:25 -07:00
t9001-send-email.sh t/t9001-send-email.sh: ensure generated script is executed with $SHELL_PATH 2009-06-23 16:41:27 -07:00
t9100-git-svn-basic.sh git-svn: let 'dcommit $rev' work on $rev instead of HEAD 2009-06-25 00:38:16 -07:00
t9101-git-svn-props.sh git-svn testsuite: use standard configuration for Subversion tools 2009-05-21 00:31:07 -07:00
t9102-git-svn-deep-rmdir.sh git-svn testsuite: use standard configuration for Subversion tools 2009-05-21 00:31:07 -07:00
t9103-git-svn-tracked-directory-removed.sh git-svn testsuite: use standard configuration for Subversion tools 2009-05-21 00:31:07 -07:00
t9104-git-svn-follow-parent.sh git-svn testsuite: use standard configuration for Subversion tools 2009-05-21 00:31:07 -07:00
t9105-git-svn-commit-diff.sh git-svn testsuite: use standard configuration for Subversion tools 2009-05-21 00:31:07 -07:00
t9106-git-svn-commit-diff-clobber.sh git-svn testsuite: use standard configuration for Subversion tools 2009-05-21 00:31:07 -07:00
t9107-git-svn-migrate.sh git-svn testsuite: use standard configuration for Subversion tools 2009-05-21 00:31:07 -07:00
t9108-git-svn-glob.sh git-svn testsuite: use standard configuration for Subversion tools 2009-05-21 00:31:07 -07:00
t9109-git-svn-multi-glob.sh git-svn testsuite: use standard configuration for Subversion tools 2009-05-21 00:31:07 -07:00
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 git-svn testsuite: use standard configuration for Subversion tools 2009-05-21 00:31:07 -07:00
t9114-git-svn-dcommit-merge.sh git-svn testsuite: use standard configuration for Subversion tools 2009-05-21 00:31:07 -07:00
t9115-git-svn-dcommit-funky-renames.sh
t9116-git-svn-log.sh git-svn testsuite: use standard configuration for Subversion tools 2009-05-21 00:31:07 -07:00
t9117-git-svn-init-clone.sh git-svn testsuite: use standard configuration for Subversion tools 2009-05-21 00:31:07 -07:00
t9118-git-svn-funky-branch-names.sh git-svn testsuite: use standard configuration for Subversion tools 2009-05-21 00:31:07 -07:00
t9119-git-svn-info.sh git-svn testsuite: use standard configuration for Subversion tools 2009-05-21 00:31:07 -07:00
t9120-git-svn-clone-with-percent-escapes.sh t9120: don't expect failure with SVN_HTTPD_PORT unset 2009-05-29 00:53:43 -07:00
t9121-git-svn-fetch-renamed-dir.sh
t9122-git-svn-author.sh git-svn testsuite: use standard configuration for Subversion tools 2009-05-21 00:31:07 -07:00
t9123-git-svn-rebuild-with-rewriteroot.sh git-svn testsuite: use standard configuration for Subversion tools 2009-05-21 00:31:07 -07:00
t9124-git-svn-dcommit-auto-props.sh git-svn testsuite: use standard configuration for Subversion tools 2009-05-21 00:31:07 -07:00
t9125-git-svn-multi-glob-branch-names.sh git-svn testsuite: use standard configuration for Subversion tools 2009-05-21 00:31:07 -07:00
t9126-git-svn-follow-deleted-readded-directory.sh
t9127-git-svn-partial-rebuild.sh git-svn testsuite: use standard configuration for Subversion tools 2009-05-21 00:31:07 -07:00
t9128-git-svn-cmd-branch.sh git-svn testsuite: use standard configuration for Subversion tools 2009-05-21 00:31:07 -07:00
t9129-git-svn-i18n-commitencoding.sh t9139 uses ancient, backwards-compatible iconv names 2009-05-30 22:30:55 -07:00
t9130-git-svn-authors-file.sh git-svn testsuite: use standard configuration for Subversion tools 2009-05-21 00:31:07 -07:00
t9131-git-svn-empty-symlink.sh
t9132-git-svn-broken-symlink.sh
t9133-git-svn-nested-git-repo.sh git-svn testsuite: use standard configuration for Subversion tools 2009-05-21 00:31:07 -07:00
t9134-git-svn-ignore-paths.sh git-svn testsuite: use standard configuration for Subversion tools 2009-05-21 00:31:07 -07:00
t9135-git-svn-moved-branch-empty-file.sh
t9136-git-svn-recreated-branch-empty-file.sh
t9137-git-svn-dcommit-clobber-series.sh git-svn testsuite: use standard configuration for Subversion tools 2009-05-21 00:31:07 -07:00
t9138-git-svn-authors-prog.sh git-svn: add --authors-prog option 2009-05-21 00:56:18 -07:00
t9139-git-svn-non-utf8-commitencoding.sh t9139 uses ancient, backwards-compatible iconv names 2009-05-30 22:30:55 -07:00
t9140-git-svn-reset.sh git svn: rename tests that had conflicting numbers 2009-07-19 22:50:06 -07:00
t9141-git-svn-multiple-branches.sh git svn: the branch command no longer needs the full path 2009-07-25 04:09:43 -07:00
t9142-git-svn-shallow-clone.sh t9142: stop httpd after the test 2009-07-25 04:09:44 -07:00
t9143-git-svn-gc.sh t9143: do not fail if Compress::Zlib is missing 2009-07-26 11:51:45 -07:00
t9200-git-cvsexportcommit.sh cvsexportcommit: reorder tests to quiet intermittent failure 2009-07-18 16:57:49 -07:00
t9300-fast-import.sh
t9301-fast-export.sh Add new fast-export testcases 2009-06-27 14:10:10 -07:00
t9400-git-cvsserver-server.sh
t9401-git-cvsserver-crlf.sh
t9500-gitweb-standalone-no-errors.sh gitweb: (gr)avatar support 2009-06-30 11:06:35 -07:00
t9600-cvsimport.sh
t9700-perl-git.sh Git.pm: Set GIT_WORK_TREE if we set GIT_DIR 2009-05-09 08:25:55 -07:00
test-lib.sh test-lib: allow exit trap to be used for cleanup by tests 2009-06-01 22:44:54 -07:00
test4012.png
test9200a.png
test9200b.png

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 256 subdirectories.
    *   ok 3: git-update-index without --add should fail adding.
    ...
    *   ok 23: no diff after checkout and git-update-index --refresh.
    * passed all 23 test(s)
    *** t0100-environment-names.sh ***
    *   ok 1: using old names should issue warnings.
    *   ok 2: using old names but having new names should not issue warnings.
    ...

Or you can run each test individually from command line, like
this:

    $ sh ./t3001-ls-files-killed.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.
    * passed all 3 test(s)

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.

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'
   if you must know, but I do not think you care.

 - 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.


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 <message> <script>

   This 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)'

 - test_expect_failure <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.

 - 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.

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.