1
0
Fork 0
mirror of https://github.com/git/git.git synced 2024-06-03 18:06:10 +02:00
git/t
Junio C Hamano b798671fa9 merge-recursive: do not rudely die on binary merge
When you try to merge a path that involves binary file-level
merge, merge-recursive died rudely without cleaning up its own
mess.  A files added by the merge were left in the working tree,
but the index was not written out (because it just punted and
died), so it was cumbersome for the user to retry it by first
running "git reset --hard".

This changes merge-recursive to still warn but do the "binary"
merge for such a path; leave the "our" version in the working
tree, but still keep the path unmerged so that the user can sort
it out.

Signed-off-by: Junio C Hamano <gitster@pobox.com>
2007-08-14 22:20:01 -07:00
..
t3900
t4013 Merge branch 'maint' 2007-07-03 22:56:59 -07:00
t4100
t4101
t5100 git-mailinfo fixes for patch munging 2007-03-31 00:59:19 -07:00
t5515 t/t5515-fetch-merge-logic.sh: Add two more tests 2007-03-07 10:22:44 -08:00
t7004 t7004: ship trustdb to avoid gpg warnings 2007-07-01 13:25:55 -07:00
t7500 Teach git-commit about commit message templates. 2007-07-24 20:46:54 -07:00
t9110 git-svn: fix useSvmProps, hopefully for the last time 2007-02-23 00:57:13 -08:00
t9111 War on whitespace 2007-06-07 00:04:01 -07:00
t9115 git-svn: fix commiting renames over DAV with funky file names 2007-07-15 22:35:09 -07:00
.gitignore
Makefile Use $(RM) in Makefiles instead of 'rm -f' 2007-07-14 23:31:01 -07:00
README
annotate-tests.sh make t8001 work on Mac OS X again 2007-03-06 17:09:53 -08:00
diff-lib.sh Fix permissions on test scripts 2007-04-16 16:53:09 -07:00
lib-git-svn.sh git-svn: fix commiting renames over DAV with funky file names 2007-07-15 22:35:09 -07:00
lib-read-tree-m-3way.sh Rewrite "git-frotz" to "git frotz" 2007-07-02 22:52:14 -07:00
t0000-basic.sh Add is_absolute_path() and make_absolute_path() 2007-08-01 00:38:30 -07:00
t0010-racy-git.sh
t0020-crlf.sh Update 'crlf' attribute semantics. 2007-04-19 22:37:44 -07:00
t0021-conversion.sh Add test case for $Id$ expanded in the repository 2007-05-28 23:54:35 -07:00
t0022-crlf-rename.sh diffcore-delta.c: Ignore CR in CRLF for text files 2007-06-30 20:51:31 -07:00
t0030-stripspace.sh Teach "git stripspace" the --strip-comments option 2007-07-26 22:51:44 -07:00
t1000-read-tree-m-3way.sh Rewrite "git-frotz" to "git frotz" 2007-07-02 22:52:14 -07:00
t1001-read-tree-m-2way.sh Rewrite "git-frotz" to "git frotz" 2007-07-02 22:52:14 -07:00
t1002-read-tree-m-u-2way.sh Rewrite "git-frotz" to "git frotz" 2007-07-02 22:52:14 -07:00
t1003-read-tree-prefix.sh Rewrite "git-frotz" to "git frotz" 2007-07-02 22:52:14 -07:00
t1004-read-tree-m-u-wf.sh Rewrite "git-frotz" to "git frotz" 2007-07-02 22:52:14 -07:00
t1020-subdirectory.sh Rewrite "git-frotz" to "git frotz" 2007-07-02 22:52:14 -07:00
t1100-commit-tree-options.sh Rewrite "git-frotz" to "git frotz" 2007-07-02 22:52:14 -07:00
t1200-tutorial.sh Rewrite "git-frotz" to "git frotz" 2007-07-02 22:52:14 -07:00
t1300-repo-config.sh Add a test for git-config --file 2007-07-31 22:56:15 -07:00
t1301-shared-repo.sh Fix core.sharedRepository = 2 2007-07-11 13:52:16 -07:00
t1400-update-ref.sh Rewrite "git-frotz" to "git frotz" 2007-07-02 22:52:14 -07:00
t1410-reflog.sh
t1420-lost-found.sh git-fsck: add --lost-found option 2007-07-02 21:34:12 -07:00
t1500-rev-parse.sh Reinstate the old behaviour when GIT_DIR is set and GIT_WORK_TREE is unset 2007-08-10 01:12:07 -07:00
t1501-worktree.sh Clean up work-tree handling 2007-08-01 00:38:31 -07:00
t2000-checkout-cache-clash.sh Rewrite "git-frotz" to "git frotz" 2007-07-02 22:52:14 -07:00
t2001-checkout-cache-clash.sh Rewrite "git-frotz" to "git frotz" 2007-07-02 22:52:14 -07:00
t2002-checkout-cache-u.sh Rewrite "git-frotz" to "git frotz" 2007-07-02 22:52:14 -07:00
t2003-checkout-cache-mkdir.sh Rewrite "git-frotz" to "git frotz" 2007-07-02 22:52:14 -07:00
t2004-checkout-cache-temp.sh Rewrite "git-frotz" to "git frotz" 2007-07-02 22:52:14 -07:00
t2005-checkout-index-symlinks.sh Rewrite "git-frotz" to "git frotz" 2007-07-02 22:52:14 -07:00
t2007-checkout-symlink.sh Teach read-tree 2-way merge to ignore intermediate symlinks 2007-07-12 02:22:53 -07:00
t2050-git-dir-relative.sh Add a test for git-commit being confused by relative GIT_DIR 2007-08-13 21:19:48 -07:00
t2100-update-cache-badpath.sh Rewrite "git-frotz" to "git frotz" 2007-07-02 22:52:14 -07:00
t2101-update-index-reupdate.sh Rewrite "git-frotz" to "git frotz" 2007-07-02 22:52:14 -07:00
t2102-update-index-symlinks.sh Rewrite "git-frotz" to "git frotz" 2007-07-02 22:52:14 -07:00
t2200-add-update.sh Rewrite "git-frotz" to "git frotz" 2007-07-02 22:52:14 -07:00
t3000-ls-files-others.sh Rewrite "git-frotz" to "git frotz" 2007-07-02 22:52:14 -07:00
t3001-ls-files-others-exclude.sh Rewrite "git-frotz" to "git frotz" 2007-07-02 22:52:14 -07:00
t3002-ls-files-dashpath.sh Rewrite "git-frotz" to "git frotz" 2007-07-02 22:52:14 -07:00
t3010-ls-files-killed-modified.sh Rewrite "git-frotz" to "git frotz" 2007-07-02 22:52:14 -07:00
t3020-ls-files-error-unmatch.sh Rewrite "git-frotz" to "git frotz" 2007-07-02 22:52:14 -07:00
t3030-merge-recursive.sh War on whitespace 2007-06-07 00:04:01 -07:00
t3040-subprojects-basic.sh Tests for core subproject support 2007-04-18 17:08:42 -07:00
t3100-ls-tree-restrict.sh Rewrite "git-frotz" to "git frotz" 2007-07-02 22:52:14 -07:00
t3101-ls-tree-dirname.sh Rewrite "git-frotz" to "git frotz" 2007-07-02 22:52:14 -07:00
t3200-branch.sh branch --track: code cleanup and saner handling of local branches 2007-07-11 16:03:58 -07:00
t3210-pack-refs.sh Rewrite "git-frotz" to "git frotz" 2007-07-02 22:52:14 -07:00
t3300-funny-names.sh Rewrite "git-frotz" to "git frotz" 2007-07-02 22:52:14 -07:00
t3400-rebase.sh Allow rebase to run if upstream is completely merged 2007-07-04 21:12:39 -07:00
t3401-rebase-partial.sh Rewrite "git-frotz" to "git frotz" 2007-07-02 22:52:14 -07:00
t3402-rebase-merge.sh
t3403-rebase-skip.sh Rewrite "git-frotz" to "git frotz" 2007-07-02 22:52:14 -07:00
t3404-rebase-interactive.sh t3404: fix "fake-editor" 2007-08-13 12:58:38 -07:00
t3405-rebase-malformed.sh rebase: try not to munge commit log message 2007-07-29 23:29:04 -07:00
t3500-cherry.sh Rewrite "git-frotz" to "git frotz" 2007-07-02 22:52:14 -07:00
t3501-revert-cherry-pick.sh
t3600-rm.sh More permissive "git-rm --cached" behavior without -f. 2007-07-13 23:52:46 -07:00
t3700-add.sh git-add: Add support for --refresh option. 2007-08-13 12:58:38 -07:00
t3800-mktag.sh Rewrite "git-frotz" to "git frotz" 2007-07-02 22:52:14 -07:00
t3900-i18n-commit.sh Rewrite "git-frotz" to "git frotz" 2007-07-02 22:52:14 -07:00
t3901-8859-1.txt
t3901-i18n-patch.sh Rewrite "git-frotz" to "git frotz" 2007-07-02 22:52:14 -07:00
t3901-utf8.txt
t3902-quoted.sh t3902 - skip test if file system doesn't support HT in names 2007-08-13 12:58:38 -07:00
t3903-stash.sh Make sure git-stash works from subdirectory. 2007-07-25 15:34:52 -07:00
t4000-diff-format.sh Rewrite "git-frotz" to "git frotz" 2007-07-02 22:52:14 -07:00
t4001-diff-rename.sh Rewrite "git-frotz" to "git frotz" 2007-07-02 22:52:14 -07:00
t4002-diff-basic.sh Rewrite "git-frotz" to "git frotz" 2007-07-02 22:52:14 -07:00
t4003-diff-rename-1.sh Rewrite "git-frotz" to "git frotz" 2007-07-02 22:52:14 -07:00
t4004-diff-rename-symlink.sh Rewrite "git-frotz" to "git frotz" 2007-07-02 22:52:14 -07:00
t4005-diff-rename-2.sh Rewrite "git-frotz" to "git frotz" 2007-07-02 22:52:14 -07:00
t4006-diff-mode.sh Rewrite "git-frotz" to "git frotz" 2007-07-02 22:52:14 -07:00
t4007-rename-3.sh Rewrite "git-frotz" to "git frotz" 2007-07-02 22:52:14 -07:00
t4008-diff-break-rewrite.sh Rewrite "git-frotz" to "git frotz" 2007-07-02 22:52:14 -07:00
t4009-diff-rename-4.sh Rewrite "git-frotz" to "git frotz" 2007-07-02 22:52:14 -07:00
t4010-diff-pathspec.sh Rewrite "git-frotz" to "git frotz" 2007-07-02 22:52:14 -07:00
t4011-diff-symlink.sh Rewrite "git-frotz" to "git frotz" 2007-07-02 22:52:14 -07:00
t4012-diff-binary.sh Rewrite "git-frotz" to "git frotz" 2007-07-02 22:52:14 -07:00
t4013-diff-various.sh Merge branch 'maint' 2007-07-03 22:56:59 -07:00
t4014-format-patch.sh Add tests for the last two fixes. 2007-05-26 00:26:20 -07:00
t4015-diff-whitespace.sh Rewrite "git-frotz" to "git frotz" 2007-07-02 22:52:14 -07:00
t4016-diff-quote.sh Get rid of the dependency to GNU diff in the tests 2007-03-04 00:24:15 -08:00
t4017-diff-retval.sh Allow git-diff exit with codes similar to diff(1) 2007-03-14 16:21:19 -07:00
t4017-quiet.sh Add tests for --quiet option of diff programs 2007-03-16 02:13:27 -07:00
t4018-diff-funcname.sh Fix configuration syntax to specify customized hunk header patterns. 2007-07-07 01:49:58 -07:00
t4020-diff-external.sh diff: honor binariness specified in attributes 2007-07-07 12:25:11 -07:00
t4100-apply-stat.sh Rewrite "git-frotz" to "git frotz" 2007-07-02 22:52:14 -07:00
t4101-apply-nonl.sh Rewrite "git-frotz" to "git frotz" 2007-07-02 22:52:14 -07:00
t4102-apply-rename.sh Rewrite "git-frotz" to "git frotz" 2007-07-02 22:52:14 -07:00
t4103-apply-binary.sh Rewrite "git-frotz" to "git frotz" 2007-07-02 22:52:14 -07:00
t4104-apply-boundary.sh Rewrite "git-frotz" to "git frotz" 2007-07-02 22:52:14 -07:00
t4109-apply-multifrag.sh Rewrite "git-frotz" to "git frotz" 2007-07-02 22:52:14 -07:00
t4110-apply-scan.sh Rewrite "git-frotz" to "git frotz" 2007-07-02 22:52:14 -07:00
t4112-apply-renames.sh Rewrite "git-frotz" to "git frotz" 2007-07-02 22:52:14 -07:00
t4113-apply-ending.sh Rewrite "git-frotz" to "git frotz" 2007-07-02 22:52:14 -07:00
t4114-apply-typechange.sh Rewrite "git-frotz" to "git frotz" 2007-07-02 22:52:14 -07:00
t4115-apply-symlink.sh Rewrite "git-frotz" to "git frotz" 2007-07-02 22:52:14 -07:00
t4116-apply-reverse.sh Merge branch 'maint' 2007-07-07 12:29:09 -07:00
t4117-apply-reject.sh Rewrite "git-frotz" to "git frotz" 2007-07-02 22:52:14 -07:00
t4118-apply-empty-context.sh Rewrite "git-frotz" to "git frotz" 2007-07-02 22:52:14 -07:00
t4119-apply-config.sh Rewrite "git-frotz" to "git frotz" 2007-07-02 22:52:14 -07:00
t4120-apply-popt.sh Rewrite "git-frotz" to "git frotz" 2007-07-02 22:52:14 -07:00
t4121-apply-diffs.sh Rewrite "git-frotz" to "git frotz" 2007-07-02 22:52:14 -07:00
t4122-apply-symlink-inside.sh War on whitespace 2007-06-07 00:04:01 -07:00
t4200-rerere.sh rerere: record resolution even if file is not in merge base 2007-07-09 23:39:59 -07:00
t4201-shortlog.sh Rewrite "git-frotz" to "git frotz" 2007-07-02 22:52:14 -07:00
t5000-tar-tree.sh Rewrite "git-frotz" to "git frotz" 2007-07-02 22:52:14 -07:00
t5100-mailinfo.sh Rewrite "git-frotz" to "git frotz" 2007-07-02 22:52:14 -07:00
t5300-pack-object.sh Rewrite "git-frotz" to "git frotz" 2007-07-02 22:52:14 -07:00
t5301-sliding-window.sh Rewrite "git-frotz" to "git frotz" 2007-07-02 22:52:14 -07:00
t5302-pack-index.sh Rewrite "git-frotz" to "git frotz" 2007-07-02 22:52:14 -07:00
t5400-send-pack.sh Rewrite "git-frotz" to "git frotz" 2007-07-02 22:52:14 -07:00
t5401-update-hooks.sh Rewrite "git-frotz" to "git frotz" 2007-07-02 22:52:14 -07:00
t5500-fetch-pack.sh git-clone: aggressively optimize local clone behaviour. 2007-08-01 23:42:36 -07:00
t5502-quickfetch.sh Make sure quickfetch is not fooled with a previous, incomplete fetch. 2007-04-17 00:14:59 -07:00
t5510-fetch.sh allow git-bundle to create bottomless bundle 2007-08-10 22:19:06 -07:00
t5515-fetch-merge-logic.sh Merge branch 'js/diff-ni' 2007-03-10 23:26:33 -08:00
t5516-fetch-push.sh Fix t5516 to create test repo without hooks 2007-07-04 12:41:42 -07:00
t5520-pull.sh War on whitespace 2007-06-07 00:04:01 -07:00
t5600-clone-fail-cleanup.sh
t5700-clone-reference.sh git-clone: aggressively optimize local clone behaviour. 2007-08-01 23:42:36 -07:00
t5701-clone-local.sh Fix t5701-clone-local for white space from wc 2007-08-13 16:47:38 -07:00
t5710-info-alternate.sh War on whitespace 2007-06-07 00:04:01 -07:00
t6000lib.sh Rewrite "git-frotz" to "git frotz" 2007-07-02 22:52:14 -07:00
t6001-rev-list-graft.sh
t6002-rev-list-bisect.sh Rewrite "git-frotz" to "git frotz" 2007-07-02 22:52:14 -07:00
t6003-rev-list-topo-order.sh Rewrite "git-frotz" to "git frotz" 2007-07-02 22:52:14 -07:00
t6004-rev-list-path-optim.sh Rewrite "git-frotz" to "git frotz" 2007-07-02 22:52:14 -07:00
t6005-rev-list-count.sh Rewrite "git-frotz" to "git frotz" 2007-07-02 22:52:14 -07:00
t6006-rev-list-format.sh Rewrite "git-frotz" to "git frotz" 2007-07-02 22:52:14 -07:00
t6007-rev-list-cherry-pick-file.sh Fix --cherry-pick with given paths 2007-07-11 14:59:31 -07:00
t6010-merge-base.sh Rewrite "git-frotz" to "git frotz" 2007-07-02 22:52:14 -07:00
t6020-merge-df.sh
t6021-merge-criss-cross.sh War on whitespace 2007-06-07 00:04:01 -07:00
t6022-merge-rename.sh Add a test for merging changed and rename-changed branches 2007-04-25 23:43:16 -07:00
t6023-merge-file.sh Rewrite "git-frotz" to "git frotz" 2007-07-02 22:52:14 -07:00
t6023-merge-rename-nocruft.sh
t6024-recursive-merge.sh Rewrite "git-frotz" to "git frotz" 2007-07-02 22:52:14 -07:00
t6025-merge-symlinks.sh Rewrite "git-frotz" to "git frotz" 2007-07-02 22:52:14 -07:00
t6026-merge-attr.sh Custom low-level merge driver: change the configuration scheme. 2007-04-18 12:30:26 -07:00
t6027-merge-binary.sh merge-recursive: do not rudely die on binary merge 2007-08-14 22:20:01 -07:00
t6030-bisect-porcelain.sh War on whitespace 2007-06-07 00:04:01 -07:00
t6101-rev-parse-parents.sh Rewrite "git-frotz" to "git frotz" 2007-07-02 22:52:14 -07:00
t6120-describe.sh Rewrite "git-frotz" to "git frotz" 2007-07-02 22:52:14 -07:00
t6200-fmt-merge-msg.sh Get rid of the dependency to GNU diff in the tests 2007-03-04 00:24:15 -08:00
t7001-mv.sh Rewrite "git-frotz" to "git frotz" 2007-07-02 22:52:14 -07:00
t7002-grep.sh
t7003-filter-branch.sh filter-branch: Big syntax change; support rewriting multiple refs 2007-07-23 23:15:09 -07:00
t7004-tag.sh builtin-tag.c: Fix two memory leaks and minor notation changes. 2007-07-21 16:59:33 -07:00
t7005-editor.sh Add GIT_EDITOR environment and core.editor configuration variables 2007-07-20 00:46:34 -07:00
t7101-reset.sh Rewrite "git-frotz" to "git frotz" 2007-07-02 22:52:14 -07:00
t7201-co.sh checkout: do not get confused with ambiguous tag/branch names 2007-06-08 01:19:13 -07:00
t7300-clean.sh Rewrite "git-frotz" to "git frotz" 2007-07-02 22:52:14 -07:00
t7400-submodule-basic.sh unpack-trees.c: assume submodules are clean during check-out 2007-07-18 17:01:00 -07:00
t7500-commit.sh Teach git-commit about commit message templates. 2007-07-24 20:46:54 -07:00
t7501-commit.sh git-commit.sh: Permit the --amend message to be given with -m/-c/-C/-F. 2007-08-01 18:15:43 -07:00
t8001-annotate.sh Rewrite "git-frotz" to "git frotz" 2007-07-02 22:52:14 -07:00
t8002-blame.sh Rewrite "git-frotz" to "git frotz" 2007-07-02 22:52:14 -07:00
t8003-blame.sh Add test for blame corner cases. 2007-05-05 22:40:39 -07:00
t9001-send-email.sh
t9100-git-svn-basic.sh Rewrite "git-frotz" to "git frotz" 2007-07-02 22:52:14 -07:00
t9101-git-svn-props.sh git-svn: add a test for show-ignore 2007-02-23 00:57:08 -08:00
t9102-git-svn-deep-rmdir.sh
t9104-git-svn-follow-parent.sh Rewrite "git-frotz" to "git frotz" 2007-07-02 22:52:14 -07:00
t9105-git-svn-commit-diff.sh git-svn: don't attempt to minimize URLs by default 2007-05-13 12:10:43 -07:00
t9106-git-svn-commit-diff-clobber.sh Work around Subversion race in git-svn tests. 2007-02-12 22:17:04 -08:00
t9107-git-svn-migrate.sh Rewrite "git-frotz" to "git frotz" 2007-07-02 22:52:14 -07:00
t9108-git-svn-glob.sh git-svn: brown paper bag fixes 2007-02-23 00:57:12 -08:00
t9110-git-svn-use-svm-props.sh Rewrite "git-frotz" to "git frotz" 2007-07-02 22:52:14 -07:00
t9111-git-svn-use-svnsync-props.sh Rewrite "git-frotz" to "git frotz" 2007-07-02 22:52:14 -07:00
t9112-git-svn-md5less-file.sh Fix git-svn to handle svn not reporting the md5sum of a file, and test. 2007-05-26 01:17:58 -07:00
t9113-git-svn-dcommit-new-file.sh git-svn: test for creating new directories over svn:// 2007-06-13 11:01:49 -07:00
t9114-git-svn-dcommit-merge.sh git-svn: allow dcommit to retain local merge information 2007-06-13 11:24:23 -07:00
t9115-git-svn-dcommit-funky-renames.sh git-svn: fix commiting renames over DAV with funky file names 2007-07-15 22:35:09 -07:00
t9200-git-cvsexportcommit.sh t9200: Be careful when checking CVS/Entries 2007-07-25 00:06:38 -07:00
t9300-fast-import.sh git-diff: turn on recursion by default 2007-07-29 13:24:42 -07:00
t9400-git-cvsserver-server.sh config: add support for --bool and --int while setting values 2007-06-26 23:16:17 -07:00
t9500-gitweb-standalone-no-errors.sh gitweb: Simplify 'opt' parameter validation, add "no merges" feeds 2007-07-28 18:47:51 -07:00
test-lib.sh Unset GIT_EDITOR while running tests. 2007-07-30 22:16:40 -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.

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


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'
   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 the opposite of test_expect_success.  If <script>
   yields success, test is considered a failure.

   Example:

	test_expect_failure \
	    'git-update-index without --add should fail adding.' \
	    'git-update-index should-be-empty'

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


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.