git/t
Shawn O. Pearce ea5e370aa9 fast-import: Support reusing 'from' and brown paper bag fix reset.
It was suggested on the mailing list that being able to use `from`
in any commit to reset the current branch is useful in some types of
importers, such as a darcs importer.

We originally did not permit resetting an existing branch with a
new `from` command during a `commit` command, but this restriction
was only to help debug the hacked up cvs2svn that Jon Smirl was
developing in parallel with git-fast-import.  It is probably more
of a problem to disallow it than to allow it.  So now we permit a
`from` during any `commit`.

While making the changes required to permit multiple `from`
commands on the same branch, I discovered we no longer needed the
last_commit field to be set to 0 during a reset, so that was removed.
(Reset was originally setting the field to 0 to signal cmd_from()
that it was OK to execute on the branch.)

While poking around in this section of fast-import I also realized
the `reset` command was not working as intended if the corresponding
`from` command was omitted (as allowed by the BNF grammar and the
code).  If `from` was omitted we cleared out the tree but we left
the tree SHA-1 and parent commit SHA-1 intact.  This is not what
the user intended in this case.  Instead they would be trying to
reset the branch to have no parent and to have no tree, making the
branch look new-born during the next commit.  We now clear these
SHA-1 values during `reset`, ensuring the branch looks new-born if
`from` does not get supplied.

New test cases for these were also added.

Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
2007-02-12 12:17:31 -05:00
..
t3900 Rename t3900 test vector file 2006-12-27 17:38:02 -08:00
t4013 Add --summary to git-format-patch by default 2007-01-17 23:48:20 -08:00
t4100
t4101 Make t4101-apply-nonl bring along its patches 2006-06-17 16:06:21 -07:00
t5100 t5100: mailinfo and mailsplit tests. 2006-06-17 16:26:20 -07:00
.gitignore gitignore: Ignore some more boring things. 2006-03-05 11:26:18 -08:00
Makefile git-svn: remove non-delta fetch code paths 2006-12-28 01:39:09 -08:00
README use 'init' instead of 'init-db' for shipped docs and tools 2007-01-12 13:36:16 -08:00
annotate-tests.sh Avoid ActiveState Perl IO in t800[12] 2007-02-07 00:35:15 -08:00
diff-lib.sh
lib-git-svn.sh Hide output about SVN::Core not being found during tests. 2007-01-14 00:40:12 -08:00
lib-read-tree-m-3way.sh
t0000-basic.sh use 'init' instead of 'init-db' for shipped docs and tools 2007-01-12 13:36:16 -08:00
t0010-racy-git.sh
t1000-read-tree-m-3way.sh
t1001-read-tree-m-2way.sh Libify diff-files. 2006-04-22 02:37:45 -07:00
t1002-read-tree-m-u-2way.sh t1002: use -U0 instead of --unified=0 2006-05-28 09:43:18 -07:00
t1003-read-tree-prefix.sh Add a couple of subdirectory tests. 2006-08-03 14:41:29 -07:00
t1004-read-tree-m-u-wf.sh Assorted typo fixes 2007-02-03 21:49:54 -08:00
t1020-subdirectory.sh Assorted typo fixes 2007-02-03 21:49:54 -08:00
t1100-commit-tree-options.sh
t1200-tutorial.sh make commit message a little more consistent and conforting 2006-12-15 22:29:54 -08:00
t1300-repo-config.sh [PATCH] Rename git-repo-config to git-config. 2007-01-28 16:16:53 -08:00
t1400-update-ref.sh [PATCH] Rename git-repo-config to git-config. 2007-01-28 16:16:53 -08:00
t1410-reflog.sh git-fsck-objects is now synonym to git-fsck 2007-01-28 16:33:58 -08:00
t2000-checkout-cache-clash.sh
t2001-checkout-cache-clash.sh Fix typo in debug stanza of t2001 2006-01-07 18:13:44 -08:00
t2002-checkout-cache-u.sh
t2003-checkout-cache-mkdir.sh
t2004-checkout-cache-temp.sh Add --temp and --stage=all options to checkout-index. 2006-03-05 00:58:13 -08:00
t2100-update-cache-badpath.sh
t2101-update-index-reupdate.sh tests: Remove heredoc usage inside quotes 2006-05-25 23:53:31 -07:00
t3000-ls-files-others.sh ls-files --others --directory: test 2006-01-07 21:34:03 -08:00
t3001-ls-files-others-exclude.sh avoid echo -e, there are systems where it does not work 2006-02-12 11:36:19 -08:00
t3002-ls-files-dashpath.sh
t3010-ls-files-killed-modified.sh
t3020-ls-files-error-unmatch.sh git-ls-files: Fix, document, and add test for --error-unmatch option. 2006-02-21 18:37:36 -08:00
t3100-ls-tree-restrict.sh
t3101-ls-tree-dirname.sh
t3200-branch.sh [PATCH] Rename git-repo-config to git-config. 2007-01-28 16:16:53 -08:00
t3210-pack-refs.sh Fix seriously broken "git pack-refs" 2007-01-25 19:16:07 -08:00
t3300-funny-names.sh t3300-funny-names: shell portability fixes 2006-05-25 23:53:31 -07:00
t3400-rebase.sh
t3401-rebase-partial.sh tests: merge-recursive is usable without Python 2006-10-27 14:29:55 -07:00
t3402-rebase-merge.sh tests: merge-recursive is usable without Python 2006-10-27 14:29:55 -07:00
t3403-rebase-skip.sh tests: merge-recursive is usable without Python 2006-10-27 14:29:55 -07:00
t3500-cherry.sh read-tree -m -u: do not overwrite or remove untracked working tree files. 2006-05-17 01:52:48 -07:00
t3501-revert-cherry-pick.sh Use merge-recursive in git-revert/git-cherry-pick 2007-01-14 22:00:34 -08:00
t3600-rm.sh t3600: update the test for updated git rm 2006-12-25 03:29:08 -08:00
t3700-add.sh [PATCH] Rename git-repo-config to git-config. 2007-01-28 16:16:53 -08:00
t3800-mktag.sh Assorted typo fixes 2007-02-03 21:49:54 -08:00
t3900-i18n-commit.sh [PATCH] Rename git-repo-config to git-config. 2007-01-28 16:16:53 -08:00
t3901-8859-1.txt t3901: test "format-patch | am" pipe with i18n 2007-01-13 10:10:20 -08:00
t3901-i18n-patch.sh [PATCH] Rename git-repo-config to git-config. 2007-01-28 16:16:53 -08:00
t3901-utf8.txt t3901: test "format-patch | am" pipe with i18n 2007-01-13 10:10:20 -08:00
t4000-diff-format.sh [PATCH] Rename git-repo-config to git-config. 2007-01-28 16:16:53 -08:00
t4001-diff-rename.sh xdiff: Show function names in hunk headers. 2006-03-27 18:43:51 -08:00
t4002-diff-basic.sh read-tree -m -u: do not overwrite or remove untracked working tree files. 2006-05-17 01:52:48 -07:00
t4003-diff-rename-1.sh
t4004-diff-rename-symlink.sh
t4005-diff-rename-2.sh
t4006-diff-mode.sh [PATCH] Rename git-repo-config to git-config. 2007-01-28 16:16:53 -08:00
t4007-rename-3.sh
t4008-diff-break-rewrite.sh
t4009-diff-rename-4.sh
t4010-diff-pathspec.sh Libify diff-index. 2006-04-22 02:43:00 -07:00
t4011-diff-symlink.sh t4011: "sleep 1" is not enough on FAT 2006-01-21 19:33:22 -08:00
t4012-diff-binary.sh tests: Remove heredoc usage inside quotes 2006-05-25 23:53:31 -07:00
t4013-diff-various.sh [PATCH] Rename git-repo-config to git-config. 2007-01-28 16:16:53 -08:00
t4014-format-patch.sh t4014: fix test commit labels. 2006-06-28 22:48:34 -07:00
t4015-diff-whitespace.sh diff -b: ignore whitespace at end of line 2006-12-04 16:30:54 -08:00
t4016-diff-quote.sh t4016: test quoting funny pathnames in diff output 2007-02-11 13:28:42 -08:00
t4100-apply-stat.sh
t4101-apply-nonl.sh Make t4101-apply-nonl bring along its patches 2006-06-17 16:06:21 -07:00
t4102-apply-rename.sh [PATCH] Rename git-repo-config to git-config. 2007-01-28 16:16:53 -08:00
t4103-apply-binary.sh Make apply --binary a no-op. 2006-09-07 02:44:40 -07:00
t4104-apply-boundary.sh apply --unidiff-zero: loosen sanity checks for --unidiff=0 patches 2006-09-17 01:12:37 -07:00
t4109-apply-multifrag.sh
t4110-apply-scan.sh
t4112-apply-renames.sh t4112: simplify the test and remove unneeded working tree file. 2006-07-26 11:05:44 -07:00
t4113-apply-ending.sh apply: force matching at the beginning. 2006-05-24 13:23:31 -07:00
t4114-apply-typechange.sh typechange tests for git apply (currently failing) 2006-07-16 22:15:21 -07:00
t4115-apply-symlink.sh git-apply: applying a patch to make a symlink shorter. 2006-08-09 22:47:25 -07:00
t4116-apply-reverse.sh use 'init' instead of 'init-db' for shipped docs and tools 2007-01-12 13:36:16 -08:00
t4117-apply-reject.sh git-apply --verbose 2006-08-18 03:14:48 -07:00
t4118-apply-empty-context.sh git-apply: prepare for upcoming GNU diff -u format change. 2006-10-19 21:28:06 -07:00
t4200-rerere.sh t4200: skip gc-rerere test on systems with non GNU date. 2007-02-07 10:43:56 -08:00
t5000-tar-tree.sh Assorted typo fixes 2007-02-03 21:49:54 -08:00
t5100-mailinfo.sh t5100: mailinfo and mailsplit tests. 2006-06-17 16:26:20 -07:00
t5300-pack-object.sh use 'init' instead of 'init-db' for shipped docs and tools 2007-01-12 13:36:16 -08:00
t5301-sliding-window.sh [PATCH] Rename git-repo-config to git-config. 2007-01-28 16:16:53 -08:00
t5400-send-pack.sh [PATCH] Rename git-repo-config to git-config. 2007-01-28 16:16:53 -08:00
t5401-update-hooks.sh Replace "echo -n" with printf in shell scripts. 2007-01-15 22:23:21 -08:00
t5500-fetch-pack.sh git-fsck-objects is now synonym to git-fsck 2007-01-28 16:33:58 -08:00
t5510-fetch.sh [PATCH] Rename git-repo-config to git-config. 2007-01-28 16:16:53 -08:00
t5520-pull.sh use 'init' instead of 'init-db' for shipped docs and tools 2007-01-12 13:36:16 -08:00
t5600-clone-fail-cleanup.sh Assorted typo fixes 2007-02-03 21:49:54 -08:00
t5700-clone-reference.sh git-clone --reference: saner handling of borrowed symrefs. 2007-02-04 03:28:15 -08:00
t5710-info-alternate.sh git-fsck-objects is now synonym to git-fsck 2007-01-28 16:33:58 -08:00
t6000lib.sh t6000lib: workaround a possible dash bug 2006-05-25 23:53:31 -07:00
t6001-rev-list-graft.sh An illustration of rev-list --parents --pretty=raw 2006-09-27 12:34:37 -07:00
t6002-rev-list-bisect.sh Fix more typos, primarily in the code 2006-07-10 00:36:44 -07:00
t6003-rev-list-topo-order.sh
t6004-rev-list-path-optim.sh Trivial path optimization test 2006-07-24 17:32:22 -07:00
t6005-rev-list-count.sh revision: --skip=<n> 2006-12-20 11:26:11 -08:00
t6010-merge-base.sh Additional merge-base tests (revised) 2006-07-09 03:38:12 -07:00
t6020-merge-df.sh
t6021-merge-criss-cross.sh tests: merge-recursive is usable without Python 2006-10-27 14:29:55 -07:00
t6022-merge-rename.sh t6022: ignoring untracked files by merge-recursive when they do not matter 2006-10-27 17:16:40 -07:00
t6023-merge-file.sh Replace "echo -n" with printf in shell scripts. 2007-01-15 22:23:21 -08:00
t6023-merge-rename-nocruft.sh Keep untracked files not involved in a merge. 2007-02-03 22:04:28 -08:00
t6024-recursive-merge.sh t6024-recursive-merge: quiet down this test 2006-12-28 01:28:07 -08:00
t6101-rev-parse-parents.sh tests: adjust breakage by stricter rev-parse 2006-01-25 15:10:22 -08:00
t6120-describe.sh Add describe test. 2007-01-14 21:17:27 -08:00
t6200-fmt-merge-msg.sh [PATCH] Rename git-repo-config to git-config. 2007-01-28 16:16:53 -08:00
t7001-mv.sh use 'init' instead of 'init-db' for shipped docs and tools 2007-01-12 13:36:16 -08:00
t7002-grep.sh git-grep: show pathnames relative to the current directory 2006-08-11 19:08:10 -07:00
t7101-reset.sh Make git-reset delete empty directories 2006-02-17 23:52:57 -08:00
t7201-co.sh git-checkout -m: fix merge case 2007-01-23 16:58:13 -08:00
t8001-annotate.sh t8001-annotate: fix a bash-ism in this test 2006-07-04 02:55:52 -07:00
t8002-blame.sh annotate-blame test: don't "source", but say "." 2006-03-05 22:10:26 -08:00
t9001-send-email.sh send-email: do not barf when Term::ReadLine does not like your terminal 2006-07-03 19:04:46 -07:00
t9100-git-svn-basic.sh git-svn: t/t9100-git-svn-basic: remove old check for NO_SYMLINK 2006-12-31 23:40:52 -08:00
t9101-git-svn-props.sh Assorted typo fixes 2007-02-03 21:49:54 -08:00
t9102-git-svn-deep-rmdir.sh Start all test scripts with /bin/sh. 2007-01-15 18:57:48 -08:00
t9103-git-svn-graft-branches.sh Start all test scripts with /bin/sh. 2007-01-15 18:57:48 -08:00
t9104-git-svn-follow-parent.sh git-svn: fix tests to work with older svn 2007-01-13 10:03:04 -08:00
t9105-git-svn-commit-diff.sh git-svn: remove support for the svn command-line client 2006-12-16 05:17:17 -08:00
t9106-git-svn-commit-diff-clobber.sh git-svn: remove support for the svn command-line client 2006-12-16 05:17:17 -08:00
t9200-git-cvsexportcommit.sh t9200: Work around HFS+ issues. 2007-02-05 13:38:02 -08:00
t9300-fast-import.sh fast-import: Support reusing 'from' and brown paper bag fix reset. 2007-02-12 12:17:31 -05:00
test-lib.sh Default GIT_MERGE_VERBOSITY to 5 during tests. 2007-02-03 22:04:34 -08:00
test4012.png binary diff and apply: testsuite. 2006-05-06 00:15:54 -07:00
test9200a.png Rework cvsexportcommit to handle binary files for all cases. 2006-11-13 14:27:38 -08:00
test9200b.png Rework cvsexportcommit to handle binary files for all cases. 2006-11-13 14:27:38 -08:00

README

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.