git-commit-vandalism/t
Junio C Hamano 446247db78 merge: fix numerus bugs around "trivial merge" area
The "trivial merge" codepath wants to optimize itself by making an
internal call to the read-tree machinery, but it does not read the index
before doing so, and the codepath is never exercised.  Incidentally, this
failure to read the index upfront means that the safety to refuse doing
anything when the index is unmerged does not kick in, either.

These two problem are fixed by using read_cache_unmerged() that does read
the index before checking if it is unmerged at the beginning of
cmd_merge().

The primary logic of the merge, however, assumes that the process never
reads the index in-core, and the call to write_cache_as_tree() it makes
from write_tree_trivial() will always read from the on-disk index that is
prepared the strategy back-ends.  This assumption is now broken by the
above fix.  To fix this issue, we now call discard_cache() before calling
write_tree_trivial() when it wants to write the on-disk index as a tree.

When multiple strategies are tried, their results are evaluated by reading
the resulting index and inspecting it.  The codepath needs to make a call
to read_cache() for each successful strategy, and for that to work, they
need to discard_cache() the one read by the previous round.

Also the "trivial merge" forgot that the current commit is one of the
parents of the resulting commit.

Signed-off-by: Junio C Hamano <gitster@pobox.com>
2008-08-23 18:17:22 -07:00
..
lib-httpd Avoid apache complaining about lack of server's FQDN 2008-07-08 22:50:48 -07:00
t3900 Rename t3900 test vector file 2006-12-27 17:38:02 -08:00
t4013 format-patch: Produce better output with --inline or --attach 2008-07-29 23:18:15 -07:00
t4020 t4020: don't use grep -a 2008-03-13 00:57:53 -07:00
t4100 Fix apply --recount handling of no-EOL line 2008-07-05 00:37:44 -07:00
t4101 Make t4101-apply-nonl bring along its patches 2006-06-17 16:06:21 -07:00
t4109 tests: do not rely on external "patch" 2008-07-21 21:33:16 -07:00
t4110 tests: do not rely on external "patch" 2008-07-21 21:33:16 -07:00
t5100 mailinfo: avoid violating strbuf assertion 2008-08-19 19:36:56 -07:00
t5515 git-fetch test: test tracking fetch results, not just FETCH_HEAD 2008-03-26 01:29:54 -07: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
t9121 git-svn: fix following renamed paths when tracking a single path 2008-04-07 00:16:08 -07:00
t9700 Git.pm: add test suite 2008-06-19 14:38:24 -07:00
.gitattributes enable whitespace checking of test scripts 2008-06-14 11:39:16 -07:00
.gitignore Add test results directory to t/.gitignore 2008-06-30 00:36:39 -07:00
aggregate-results.sh t/aggregate-results: whitespace fix 2008-07-16 08:42:52 -07:00
annotate-tests.sh make t8001 work on Mac OS X again 2007-03-06 17:09:53 -08:00
diff-lib.sh tests: do not use implicit "git diff --no-index" 2008-05-24 00:01:56 -07:00
lib-git-svn.sh t/lib-git-svn: fix SVN_HTTPD tests to work with "trash directory" 2008-07-16 08:11:15 -07:00
lib-httpd.sh Fix http-push test 2008-07-08 22:49:42 -07:00
lib-read-tree-m-3way.sh Rewrite "git-frotz" to "git frotz" 2007-07-02 22:52:14 -07:00
Makefile t/Makefile: use specified shell when running aggregation script 2008-07-16 08:59:14 -07:00
README t/README: Add 'Skipping Tests' section below 'Running Tests' 2008-06-21 00:02:31 -07:00
t0000-basic.sh t/: Use "test_must_fail git" instead of "! git" 2008-07-13 13:21:26 -07:00
t0001-init.sh init: handle empty "template" parameter 2008-08-01 22:41:07 -07:00
t0002-gitfile.sh t/: Replace diff [-u|-U0] with test_cmp to allow compilation with old diff 2008-07-23 11:35:01 -07:00
t0003-attributes.sh Ignore .gitattributes in bare repositories 2008-06-09 15:08:26 -07:00
t0004-unwritable.sh t0004: fix timing bug 2008-07-12 04:15:56 -07:00
t0010-racy-git.sh Racy GIT (part #2) 2005-12-20 12:12:18 -08:00
t0020-crlf.sh t/: Use "test_must_fail git" instead of "! git" 2008-07-13 13:21:26 -07:00
t0021-conversion.sh t0021: tr portability fix for Solaris 2008-03-11 21:14:59 -07:00
t0022-crlf-rename.sh add test_cmp function for test scripts 2008-03-13 00:57:52 -07:00
t0023-crlf-am.sh git-am: ignore --binary option 2008-08-16 02:32:36 -07:00
t0030-stripspace.sh tests: do not use implicit "git diff --no-index" 2008-05-24 00:01:56 -07:00
t0040-parse-options.sh Fix test-parse-options "integer" test 2008-07-30 12:53:45 -07:00
t0050-filesystem.sh t/: Use "test_must_fail git" instead of "! git" 2008-07-13 13:21:26 -07:00
t0060-path-utils.sh Add support for GIT_CEILING_DIRECTORIES 2008-05-23 14:15:01 -07:00
t1000-read-tree-m-3way.sh tests: do not use implicit "git diff --no-index" 2008-05-24 00:01:56 -07:00
t1001-read-tree-m-2way.sh tests: do not use implicit "git diff --no-index" 2008-05-24 00:01:56 -07:00
t1002-read-tree-m-u-2way.sh t1002-read-tree-m-u-2way.sh: use 'git diff -U0' rather than 'diff -U0' 2008-08-18 23:27: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 Fix read-tree not to discard errors 2008-03-18 22:17:22 -07:00
t1005-read-tree-reset.sh add test_cmp function for test scripts 2008-03-13 00:57:52 -07:00
t1006-cat-file.sh cat-file --batch / --batch-check: do not exit if hashes are missing 2008-06-09 13:46:08 -07:00
t1007-hash-object.sh t1007-hash-object.sh: use quotes for the test description 2008-07-11 21:13:16 -07:00
t1020-subdirectory.sh Fix tests breaking when checkout path contains shell metacharacters 2008-05-05 14:37:02 -07:00
t1100-commit-tree-options.sh Rewrite "git-frotz" to "git frotz" 2007-07-02 22:52:14 -07:00
t1200-tutorial.sh t/: Use "test_must_fail git" instead of "! git" 2008-07-13 13:21:26 -07:00
t1300-repo-config.sh t/: Use "test_must_fail git" instead of "! git" 2008-07-13 13:21:26 -07:00
t1301-shared-repo.sh Fix backwards-incompatible handling of core.sharedRepository 2008-07-11 20:38:30 -07:00
t1302-repo-version.sh t/: Use "test_must_fail git" instead of "! git" 2008-07-13 13:21:26 -07:00
t1303-wacky-config.sh tests: do not use implicit "git diff --no-index" 2008-05-24 00:01:56 -07:00
t1400-update-ref.sh t/: Use "test_must_fail git" instead of "! git" 2008-07-13 13:21:26 -07:00
t1410-reflog.sh Fix deleting reflog entries from HEAD reflog 2008-08-10 23:21:25 -07:00
t1420-lost-found.sh git-fsck: add --lost-found option 2007-07-02 21:34:12 -07:00
t1500-rev-parse.sh Don't use the 'export NAME=value' in the test scripts. 2008-05-05 14:17:01 -07:00
t1501-worktree.sh Don't use the 'export NAME=value' in the test scripts. 2008-05-05 14:17:01 -07:00
t1502-rev-parse-parseopt.sh Merge branch 'maint' 2008-06-22 18:39:37 -07:00
t1503-rev-parse-verify.sh rev-parse --verify: do not output anything on error 2008-05-11 11:51:12 -07:00
t1504-ceiling-dirs.sh Add support for GIT_CEILING_DIRECTORIES 2008-05-23 14:15:01 -07:00
t2000-checkout-cache-clash.sh t/: Use "test_must_fail git" instead of "! git" 2008-07-13 13:21:26 -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 Use the modern syntax of git-diff-files in t2002-checkout-cache-u.sh 2008-04-29 23:11:57 -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
t2008-checkout-subdir.sh tests: introduce test_must_fail 2008-03-02 23:15:06 -08:00
t2009-checkout-statinfo.sh Write index file on any checkout of files 2008-02-29 00:00:29 -08:00
t2010-checkout-ambiguous.sh git-checkout: improve error messages, detect ambiguities. 2008-07-24 23:24:00 -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 t/: Use "test_must_fail git" instead of "! git" 2008-07-13 13:21:26 -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
t2103-update-index-ignore-missing.sh refresh-index: fix bitmask assignment 2008-07-20 00:00:46 -07:00
t2200-add-update.sh "git-add -n -u" should not add but just report 2008-05-21 12:04:41 -07:00
t2201-add-update-typechange.sh t/: Replace diff [-u|-U0] with test_cmp to allow compilation with old diff 2008-07-23 11:35:01 -07:00
t2202-add-addremove.sh git-add --all: tests 2008-07-19 23:08:58 -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 tests: do not use implicit "git diff --no-index" 2008-05-24 00:01:56 -07:00
t3002-ls-files-dashpath.sh tests: do not use implicit "git diff --no-index" 2008-05-24 00:01:56 -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 t/: Use "test_must_fail git" instead of "! git" 2008-07-13 13:21:26 -07:00
t3030-merge-recursive.sh merge: fix numerus bugs around "trivial merge" area 2008-08-23 18:17:22 -07:00
t3040-subprojects-basic.sh tests: do not use implicit "git diff --no-index" 2008-05-24 00:01:56 -07:00
t3050-subprojects-fetch.sh Fix tests breaking when checkout path contains shell metacharacters 2008-05-05 14:37:02 -07:00
t3060-ls-files-with-tree.sh add test_cmp function for test scripts 2008-03-13 00:57:52 -07:00
t3100-ls-tree-restrict.sh tests: do not use implicit "git diff --no-index" 2008-05-24 00:01:56 -07:00
t3101-ls-tree-dirname.sh tests: do not use implicit "git diff --no-index" 2008-05-24 00:01:56 -07:00
t3200-branch.sh t3200,t7201: replace '!' with test_must_fail 2008-07-23 11:35:23 -07:00
t3201-branch-contains.sh Add tests for branch --[no-]merged 2008-04-20 18:16:46 -07:00
t3202-show-branch-octopus.sh sort_in_topological_order(): avoid setting a commit flag 2008-08-01 23:14:22 -07:00
t3210-pack-refs.sh t/: Use "test_must_fail git" instead of "! git" 2008-07-13 13:21:26 -07:00
t3300-funny-names.sh tests: do not use implicit "git diff --no-index" 2008-05-24 00:01:56 -07:00
t3400-rebase.sh Merge branch 'bd/tests' 2008-05-14 13:45:16 -07:00
t3401-rebase-partial.sh Rename .git/rebase to .git/rebase-apply 2008-07-21 18:51:47 -07:00
t3402-rebase-merge.sh rebase: operate on a detached HEAD 2007-11-09 01:30:31 -08:00
t3403-rebase-skip.sh t/: Use "test_must_fail git" instead of "! git" 2008-07-13 13:21:26 -07:00
t3404-rebase-interactive.sh rebase -i -p: fix parent rewriting 2008-08-13 15:17:10 -07:00
t3405-rebase-malformed.sh add test_cmp function for test scripts 2008-03-13 00:57:52 -07:00
t3406-rebase-message.sh add test_cmp function for test scripts 2008-03-13 00:57:52 -07:00
t3407-rebase-abort.sh Rename .git/rebase to .git/rebase-apply 2008-07-21 18:51:47 -07:00
t3408-rebase-multi-line.sh rebase: do not munge commit log message 2008-04-16 12:50:48 -07:00
t3500-cherry.sh Don't use the 'export NAME=value' in the test scripts. 2008-05-05 14:17:01 -07:00
t3501-revert-cherry-pick.sh revert: actually check for a dirty index 2008-03-02 23:33:59 -08:00
t3502-cherry-pick-merge.sh t/: Use "test_must_fail git" instead of "! git" 2008-07-13 13:21:26 -07:00
t3503-cherry-pick-root.sh Allow cherry-picking root commits 2008-07-07 13:23:42 -07:00
t3600-rm.sh Merge branch 'maint' 2008-07-19 11:28:06 -07:00
t3700-add.sh Fix t3700 on filesystems which do not support question marks in names 2008-08-15 01:38:37 -07:00
t3701-add-interactive.sh git-add--interactive: manual hunk editing mode 2008-07-02 15:31:49 -07:00
t3800-mktag.sh mask necessary whitespace policy violations in test scripts 2008-06-14 11:39:16 -07:00
t3900-i18n-commit.sh tests: do not use implicit "git diff --no-index" 2008-05-24 00:01:56 -07: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 Remove unecessary hard-coding of EDITOR=':' VISUAL=':' in some test suites. 2007-11-02 15:40:20 -07:00
t3901-utf8.txt t3901: test "format-patch | am" pipe with i18n 2007-01-13 10:10:20 -08:00
t3902-quoted.sh add test_cmp function for test scripts 2008-03-13 00:57:52 -07:00
t3903-stash.sh Add a test for "git stash branch" 2008-07-06 22:58:56 -07:00
t4000-diff-format.sh Replace the word 'update-cache' by 'update-index' everywhere 2007-11-30 15:09:40 -08:00
t4001-diff-rename.sh Merge branch 'kh/commit' 2007-12-04 17:16:33 -08: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 tests: do not use implicit "git diff --no-index" 2008-05-24 00:01:56 -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 rename: Break filepairs with different types. 2007-12-02 02:24:46 -08: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 "git diff": do not ignore index without --no-index 2008-05-24 00:16:39 -07:00
t4014-format-patch.sh fix whitespace violations in test scripts 2008-06-14 11:39:16 -07:00
t4015-diff-whitespace.sh diff --check: do not get confused by new blank lines in the middle 2008-08-20 13:28:19 -07:00
t4016-diff-quote.sh avoid trailing whitespace in zero-change diffstat lines 2008-06-14 11:39:16 -07:00
t4017-diff-retval.sh Fix t4017-diff-retval for white-space from wc 2008-06-29 15:11:50 -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 t/: Use "test_must_fail git" instead of "! git" 2008-07-13 13:21:26 -07:00
t4019-diff-wserror.sh diff --check: do not unconditionally complain about trailing empty lines 2008-08-11 22:15:28 -07:00
t4020-diff-external.sh t4020: don't use grep -a 2008-03-13 00:57:53 -07:00
t4021-format-patch-numbered.sh format-patch: Test --[no-]numbered and format.numbered 2007-11-04 01:26:30 -08:00
t4021-format-patch-signer-mime.sh format-patch: generate MIME header as needed even when there is format.header 2008-03-15 00:06:06 -07:00
t4022-diff-rewrite.sh tr portability fixes 2008-03-12 21:10:00 -07:00
t4023-diff-rename-typechange.sh add test_cmp function for test scripts 2008-03-13 00:57:52 -07:00
t4024-diff-optimize-common.sh add test_cmp function for test scripts 2008-03-13 00:57:52 -07:00
t4025-hunk-header.sh add test_cmp function for test scripts 2008-03-13 00:57:52 -07:00
t4026-color.sh Fix parsing numeric color values 2008-02-06 14:02:41 -08:00
t4027-diff-submodule.sh diff: a submodule not checked out is not modified 2008-05-04 17:41:27 -07:00
t4028-format-patch-mime-headers.sh format-patch: generate MIME header as needed even when there is format.header 2008-03-15 00:06:06 -07:00
t4100-apply-stat.sh Fix apply --recount handling of no-EOL line 2008-07-05 00:37:44 -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 t/: Use "test_must_fail git" instead of "! git" 2008-07-13 13:21:26 -07:00
t4104-apply-boundary.sh tests: do not use implicit "git diff --no-index" 2008-05-24 00:01:56 -07:00
t4105-apply-fuzz.sh add test_cmp function for test scripts 2008-03-13 00:57:52 -07:00
t4109-apply-multifrag.sh tests: do not rely on external "patch" 2008-07-21 21:33:16 -07:00
t4110-apply-scan.sh tests: do not rely on external "patch" 2008-07-21 21:33:16 -07:00
t4112-apply-renames.sh apply: fix copy/rename breakage 2008-07-09 20:31:44 -07:00
t4113-apply-ending.sh t/: Use "test_must_fail git" instead of "! git" 2008-07-13 13:21:26 -07:00
t4114-apply-typechange.sh Rewrite "git-frotz" to "git frotz" 2007-07-02 22:52:14 -07:00
t4115-apply-symlink.sh tests: do not use implicit "git diff --no-index" 2008-05-24 00:01:56 -07:00
t4116-apply-reverse.sh t4116-apply-reverse.sh: use $TAR rather than tar 2008-07-23 11:35:16 -07:00
t4117-apply-reject.sh tests: do not use implicit "git diff --no-index" 2008-05-24 00:01:56 -07:00
t4118-apply-empty-context.sh tests: do not use implicit "git diff --no-index" 2008-05-24 00:01:56 -07:00
t4119-apply-config.sh mask necessary whitespace policy violations in test scripts 2008-06-14 11:39:16 -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
t4123-apply-shrink.sh git-apply: do not read past the end of buffer 2007-09-05 21:58:40 -07:00
t4124-apply-ws-rule.sh Use gitattributes to define per-path whitespace rule 2007-12-06 00:45:30 -08:00
t4125-apply-ws-fuzz.sh add test_cmp function for test scripts 2008-03-13 00:57:52 -07:00
t4126-apply-empty.sh t4126: fix test that happened to work due to timing 2008-06-13 22:07:34 -07:00
t4127-apply-same-fn.sh t4127-apply-same-fn: Avoid sed -i 2008-07-04 01:36:25 -07:00
t4128-apply-root.sh git-apply --directory: make --root more similar to GNU diff 2008-07-06 19:33:08 -07:00
t4150-am.sh Rename .git/rebase to .git/rebase-apply 2008-07-21 18:51:47 -07:00
t4151-am-abort.sh update test case to protect am --skip behaviour 2008-07-24 23:09:09 -07:00
t4200-rerere.sh Merge branch 'sb/dashless' 2008-07-16 17:22:50 -07:00
t4201-shortlog.sh Redo "add test_cmp function for test scripts" 2008-03-15 01:23:26 -07:00
t4202-log.sh t/t4202-log.sh: add newline at end of file 2008-08-01 23:15:02 -07:00
t5000-tar-tree.sh Merge branch 'maint' 2008-07-25 13:56:36 -07:00
t5100-mailinfo.sh mailinfo: avoid violating strbuf assertion 2008-08-19 19:36:56 -07:00
t5300-pack-object.sh t/: Use "test_must_fail git" instead of "! git" 2008-07-13 13:21:26 -07:00
t5301-sliding-window.sh Rewrite "git-frotz" to "git frotz" 2007-07-02 22:52:14 -07:00
t5302-pack-index.sh t/: Use "test_must_fail git" instead of "! git" 2008-07-13 13:21:26 -07:00
t5303-pack-corruption-resilience.sh Fix use of "perl -i" on Windows 2008-06-25 17:21:52 -07:00
t5304-prune.sh t5304-prune: adjust file mtime based on system time rather than file mtime 2008-08-13 18:18:23 -07:00
t5305-include-tag.sh tests: do not use implicit "git diff --no-index" 2008-05-24 00:01:56 -07:00
t5400-send-pack.sh tests: do not use implicit "git diff --no-index" 2008-05-24 00:01:56 -07:00
t5401-update-hooks.sh t/: Use "test_must_fail git" instead of "! git" 2008-07-13 13:21:26 -07:00
t5402-post-merge-hook.sh Sane use of test_expect_failure 2008-02-01 20:49:34 -08:00
t5403-post-checkout-hook.sh fix t5403-post-checkout-hook.sh: built-in test in dash does not have "==" 2007-10-15 20:26:01 -04:00
t5404-tracking-branches.sh t/: Use "test_must_fail git" instead of "! git" 2008-07-13 13:21:26 -07:00
t5405-send-pack-rewind.sh send-pack: segfault fix on forced push 2007-11-08 01:43:34 -08:00
t5406-remote-rejects.sh t/: Use "test_must_fail git" instead of "! git" 2008-07-13 13:21:26 -07:00
t5500-fetch-pack.sh t/: Use "test_must_fail git" instead of "! git" 2008-07-13 13:21:26 -07:00
t5502-quickfetch.sh git-fetch: avoid local fetching from alternate (again) 2007-11-11 17:09:55 -08:00
t5503-tagfollow.sh tests: do not use implicit "git diff --no-index" 2008-05-24 00:01:56 -07:00
t5505-remote.sh t/: Use "test_must_fail git" instead of "! git" 2008-07-13 13:21:26 -07:00
t5510-fetch.sh t/: Use "test_must_fail git" instead of "! git" 2008-07-13 13:21:26 -07:00
t5511-refspec.sh add special "matching refs" refspec 2008-05-04 17:41:39 -07:00
t5512-ls-remote.sh Fix tests breaking when checkout path contains shell metacharacters 2008-05-05 14:37:02 -07:00
t5513-fetch-track.sh make sure parsed wildcard refspec ends with slash 2008-08-01 22:41:15 -07:00
t5515-fetch-merge-logic.sh Prepare testsuite for a "git clone" that packs refs 2008-06-19 15:53:13 -07:00
t5516-fetch-push.sh t/: Use "test_must_fail git" instead of "! git" 2008-07-13 13:21:26 -07:00
t5517-push-mirror.sh Add a remote.*.mirror configuration option 2008-04-20 18:49:22 -07:00
t5518-fetch-exit-status.sh builtin-fetch.c (store_updated_refs): Honor update_local_ref() return value 2008-05-28 10:47:12 -07:00
t5520-pull.sh pull --rebase: exit early when the working directory is dirty 2008-05-22 23:05:11 -07:00
t5530-upload-pack-error.sh t/: Use "test_must_fail git" instead of "! git" 2008-07-13 13:21:26 -07:00
t5540-http-push.sh Adjust for the new way of enabling the default post-update hook 2008-08-11 17:07:17 -07:00
t5600-clone-fail-cleanup.sh t/: Use "test_must_fail git" instead of "! git" 2008-07-13 13:21:26 -07:00
t5601-clone.sh clone --mirror: avoid storing repeated tags 2008-08-07 21:25:27 -07:00
t5602-clone-remote-exec.sh Propagate -u/--upload-pack option of "git clone" to transport. 2008-08-01 22:49:25 -07:00
t5700-clone-reference.sh t5700-clone-reference: Quote $U 2008-05-27 21:29:01 -07:00
t5701-clone-local.sh clone: support cloning full bundles 2008-02-29 16:27:25 -08:00
t5702-clone-options.sh test "git clone -o" 2007-12-19 14:59:18 -08:00
t5710-info-alternate.sh Fix tests breaking when checkout path contains shell metacharacters 2008-05-05 14:37:02 -07:00
t6000lib.sh Don't use the 'export NAME=value' in the test scripts. 2008-05-05 14:17:01 -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 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 add test_cmp function for test scripts 2008-03-13 00:57:52 -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 tests: do not use implicit "git diff --no-index" 2008-05-24 00:01:56 -07:00
t6007-rev-list-cherry-pick-file.sh revision walker: --cherry-pick is a limited operation 2007-09-15 16:34:11 -07:00
t6008-rev-list-submodule.sh git-submodule - make "submodule add" more strict, and document it 2008-07-14 23:35:31 -07:00
t6009-rev-list-parent.sh Make revision limiting more robust against occasional bad commit dates 2008-03-19 01:42:35 -07:00
t6010-merge-base.sh Don't use the 'export NAME=value' in the test scripts. 2008-05-05 14:17:01 -07:00
t6011-rev-list-with-bad-commit.sh restore legacy behavior for read_sha1_file() 2008-07-14 23:35:32 -07:00
t6020-merge-df.sh New test case: merge with directory/file conflicts 2005-12-03 12:29:05 -08:00
t6021-merge-criss-cross.sh t6021: add a new test for git-merge-resolve 2008-07-13 13:49:10 -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 t/: Use "test_must_fail git" instead of "! git" 2008-07-13 13:21:26 -07: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 t/: Use "test_must_fail git" instead of "! git" 2008-07-13 13:21:26 -07:00
t6025-merge-symlinks.sh t/: Use "test_must_fail git" instead of "! git" 2008-07-13 13:21:26 -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 add test_cmp function for test scripts 2008-03-13 00:57:52 -07:00
t6028-merge-up-to-date.sh git-merge: do up-to-date check also for all strategies 2007-08-27 23:48:28 -07:00
t6029-merge-subtree.sh tests: do not use implicit "git diff --no-index" 2008-05-24 00:01:56 -07:00
t6030-bisect-porcelain.sh t6030 (bisect): work around Mac OS X "ls" 2008-07-27 14:14:01 -07:00
t6031-merge-recursive.sh Fix t6031 on filesystems without working exec bit 2008-05-21 10:14:51 -07:00
t6032-merge-large-rename.sh add merge.renamelimit config option 2008-05-03 13:39:51 -07:00
t6033-merge-crlf.sh merge-recursive: respect core.autocrlf when writing out the result 2008-06-09 16:11:08 -07:00
t6040-tracking-info.sh stat_tracking_info(): clear object flags used during counting 2008-07-03 12:14:53 -07:00
t6101-rev-parse-parents.sh rev-parse: Add support for the ^! and ^@ syntax 2008-07-27 14:14:01 -07:00
t6120-describe.sh Fix describe --tags --long so it does not segfault 2008-07-02 21:21:59 -07:00
t6200-fmt-merge-msg.sh tests: do not use implicit "git diff --no-index" 2008-05-24 00:01:56 -07:00
t6300-for-each-ref.sh for-each-ref: cope with tags with incomplete lines 2008-08-20 13:29:30 -07:00
t7001-mv.sh t7001: fix "git mv" test 2008-07-28 23:02:12 -07:00
t7002-grep.sh Sane use of test_expect_failure 2008-02-01 20:49:34 -08:00
t7003-filter-branch.sh git-filter-branch.sh: Allow running in bare repositories 2008-07-23 16:57:04 -07:00
t7004-tag.sh Sync with 1.5.6.5 2008-08-06 13:50:48 -07:00
t7005-editor.sh test suite: remove useless TERM cruft in "t7005-editor.sh" 2008-04-06 20:02:43 -07:00
t7010-setup.sh Fix tests breaking when checkout path contains shell metacharacters 2008-05-05 14:37:02 -07:00
t7101-reset.sh Sane use of test_expect_failure 2008-02-01 20:49:34 -08:00
t7102-reset.sh "needs update" considered harmful 2008-07-20 17:21:32 -07:00
t7103-reset-bare.sh t/: Use "test_must_fail git" instead of "! git" 2008-07-13 13:21:26 -07:00
t7104-reset.sh git-reset --hard and git-read-tree --reset: fix read_cache_unmerged() 2008-02-21 11:45:22 -08:00
t7201-co.sh t3200,t7201: replace '!' with test_must_fail 2008-07-23 11:35:23 -07:00
t7300-clean.sh t/: Use "test_must_fail git" instead of "! git" 2008-07-13 13:21:26 -07:00
t7400-submodule-basic.sh t/: Use "test_must_fail git" instead of "! git" 2008-07-13 13:21:26 -07:00
t7401-submodule-summary.sh git-submodule summary: --for-status option 2008-04-12 20:00:45 -07:00
t7402-submodule-rebase.sh t/: Use "test_must_fail git" instead of "! git" 2008-07-13 13:21:26 -07:00
t7500-commit.sh Sync with 1.5.6.5 2008-08-06 13:50:48 -07:00
t7501-commit.sh t/: Use "test_must_fail git" instead of "! git" 2008-07-13 13:21:26 -07:00
t7502-commit.sh Compact commit template message 2008-07-31 11:20:13 -07:00
t7502-status.sh Add configuration option for default untracked files mode 2008-06-09 15:48:20 -07:00
t7503-pre-commit-hook.sh t/: Use "test_must_fail git" instead of "! git" 2008-07-13 13:21:26 -07:00
t7504-commit-msg-hook.sh t/: Use "test_must_fail git" instead of "! git" 2008-07-13 13:21:26 -07:00
t7505-prepare-commit-msg-hook.sh Fix tests breaking when checkout path contains shell metacharacters 2008-05-05 14:37:02 -07:00
t7506-status-submodule.sh is_racy_timestamp(): do not check timestamp for gitlinks 2008-05-04 17:41:27 -07:00
t7600-merge.sh merge: fix numerus bugs around "trivial merge" area 2008-08-23 18:17:22 -07:00
t7601-merge-pull-config.sh t7601: extend the 'merge picks up the best result' test 2008-07-23 11:33:40 -07:00
t7602-merge-octopus-many.sh Build in merge 2008-07-07 17:50:01 -07:00
t7603-merge-reduce-heads.sh Add new test case to ensure git-merge reduces octopus parents when possible 2008-06-30 22:45:51 -07:00
t7604-merge-custom-message.sh Add new test case to ensure git-merge prepends the custom merge message 2008-07-06 19:22:49 -07:00
t7605-merge-resolve.sh merge: fix numerus bugs around "trivial merge" area 2008-08-23 18:17:22 -07:00
t7610-mergetool.sh t/: Use "test_must_fail git" instead of "! git" 2008-07-13 13:21:26 -07:00
t7701-repack-unpack-unreachable.sh t7701-repack-unpack-unreachable.sh: check timestamp of unpacked objects 2008-07-08 16:56:07 -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_cmp function for test scripts 2008-03-13 00:57:52 -07:00
t8004-blame.sh git-blame shouldn't crash if run in an unmerged tree 2007-10-18 02:31:30 -04:00
t9001-send-email.sh t9001 (send-email): Do not use hardcoded /bin/sh in test 2008-07-19 11:17:42 -07:00
t9100-git-svn-basic.sh t/: Use "test_must_fail git" instead of "! git" 2008-07-13 13:21:26 -07:00
t9101-git-svn-props.sh Fix tests breaking when checkout path contains shell metacharacters 2008-05-05 14:37:02 -07:00
t9102-git-svn-deep-rmdir.sh Fix tests breaking when checkout path contains shell metacharacters 2008-05-05 14:37:02 -07:00
t9103-git-svn-tracked-directory-removed.sh Fix tests breaking when checkout path contains shell metacharacters 2008-05-05 14:37:02 -07:00
t9104-git-svn-follow-parent.sh Fix tests breaking when checkout path contains shell metacharacters 2008-05-05 14:37:02 -07:00
t9105-git-svn-commit-diff.sh Fix tests breaking when checkout path contains shell metacharacters 2008-05-05 14:37:02 -07:00
t9106-git-svn-commit-diff-clobber.sh Rename .git/rebase to .git/rebase-apply 2008-07-21 18:51:47 -07:00
t9106-git-svn-dcommit-clobber-series.sh t/: Use "test_must_fail git" instead of "! git" 2008-07-13 13:21:26 -07:00
t9107-git-svn-migrate.sh Fix tests breaking when checkout path contains shell metacharacters 2008-05-05 14:37:02 -07:00
t9108-git-svn-glob.sh git-svn: Allow deep branch names by supporting multi-globs 2008-08-08 16:29:56 -07:00
t9108-git-svn-multi-glob.sh git-svn: Allow deep branch names by supporting multi-globs 2008-08-08 16:29:56 -07:00
t9110-git-svn-use-svm-props.sh git-svn: find-rev and rebase for SVN::Mirror repositories 2008-07-14 23:35:31 -07:00
t9111-git-svn-use-svnsync-props.sh Fix tests breaking when checkout path contains shell metacharacters 2008-05-05 14:37:02 -07:00
t9112-git-svn-md5less-file.sh Fix tests breaking when checkout path contains shell metacharacters 2008-05-05 14:37:02 -07:00
t9113-git-svn-dcommit-new-file.sh correct access right for git-svn-dcommit test 2008-08-04 21:53:45 -07:00
t9114-git-svn-dcommit-merge.sh Fix tests breaking when checkout path contains shell metacharacters 2008-05-05 14:37:02 -07:00
t9115-git-svn-dcommit-funky-renames.sh Merge branch 'bd/tests' 2008-05-14 13:45:16 -07:00
t9116-git-svn-log.sh Fix tests breaking when checkout path contains shell metacharacters 2008-05-05 14:37:02 -07:00
t9117-git-svn-init-clone.sh Fix tests breaking when checkout path contains shell metacharacters 2008-05-05 14:37:02 -07:00
t9118-git-svn-funky-branch-names.sh Fix tests breaking when checkout path contains shell metacharacters 2008-05-05 14:37:02 -07:00
t9119-git-svn-info.sh t9119: conditionally re-enable test depending on svn(1) version 2008-08-05 21:21:19 -07:00
t9120-git-svn-clone-with-percent-escapes.sh Fix tests breaking when checkout path contains shell metacharacters 2008-05-05 14:37:02 -07:00
t9121-git-svn-fetch-renamed-dir.sh Fix tests breaking when checkout path contains shell metacharacters 2008-05-05 14:37:02 -07:00
t9122-git-svn-author.sh git-svn: test that extra blank lines aren't inserted in commit messages. 2008-06-14 11:47:56 -07:00
t9123-git-svn-rebuild-with-rewriteroot.sh git-svn: make rebuild respect rewriteRoot option 2008-06-23 17:38:08 -07:00
t9124-git-svn-dcommit-auto-props.sh git-svn: teach dcommit about svn auto-props 2008-07-25 17:54:19 -07:00
t9125-git-svn-multi-glob-branch-names.sh git-svn: Allow deep branch names by supporting multi-globs 2008-08-08 16:29:56 -07:00
t9200-git-cvsexportcommit.sh t/: Use "test_must_fail git" instead of "! git" 2008-07-13 13:21:26 -07:00
t9300-fast-import.sh t9300: replace '!' with test_must_fail 2008-08-16 23:21:18 -07:00
t9301-fast-export.sh Support copy and rename detection in fast-export. 2008-07-29 23:57:51 -07:00
t9400-git-cvsserver-server.sh cvsserver: Add testsuite for packed refs 2008-07-20 11:24:44 -07:00
t9401-git-cvsserver-crlf.sh git-cvsserver: add ability to guess -kb from contents 2008-05-16 12:05:35 -07:00
t9500-gitweb-standalone-no-errors.sh Fix tests breaking when checkout path contains shell metacharacters 2008-05-05 14:37:02 -07:00
t9600-cvsimport.sh Testsuite: Unset CVS_SERVER 2008-07-19 11:17:42 -07:00
t9700-perl-git.sh t9700: skip when Test::More is not available 2008-06-29 23:28:44 -07: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
test-lib.sh t/test-lib.sh: exit with small negagive int is ok with test_must_fail 2008-07-13 13:21:08 -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 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.

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


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.


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.