git-commit-vandalism/t
Junio C Hamano 948dd346fd diff-index: careful when inspecting work tree items
Earlier, if you changed a staged path into a directory in the work tree,
we happily ran lstat(2) on it and found that it exists, and declared that
the user changed it to a gitlink.

This is wrong for two reasons:

 (1) It may be a directory, but it may not be a submodule, and in the
     latter case, the change we need to report is "the blob at the path
     has disappeared".  We need to check with resolve_gitlink_ref() to be
     consistent with what "git add" and "git update-index --add" does.

 (2) lstat(2) may have succeeded only because a leading component of the
     path was turned into a symbolic link that points at something that
     exists in the work tree.  In such a case, the path itself does not
     exist anymore, as far as the index is concerned.

This fixes these breakages in diff-index that the previous patch has
exposed.

Signed-off-by: Junio C Hamano <gitster@pobox.com>
2008-03-30 22:22:09 -07:00
..
lib-httpd http-push: add regression tests 2008-02-27 15:38:40 -08:00
t3900 Rename t3900 test vector file 2006-12-27 17:38:02 -08:00
t4013 format-patch: wrap cover-letter's shortlog sensibly 2008-03-02 15:27:27 -08:00
t4020 t4020: don't use grep -a 2008-03-13 00:57:53 -07:00
t4100 Replace the word 'update-cache' by 'update-index' everywhere 2007-11-30 15:09:40 -08:00
t4101 Make t4101-apply-nonl bring along its patches 2006-06-17 16:06:21 -07:00
t5100 mailinfo: feed only one line to handle_filter() for QP input 2008-02-15 22:16:34 -08: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
.gitattributes Define the project whitespace policy 2008-02-11 13:23:15 -08:00
.gitignore gitignore: Ignore some more boring things. 2006-03-05 11:26:18 -08:00
annotate-tests.sh make t8001 work on Mac OS X again 2007-03-06 17:09:53 -08:00
diff-lib.sh more tr portability test script fixes 2008-03-13 00:57:52 -07:00
lib-git-svn.sh Make git-svn tests behave better on OS X 2008-03-22 17:53:12 -07:00
lib-httpd.sh http-push: add regression tests 2008-02-27 15:38:40 -08:00
lib-read-tree-m-3way.sh Rewrite "git-frotz" to "git frotz" 2007-07-02 22:52:14 -07:00
Makefile Use $(RM) in Makefiles instead of 'rm -f' 2007-07-14 23:31:01 -07:00
README Sane use of test_expect_failure 2008-02-01 20:49:34 -08:00
t0000-basic.sh Fix make_absolute_path() for parameters without a slash 2008-03-02 01:58:31 -08:00
t0001-init.sh init: show "Reinit" message even in an (existing) empty repository 2008-03-25 00:34:05 -07:00
t0003-attributes.sh add test_cmp function for test scripts 2008-03-13 00:57:52 -07:00
t0010-racy-git.sh Racy GIT (part #2) 2005-12-20 12:12:18 -08:00
t0020-crlf.sh more tr portability test script fixes 2008-03-13 00:57:52 -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 Fix racy-git handling in git-write-tree. 2007-08-24 18:53:02 -07:00
t0030-stripspace.sh grep portability fix: don't use "-e" or "-q" 2008-03-13 00:57:52 -07:00
t0040-parse-options.sh parse-options: new option type to treat an option-like parameter as an argument. 2008-03-02 14:07:47 -08:00
t0050-filesystem.sh t0050: perl portability fix 2008-03-13 00:57:40 -07:00
t1000-read-tree-m-3way.sh t1000: use "test_must_fail git frotz", not "! git frotz" 2008-03-16 14:13:04 -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 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
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 Sane use of test_expect_failure 2008-02-01 20:49:34 -08:00
t1300-repo-config.sh more tr portability test script fixes 2008-03-13 00:57:52 -07:00
t1301-shared-repo.sh t1301-shared-repo.sh: fix 'stat' portability issue 2007-08-16 15:32:46 -07:00
t1302-repo-version.sh Sane use of test_expect_failure 2008-02-01 20:49:34 -08:00
t1303-wacky-config.sh config: handle lack of newline at end of file better 2008-01-02 02:28:54 -08:00
t1400-update-ref.sh Sane use of test_expect_failure 2008-02-01 20:49:34 -08:00
t1410-reflog.sh gc: call "prune --expire 2.weeks.ago" by default 2008-03-12 23:47:01 -07:00
t1420-lost-found.sh git-fsck: add --lost-found option 2007-07-02 21:34:12 -07:00
t1500-rev-parse.sh fix config reading in tests 2008-02-06 14:52:28 -08:00
t1501-worktree.sh Fix setup_git_directory_gently() with relative GIT_DIR & GIT_WORK_TREE 2007-10-16 20:18:04 -04:00
t1502-rev-parse-parseopt.sh rev-parse: fix potential bus error with --parseopt option spec handling 2008-02-25 21:40:12 -08:00
t2000-checkout-cache-clash.sh Sane use of test_expect_failure 2008-02-01 20:49:34 -08: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 Sane use of test_expect_failure 2008-02-01 20:49:34 -08: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
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 Sane use of test_expect_failure 2008-02-01 20:49:34 -08: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 add test_cmp function for test scripts 2008-03-13 00:57:52 -07:00
t2201-add-update-typechange.sh diff-index: careful when inspecting work tree items 2008-03-30 22:22:09 -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 add test_cmp function for test scripts 2008-03-13 00:57:52 -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 Sane use of test_expect_failure 2008-02-01 20:49:34 -08: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
t3050-subprojects-fetch.sh add test_cmp function for test scripts 2008-03-13 00:57:52 -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 Rewrite "git-frotz" to "git frotz" 2007-07-02 22:52:14 -07:00
t3101-ls-tree-dirname.sh get_pathspec(): die when an out-of-tree path is given 2008-03-07 00:14:42 -08:00
t3200-branch.sh Fix t3200 config 2008-03-18 22:18:57 -07:00
t3201-branch-contains.sh add test_cmp function for test scripts 2008-03-13 00:57:52 -07:00
t3210-pack-refs.sh Sane use of test_expect_failure 2008-02-01 20:49:34 -08:00
t3300-funny-names.sh more tr portability test script fixes 2008-03-13 00:57:52 -07:00
t3400-rebase.sh Sane use of test_expect_failure 2008-02-01 20:49:34 -08:00
t3401-rebase-partial.sh Rewrite "git-frotz" to "git frotz" 2007-07-02 22:52:14 -07:00
t3402-rebase-merge.sh rebase: operate on a detached HEAD 2007-11-09 01:30:31 -08:00
t3403-rebase-skip.sh Sane use of test_expect_failure 2008-02-01 20:49:34 -08:00
t3404-rebase-interactive.sh add test_cmp function for test scripts 2008-03-13 00:57:52 -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 git rebase --abort: always restore the right commit 2008-03-11 19:30:33 -07:00
t3500-cherry.sh Rewrite "git-frotz" to "git frotz" 2007-07-02 22:52:14 -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 t3502: Disambiguate between file and rev by adding -- 2007-11-05 15:04:57 -08:00
t3600-rm.sh Sane use of test_expect_failure 2008-02-01 20:49:34 -08:00
t3700-add.sh Fix per-directory exclude handing for "git add" 2007-11-16 17:05:13 -08:00
t3701-add-interactive.sh add test_cmp function for test scripts 2008-03-13 00:57:52 -07:00
t3800-mktag.sh t/t3800-mktag.sh: use test_must_fail rather than '!' 2008-03-26 14:26:52 -07:00
t3900-i18n-commit.sh Clean up "git log" format with DIFF_FORMAT_NO_OUTPUT 2007-10-15 20:24:27 -04: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 test_cmp function for test scripts 2008-03-13 00:57:52 -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 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 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 Add a --cover-letter option to format-patch 2008-02-19 21:49:31 -08:00
t4014-format-patch.sh format-patch: wrap cover-letter's shortlog sensibly 2008-03-02 15:27:27 -08:00
t4015-diff-whitespace.sh diff: Fix miscounting of --check output 2008-02-15 23:06:57 -08: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 Test interaction between diff --check and --exit-code 2007-12-14 20:52:26 -08:00
t4017-quiet.sh Add tests for --quiet option of diff programs 2007-03-16 02:13:27 -07:00
t4018-diff-funcname.sh Make test scripts executable. 2007-11-22 16:48:55 -08:00
t4019-diff-wserror.sh core.whitespace: cr-at-eol 2008-02-05 00:38:41 -08: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 add test_cmp function for test scripts 2008-03-13 00:57:52 -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 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 more tr portability test script fixes 2008-03-13 00:57:52 -07:00
t4104-apply-boundary.sh Rewrite "git-frotz" to "git frotz" 2007-07-02 22:52:14 -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 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 Sane use of test_expect_failure 2008-02-01 20:49:34 -08: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 more tr portability test script fixes 2008-03-13 00:57:52 -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 t4119: correct overeager war-on-whitespace 2007-11-24 16:46:42 -08: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
t4150-am-subdir.sh add test_cmp function for test scripts 2008-03-13 00:57:52 -07:00
t4200-rerere.sh more tr portability test script fixes 2008-03-13 00:57:52 -07:00
t4201-shortlog.sh Redo "add test_cmp function for test scripts" 2008-03-15 01:23:26 -07:00
t4202-log.sh Fix "git log --diff-filter" bug 2007-12-26 11:57:36 -08:00
t5000-tar-tree.sh archive: fix subst file generation 2007-09-13 23:20:47 -07:00
t5100-mailinfo.sh mailinfo: feed only one line to handle_filter() for QP input 2008-02-15 22:16:34 -08:00
t5300-pack-object.sh more tr portability test script fixes 2008-03-13 00:57:52 -07:00
t5301-sliding-window.sh Rewrite "git-frotz" to "git frotz" 2007-07-02 22:52:14 -07:00
t5302-pack-index.sh remove use of "tail -n 1" and "tail -1" 2008-03-13 00:57:52 -07:00
t5303-hash-object.sh hash-object: cleanup handling of command line options 2008-02-22 09:32:49 -08:00
t5304-prune.sh builtin-prune: protect objects listed on the command line 2008-03-27 15:39:57 -07:00
t5305-include-tag.sh git-pack-objects: Automatically pack annotated tags if object was packed 2008-03-04 23:28:14 -08:00
t5400-send-pack.sh grep portability fix: don't use "-e" or "-q" 2008-03-13 00:57:52 -07:00
t5401-update-hooks.sh Sane use of test_expect_failure 2008-02-01 20:49:34 -08: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 send-pack: check ref->status before updating tracking refs 2007-11-17 12:10:50 -08: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 send-pack: assign remote errors to each ref 2007-11-17 12:10:50 -08:00
t5500-fetch-pack.sh Sane use of test_expect_failure 2008-02-01 20:49:34 -08:00
t5502-quickfetch.sh git-fetch: avoid local fetching from alternate (again) 2007-11-11 17:09:55 -08:00
t5503-tagfollow.sh Teach git-fetch to exploit server side automatic tag following 2008-03-04 23:28:15 -08:00
t5505-remote.sh builtin-remote: Fix missing newline at end of listing of pushed branches 2008-03-23 17:11:33 -07:00
t5510-fetch.sh add test_cmp function for test scripts 2008-03-13 00:57:52 -07:00
t5511-refspec.sh Tighten refspec processing 2008-03-26 00:10:55 -07:00
t5512-ls-remote.sh add test_cmp function for test scripts 2008-03-13 00:57:52 -07:00
t5515-fetch-merge-logic.sh git-fetch test: test tracking fetch results, not just FETCH_HEAD 2008-03-26 01:29:54 -07:00
t5516-fetch-push.sh Merge branch 'db/push-single-with-HEAD' 2008-02-27 11:54:28 -08:00
t5517-push-mirror.sh Add tests for git push'es mirror mode 2007-11-12 18:22:09 -08:00
t5520-pull.sh pull --rebase: be cleverer with rebased upstream branches 2008-01-26 18:24:24 -08:00
t5530-upload-pack-error.sh Sane use of test_expect_failure 2008-02-01 20:49:34 -08:00
t5540-http-push.sh http-push: add regression tests 2008-02-27 15:38:40 -08:00
t5600-clone-fail-cleanup.sh Sane use of test_expect_failure 2008-02-01 20:49:34 -08:00
t5700-clone-reference.sh fetch: if not fetching from default remote, ignore default merge 2007-10-16 01:24:18 -04: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 Sane use of test_expect_failure 2008-02-01 20:49:34 -08:00
t6000lib.sh t6000lib: re-fix tr portability 2008-03-14 17:53:22 -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 custom pretty format: tolerate empty e-mail address 2008-01-06 18:41:43 -08: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 Fix rev-list when showing objects involving submodules 2007-11-16 22:05:33 -08: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 Rewrite "git-frotz" to "git frotz" 2007-07-02 22:52:14 -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 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 xdl_merge(): introduce XDL_MERGE_ZEALOUS_ALNUM 2008-02-18 00:10:37 -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: move "git reset" to prepare for a test inside the test itself 2008-03-01 01:10:12 -08:00
t6025-merge-symlinks.sh Sane use of test_expect_failure 2008-02-01 20:49:34 -08: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 add test_cmp function for test scripts 2008-03-13 00:57:52 -07:00
t6030-bisect-porcelain.sh remove use of "tail -n 1" and "tail -1" 2008-03-13 00:57:52 -07:00
t6031-merge-recursive.sh Redo "add test_cmp function for test scripts" 2008-03-15 01:23:26 -07:00
t6101-rev-parse-parents.sh Sane use of test_expect_failure 2008-02-01 20:49:34 -08:00
t6120-describe.sh t6120 (describe): check --long properly 2008-03-03 18:29:51 -08: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
t6300-for-each-ref.sh Sane use of test_expect_failure 2008-02-01 20:49:34 -08:00
t7001-mv.sh builtin-mv: minimum fix to avoid losing files 2008-02-05 00:44:10 -08:00
t7002-grep.sh Sane use of test_expect_failure 2008-02-01 20:49:34 -08:00
t7003-filter-branch.sh t/t7003-filter-branch.sh: use test_must_fail rather than '!' 2008-03-22 17:23:29 -07:00
t7004-tag.sh Sane use of test_expect_failure 2008-02-01 20:49:34 -08:00
t7005-editor.sh launch_editor(): allow spaces in the filename 2008-03-11 19:57:56 -07:00
t7010-setup.sh add test_cmp function for test scripts 2008-03-13 00:57:52 -07:00
t7101-reset.sh Sane use of test_expect_failure 2008-02-01 20:49:34 -08:00
t7102-reset.sh builtin-reset: avoid forking "update-index --refresh" 2007-11-05 22:47:22 -08:00
t7103-reset-bare.sh git-reset: refuse to do hard reset in a bare repository 2008-01-02 02:28:54 -08: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 add test_cmp function for test scripts 2008-03-13 00:57:52 -07:00
t7300-clean.sh git-clean: add tests for relative path 2008-03-07 21:56:56 -08:00
t7400-submodule-basic.sh git-submodule: add test for the subcommand parser fix 2008-01-20 20:57:42 -08:00
t7401-submodule-summary.sh git-submodule summary: test 2008-03-11 23:20:06 -07:00
t7500-commit.sh builtin-commit --s: add a newline if the last line was not a S-o-b 2007-11-22 17:05:03 -08:00
t7501-commit.sh add test_cmp function for test scripts 2008-03-13 00:57:52 -07:00
t7502-commit.sh add test_cmp function for test scripts 2008-03-13 00:57:52 -07:00
t7502-status.sh add test_cmp function for test scripts 2008-03-13 00:57:52 -07:00
t7503-pre-commit-hook.sh Sane use of test_expect_failure 2008-02-01 20:49:34 -08:00
t7504-commit-msg-hook.sh Sane use of test_expect_failure 2008-02-01 20:49:34 -08:00
t7505-prepare-commit-msg-hook.sh t7505: use SHELL_PATH in hook 2008-03-13 00:57:53 -07:00
t7600-merge.sh add test_cmp function for test scripts 2008-03-13 00:57:52 -07:00
t7610-mergetool.sh Add a very basic test script for git mergetool 2008-03-05 12:07:04 -08: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 add test_cmp function for test scripts 2008-03-13 00:57:52 -07:00
t9100-git-svn-basic.sh Sane use of test_expect_failure 2008-02-01 20:49:34 -08:00
t9101-git-svn-props.sh Merge branch 'maint' 2007-11-16 21:30:06 -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-tracked-directory-removed.sh git-svn: handle our top-level path being deleted and later re-added 2007-12-14 12:06:23 -08:00
t9104-git-svn-follow-parent.sh git-svn: handle changed svn command-line syntax 2007-09-21 02:42:16 -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 Sane use of test_expect_failure 2008-02-01 20:49:34 -08:00
t9106-git-svn-dcommit-clobber-series.sh Sane use of test_expect_failure 2008-02-01 20:49:34 -08:00
t9107-git-svn-migrate.sh git-svn: replace .rev_db with a more space-efficient .rev_map format 2007-12-10 21:28:25 -08: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 t9112: add missing #!/bin/sh header 2008-03-13 00:57:53 -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: t9114: verify merge commit message in test 2007-11-05 12:58:39 -08: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
t9116-git-svn-log.sh add test_cmp function for test scripts 2008-03-13 00:57:52 -07:00
t9117-git-svn-init-clone.sh git-svn: add tests for command-line usage of init and clone commands 2007-11-17 13:28:21 -08:00
t9118-git-svn-funky-branch-names.sh git-svn: support for funky branch and project names over HTTP(S) 2007-11-12 00:22:49 -08:00
t9119-git-svn-info.sh disable t9119 for now. 2007-12-12 11:53:29 -08:00
t9120-git-svn-clone-with-percent-escapes.sh Don't try and percent-escape existing percent escapes in git-svn URIs 2008-03-20 23:59:12 -07:00
t9200-git-cvsexportcommit.sh add test_cmp function for test scripts 2008-03-13 00:57:52 -07:00
t9300-fast-import.sh Merge branch 'maint' to sync with 1.5.4.4 2008-03-08 20:07:57 -08:00
t9301-fast-export.sh fast-export: rename the signed tag mode 'ignore' to 'verbatim' 2007-12-03 23:43:07 -08:00
t9400-git-cvsserver-server.sh remove use of "tail -n 1" and "tail -1" 2008-03-13 00:57:52 -07:00
t9500-gitweb-standalone-no-errors.sh gitweb: Make config_to_multi return [] instead of [undef] 2007-12-16 11:56:27 -08:00
t9600-cvsimport.sh t9600-cvsimport.sh: set HOME before checking for cvsps availability 2008-03-26 16:14:52 -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 test_must_fail: 129 is a valid error code from usage() 2008-03-27 12:13:39 -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.


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