git-commit-vandalism/t
Junio C Hamano 8aa38563b2 resolve-undo: teach "update-index --unresolve" to use resolve-undo info
The update-index plumbing command had a hacky --unresolve implementation
that was written back in the days when merge was the only way for users to
end up with higher stages in the index, and assumed that stage #2 must
have come from HEAD, stage #3 from MERGE_HEAD and didn't bother to compute
the stage #1 information.

There were several issues with this approach:

 - These days, merge is not the only command, and conflicts coming from
   commands like cherry-pick, "am -3", etc. cannot be recreated by looking
   at MERGE_HEAD;

 - For a conflict that came from a merge that had renames, picking up the
   same path from MERGE_HEAD and HEAD wouldn't help recreating it, either;

 - It may have been Ok not to recreate stage #1 back when it was written,
   because "diff --ours/--theirs" were the only availble ways to review
   conflicts and they don't need stage #1 information.  "diff --cc" that
   was invented much later is a lot more useful way but it needs stage #1.

We can use resolve-undo information recorded in the index extension to
solve all of these issues.

Signed-off-by: Junio C Hamano <gitster@pobox.com>
2009-12-25 17:10:10 -08:00
..
lib-httpd test smart http fetch and push 2009-11-04 17:58:16 -08:00
t3900 t3900: use ancient iconv names for backward compatibility 2009-05-18 20:53:11 -07:00
t4013 Let --decorate show HEAD position 2009-10-12 16:22:35 -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
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
t4252 git-am: implement --reject option passed to git-apply 2009-01-23 17:00:12 -08:00
t5100 Merge branch 'ls/maint-mailinfo-no-inbody' into maint 2009-12-03 13:52:16 -08:00
t5515 git-fetch test: test tracking fetch results, not just FETCH_HEAD 2008-03-26 01:29:54 -07:00
t7004
t7500
t8005 Remove unused t/t8005/iso8859-5.txt 2009-08-29 00:50:31 -07:00
t9110
t9111
t9115
t9121 git-svn: fix following renamed paths when tracking a single path 2008-04-07 00:16:08 -07:00
t9126 git-svn: Always create a new RA when calling do_switch for svn:// 2008-09-18 19:21:40 -07:00
t9135 test case for regression caused by git-svn empty symlink fix 2009-02-11 02:02:04 -08:00
t9136 git-svn: fix delete+add branch tracking with empty files 2009-02-22 20:31:08 -08:00
t9150 git-svn: add test data for SVK merge, with script. 2009-10-26 23:45:41 -07:00
t9151 git-svn: expand the svn mergeinfo test suite, highlighting some failures 2009-12-21 02:32:46 -08:00
t9601/cvsroot Add some tests of git-cvsimport's handling of vendor branches 2009-02-23 21:56:47 -08:00
t9602 Add a test of "git cvsimport"'s handling of tags and branches 2009-02-23 21:56:48 -08:00
t9603/cvsroot cvsimport: extend testcase about patchset order to contain branches 2009-03-20 23:41:01 -07:00
t9700 t9700-perl-git.sh: Fix a test failure on Cygwin 2009-11-19 23:01:09 -08:00
valgrind valgrind: do not require valgrind 3.4.0 or newer 2009-02-05 17:48:22 -08:00
.gitattributes enable whitespace checking of test scripts 2008-06-14 11:39:16 -07:00
.gitignore Update t/.gitignore to ignore all trash directories 2008-08-18 22:43:31 -07:00
aggregate-results.sh t/aggregate-results: whitespace fix 2008-07-16 08:42:52 -07:00
annotate-tests.sh t/annotate-tests.sh: avoid passing a non-newline terminated file to sed 2009-05-06 11:50:44 -07:00
diff-lib.sh tests: do not use implicit "git diff --no-index" 2008-05-24 00:01:56 -07:00
gitweb-lib.sh t/gitweb-lib: Split HTTP response with non-GNU sed 2009-11-23 22:26:58 -08:00
lib-cvs.sh t/t9600: remove exit after test_done 2009-04-05 01:40:50 -07:00
lib-git-svn.sh git-svn: allow test setup script to support PERL env. var 2009-10-26 23:49:02 -07:00
lib-httpd.sh test-lib: fix http exit codes 2009-06-01 22:45:01 -07:00
lib-patch-mode.sh tests: disable interactive hunk selection tests if perl is not available 2009-08-18 12:28:42 -07:00
lib-read-tree-m-3way.sh
lib-rebase.sh Teach 'rebase -i' the command "reword" 2009-10-07 21:46:41 -07:00
Makefile t/Makefile: include config.mak 2009-08-09 10:51:47 -07:00
README t/README: Document GIT_TEST_INSTALLED and GIT_TEST_EXEC_PATH 2009-11-29 23:09:56 -08:00
t0000-basic.sh Use prerequisite tags to skip tests that depend on symbolic links 2009-03-22 17:26:44 +01:00
t0001-init.sh t0001-init: split the existence test from the permission test 2009-08-09 10:43:24 -07:00
t0002-gitfile.sh tests: grep portability fixes 2008-09-30 12:39:58 -07:00
t0003-attributes.sh check-attr: Add --stdin option 2008-10-12 13:21:59 -07:00
t0004-unwritable.sh Skip tests that require a filesystem that obeys POSIX permissions 2009-03-22 17:26:44 +01:00
t0005-signals.sh t0005: use SIGTERM for sigchain test 2009-01-30 01:14:26 -08:00
t0006-date.sh Fix '--relative-date' 2009-10-03 06:04:38 -04:00
t0010-racy-git.sh
t0020-crlf.sh Add a test for checking whether gitattributes is honored by checkout. 2009-03-20 09:36:16 -07:00
t0021-conversion.sh t0021: tr portability fix for Solaris 2008-03-11 21:14:59 -07:00
t0022-crlf-rename.sh tests: use $TEST_DIRECTORY to refer to the t/ directory 2008-08-17 00:41:52 -07:00
t0023-crlf-am.sh git-am: ignore --binary option 2008-08-16 02:32:36 -07:00
t0024-crlf-archive.sh Use prerequisites to skip tests that need unzip 2009-03-22 17:52:43 +01: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 parse-opt: ignore negation of OPT_NONEG for ambiguity checks 2009-09-29 07:28:47 -07:00
t0050-filesystem.sh t0050: Check whether git init detected symbolic link support correctly 2009-03-19 22:04:25 +01:00
t0055-beyond-symlinks.sh Use prerequisite tags to skip tests that depend on symbolic links 2009-03-22 17:26:44 +01:00
t0060-path-utils.sh t0060: fix whitespace in "wc -c" invocation 2009-03-23 00:18:02 -07:00
t0070-fundamental.sh Add ctype test 2009-01-17 18:30:23 -08:00
t0100-previous.sh Teach @{-1} to git merge 2009-02-13 23:46:42 -08:00
t1000-read-tree-m-3way.sh tests: use $TEST_DIRECTORY to refer to the t/ directory 2008-08-17 00:41:52 -07:00
t1001-read-tree-m-2way.sh Use 'fast-forward' all over the place 2009-10-24 23:50:28 -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
t1004-read-tree-m-u-wf.sh Use prerequisite tags to skip tests that depend on symbolic links 2009-03-22 17:26:44 +01:00
t1005-read-tree-reset.sh reset --hard/read-tree --reset -u: remove unmerged new paths 2008-10-18 10:00:59 -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 Merge branch 'maint' 2008-09-03 16:08:23 -07:00
t1008-read-tree-overlay.sh read-tree A B C: do not create a bogus index and do not segfault 2009-03-12 17:06:07 -07:00
t1009-read-tree-new-index.sh read-tree: Fix regression with creation of a new index file. 2009-08-17 09:20:52 -07:00
t1010-mktree.sh mktree --missing: allow missing objects 2009-05-10 17:31:01 -07:00
t1020-subdirectory.sh Use prerequisite tags to skip tests that depend on symbolic links 2009-03-22 17:26:44 +01:00
t1100-commit-tree-options.sh Tests: use test_cmp instead of diff where possible 2009-03-17 14:25:52 -07:00
t1200-tutorial.sh t1200: fix a timing dependent error 2009-11-25 00:00:32 -08:00
t1300-repo-config.sh Merge branch 'maint-1.6.3' into maint 2009-08-05 12:37:24 -07:00
t1301-shared-repo.sh Mark t1301 permission test to depend on POSIXPERM 2009-04-12 17:56:25 -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 Fix buffer overflow in config parser 2009-04-17 20:59:01 -07:00
t1400-update-ref.sh Tests: use test_cmp instead of diff where possible 2009-03-17 14:25:52 -07:00
t1401-symbolic-ref.sh symbolic-ref: allow refs/<whatever> in HEAD 2009-02-13 18:20:44 -08:00
t1402-check-ref-format.sh t1402: Make test executable 2009-11-02 10:46:23 -08:00
t1410-reflog.sh test-lib: Introduce test_chmod and use it instead of update-index --chmod 2009-03-19 21:47:14 +01:00
t1411-reflog-show.sh make oneline reflog dates more consistent with multiline format 2009-03-20 00:57:27 -07:00
t1420-lost-found.sh
t1450-fsck.sh Test fsck a bit harder 2009-02-20 00:02:48 -08:00
t1500-rev-parse.sh t1500: more 'git rev-parse --git-dir' tests 2009-02-14 21:29:50 -08:00
t1501-worktree.sh worktree: don't segfault with an absolute pathspec without a work tree 2009-12-16 12:45:25 -08:00
t1502-rev-parse-parseopt.sh parse-opt: make PARSE_OPT_STOP_AT_NON_OPTION available to git rev-parse 2009-06-13 17:08:37 -07:00
t1503-rev-parse-verify.sh tests: use "git xyzzy" form (t0000 - t3599) 2008-09-03 12:41:46 -07:00
t1504-ceiling-dirs.sh Tests on Windows: $(pwd) must return Windows-style paths 2009-03-19 22:04:25 +01:00
t1505-rev-parse-last.sh t1505: remove debugging cruft 2009-01-25 00:38:37 -08:00
t2000-checkout-cache-clash.sh check_path(): allow symlinked directories to checkout-index --prefix 2009-08-18 03:32:45 -07:00
t2001-checkout-cache-clash.sh Use prerequisite tags to skip tests that depend on symbolic links 2009-03-22 17:26:44 +01: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 Use prerequisite tags to skip tests that depend on symbolic links 2009-03-22 17:26:44 +01:00
t2004-checkout-cache-temp.sh Use prerequisite tags to skip tests that depend on symbolic links 2009-03-22 17:26:44 +01:00
t2005-checkout-index-symlinks.sh Avoid using non-portable echo -n in tests. 2008-10-31 21:38:48 -07:00
t2007-checkout-symlink.sh Use prerequisite tags to skip tests that depend on symbolic links 2009-03-22 17:26:44 +01: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
t2011-checkout-invalid-head.sh git checkout: do not allow switching to a tree-ish that is not a commit 2009-01-03 13:34:19 -08:00
t2012-checkout-last.sh interpret_nth_last_branch(): avoid traversing the reflog twice 2009-01-19 15:35:21 -08:00
t2013-checkout-submodule.sh Fix 'git checkout <submodule>' to update the index 2009-04-02 13:16:42 -07:00
t2014-switch.sh Revert "checkout branch: prime cache-tree fully" 2009-05-12 09:57:21 -07:00
t2015-checkout-unborn.sh checkout: do not imply "-f" on unborn branches 2009-08-25 00:02:38 -07:00
t2016-checkout-patch.sh Make test case number unique 2009-08-27 16:44:47 -07:00
t2030-unresolve-info.sh resolve-undo: teach "update-index --unresolve" to use resolve-undo info 2009-12-25 17:10:10 -08:00
t2050-git-dir-relative.sh tests: use "git xyzzy" form (t0000 - t3599) 2008-09-03 12:41:46 -07:00
t2100-update-cache-badpath.sh Use prerequisite tags to skip tests that depend on symbolic links 2009-03-22 17:26:44 +01:00
t2101-update-index-reupdate.sh tests: use "git xyzzy" form (t0000 - t3599) 2008-09-03 12:41:46 -07:00
t2102-update-index-symlinks.sh Avoid using non-portable echo -n in tests. 2008-10-31 21:38:48 -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 Use prerequisite tags to skip tests that depend on symbolic links 2009-03-22 17:26:44 +01:00
t2201-add-update-typechange.sh Use prerequisite tags to skip tests that depend on symbolic links 2009-03-22 17:26:44 +01:00
t2202-add-addremove.sh git-add --all: tests 2008-07-19 23:08:58 -07:00
t2203-add-intent.sh git add --intent-to-add: do not let an empty blob be committed by accident 2008-11-30 17:59:19 -08:00
t2300-cd-to-toplevel.sh t2300: use documented technique to invoke git-sh-setup 2009-11-29 18:00:14 -08:00
t3000-ls-files-others.sh Merge branch 'js/windows-tests' 2009-03-24 14:42:50 -07:00
t3001-ls-files-others-exclude.sh Merge branch 'maint-1.6.0' into maint-1.6.1 2009-03-12 23:36:57 -07:00
t3002-ls-files-dashpath.sh tests: do not use implicit "git diff --no-index" 2008-05-24 00:01:56 -07:00
t3003-ls-files-exclude.sh ls-files: unbreak "ls-files -i" 2009-10-30 14:41:29 -07:00
t3010-ls-files-killed-modified.sh Use prerequisite tags to skip tests that depend on symbolic links 2009-03-22 17:26:44 +01:00
t3020-ls-files-error-unmatch.sh tests: use "git xyzzy" form (t0000 - t3599) 2008-09-03 12:41:46 -07:00
t3030-merge-recursive.sh refuse to merge during a merge 2009-06-01 19:42:17 -07:00
t3031-merge-criscross.sh merge-recursive: never leave index unmerged while recursing 2009-05-09 21:05:52 -07:00
t3040-subprojects-basic.sh 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 Use prerequisite tags to skip tests that depend on symbolic links 2009-03-22 17:26:44 +01:00
t3101-ls-tree-dirname.sh t3101: test more ls-tree options 2009-11-16 21:35:26 -08:00
t3200-branch.sh Merge branch 'bc/maint-1.6.1-branch-deleted-was' 2009-03-26 00:26:47 -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 show-branch: fix segfault when showbranch.default exists 2009-10-04 14:44:34 -07:00
t3203-branch-output.sh add basic branch display tests 2009-02-18 19:59:21 -08:00
t3210-pack-refs.sh do not force write of packed refs 2008-11-05 14:09:43 -08:00
t3300-funny-names.sh Suppress some bash redirection error messages 2008-08-26 16:25:30 -07:00
t3301-notes.sh Teach "-m <msg>" and "-F <file>" to "git notes edit" 2009-10-19 18:59:43 -07:00
t3302-notes-index-expensive.sh t3302-notes-index-expensive: Speed up create_repo() 2009-10-19 19:00:24 -07:00
t3303-notes-subtrees.sh Add selftests verifying concatenation of multiple notes for the same commit 2009-10-19 19:00:24 -07:00
t3304-notes-mixed.sh Fix crasher on encountering SHA1-like non-note in notes tree 2009-12-03 10:10:35 -08:00
t3400-rebase.sh Allow mailsplit (and hence git-am) to handle mails with CRLF line-endings 2009-08-05 12:14:00 -07:00
t3401-rebase-partial.sh tests: use "git xyzzy" form (t0000 - t3599) 2008-09-03 12:41:46 -07:00
t3402-rebase-merge.sh
t3403-rebase-skip.sh tests: use "git xyzzy" form (t0000 - t3599) 2008-09-03 12:41:46 -07:00
t3404-rebase-interactive.sh Teach 'rebase -i' the command "reword" 2009-10-07 21:46:41 -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 git-rebase: Add --stat and --no-stat for producing diffstat on rebase 2009-03-02 23:22:32 -08:00
t3407-rebase-abort.sh tests: use "git xyzzy" form (t0000 - t3599) 2008-09-03 12:41:46 -07:00
t3408-rebase-multi-line.sh rebase: do not munge commit log message 2008-04-16 12:50:48 -07:00
t3409-rebase-preserve-merges.sh t3409 t4107 t7406 t9150: use dashless commands 2009-11-29 23:09:47 -08:00
t3410-rebase-preserve-dropped-merges.sh Simplify t3410 2009-01-28 20:17:17 -08:00
t3411-rebase-preserve-around-merges.sh tests: use "$TEST_DIRECTORY" instead of ".." 2009-08-09 10:48:39 -07:00
t3412-rebase-root.sh t3412: further simplify setting of GIT_EDITOR 2009-02-03 21:07:11 -08:00
t3413-rebase-hook.sh test-suite: Make test script numbers unique 2009-03-14 12:44:20 -07:00
t3414-rebase-preserve-onto.sh tests: use "$TEST_DIRECTORY" instead of ".." 2009-08-09 10:48:39 -07:00
t3500-cherry.sh tests: use "git xyzzy" form (t0000 - t3599) 2008-09-03 12:41:46 -07:00
t3501-revert-cherry-pick.sh t3501: check that commits are actually done 2009-01-15 14:22:12 -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
t3504-cherry-pick-rerere.sh Make cherry-pick use rerere for conflict resolution. 2008-08-11 16:42:49 -07:00
t3505-cherry-pick-empty.sh t3505: fix abuse of test_expect_code 2009-06-21 02:01:28 -07:00
t3600-rm.sh t3600: Use test prerequisite tags 2009-03-22 17:25:47 +01:00
t3700-add.sh Merge branch 'maint' 2009-06-22 00:44:34 -07:00
t3701-add-interactive.sh Merge branch 'jk/maint-add-p-delete-fix' into maint 2009-12-08 22:37:50 -08:00
t3702-add-edit.sh t3702: fix reliance on SHELL_PATH being '/bin/sh' 2009-04-27 18:23:55 -07:00
t3800-mktag.sh tests: use "git xyzzy" form (t0000 - t3599) 2008-09-03 12:41:46 -07:00
t3900-i18n-commit.sh t3900: use ancient iconv names for backward compatibility 2009-05-18 20:53:11 -07:00
t3901-8859-1.txt
t3901-i18n-patch.sh t3901: Use ISO8859-1 instead of ISO-8859-1 for backward compatibility 2009-05-18 20:53:17 -07:00
t3901-utf8.txt
t3902-quoted.sh Suppress some bash redirection error messages 2008-08-26 16:25:30 -07:00
t3903-stash.sh stash: simplify defaulting to "save" and reject unknown options 2009-09-01 22:03:11 -07:00
t3904-stash-patch.sh Implement 'git stash save --patch' 2009-08-15 15:19:31 -07:00
t4000-diff-format.sh tests: use $TEST_DIRECTORY to refer to the t/ directory 2008-08-17 00:41:52 -07:00
t4001-diff-rename.sh tests: use $TEST_DIRECTORY to refer to the t/ directory 2008-08-17 00:41:52 -07:00
t4002-diff-basic.sh Test that diff can read from stdin 2009-02-20 00:02:40 -08:00
t4003-diff-rename-1.sh tests: use $TEST_DIRECTORY to refer to the t/ directory 2008-08-17 00:41:52 -07:00
t4004-diff-rename-symlink.sh tests: remove exit after test_done call 2009-04-05 00:38:26 -07:00
t4005-diff-rename-2.sh tests: use $TEST_DIRECTORY to refer to the t/ directory 2008-08-17 00:41:52 -07:00
t4006-diff-mode.sh test-lib: Introduce test_chmod and use it instead of update-index --chmod 2009-03-19 21:47:14 +01:00
t4007-rename-3.sh Avoid "diff-index --cached" optimization under --find-copies-harder 2009-05-25 11:35:29 -07:00
t4008-diff-break-rewrite.sh Use prerequisite tags to skip tests that depend on symbolic links 2009-03-22 17:26:44 +01:00
t4009-diff-rename-4.sh tests: use $TEST_DIRECTORY to refer to the t/ directory 2008-08-17 00:41:52 -07:00
t4010-diff-pathspec.sh Merge branch 'bs/maint-1.6.0-tree-walk-prefix' into maint-1.6.1 2009-05-03 15:01:19 -07:00
t4011-diff-symlink.sh tests: remove exit after test_done call 2009-04-05 00:38:26 -07:00
t4012-diff-binary.sh MinGW: fix diff --no-index /dev/null ... 2009-03-07 20:36:16 -08:00
t4013-diff-various.sh git-log: allow --decorate[=short|full] 2009-08-26 12:05:58 -07:00
t4014-format-patch.sh Merge branch 'fc/maint-format-patch-pathspec-dashes' into maint 2009-12-03 13:54:25 -08:00
t4015-diff-whitespace.sh Merge branch 'jc/maint-1.6.0-blank-at-eof' (early part) into jc/maint-blank-at-eof 2009-09-15 03:28:08 -07:00
t4016-diff-quote.sh Suppress some bash redirection error messages 2008-08-26 16:25:30 -07:00
t4017-diff-retval.sh Fix t4017-diff-retval for white-space from wc 2008-06-29 15:11:50 -07:00
t4018-diff-funcname.sh t4018-diff-funcname: add cpp xfuncname pattern to syntax test 2009-05-05 22:49:02 -07:00
t4019-diff-wserror.sh diff --whitespace: fix blank lines at end 2009-09-14 22:18:36 -07:00
t4020-diff-external.sh tests: use "$TEST_DIRECTORY" instead of ".." 2009-08-09 10:48:39 -07:00
t4021-format-patch-numbered.sh Merge branch 'jm/format-patch-no-auto-n-when-k-is-given' into maint 2009-05-25 19:03:52 -07:00
t4022-diff-rewrite.sh tests: use $TEST_DIRECTORY to refer to the t/ directory 2008-08-17 00:41:52 -07:00
t4023-diff-rename-typechange.sh tests: remove exit after test_done call 2009-04-05 00:38:26 -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 ignore unknown color configuration 2009-12-16 12:45:16 -08:00
t4027-diff-submodule.sh Merge branch 'maint-1.6.0' into maint-1.6.1 2009-04-29 13:43:13 -07:00
t4028-format-patch-mime-headers.sh format-patch: generate MIME header as needed even when there is format.header 2008-03-15 00:06:06 -07:00
t4029-diff-trailing-space.sh t4029: use sh instead of bash 2009-05-06 18:16:26 -07:00
t4030-diff-textconv.sh Merge branch 'jc/maint-1.6.0-split-diff-metainfo' into jc/maint-split-diff-metainfo 2009-01-27 01:08:02 -08:00
t4031-diff-rewrite-binary.sh Fix t4031 2008-12-10 11:39:07 -08:00
t4032-diff-inter-hunk-context.sh diff: add option to show context between close hunks 2008-12-29 01:05:21 -08:00
t4033-diff-patience.sh Introduce the diff option '--patience' 2009-01-07 13:37:07 -08:00
t4034-diff-words.sh Give the hunk comment its own color 2009-11-28 10:05:44 -08:00
t4035-diff-quiet.sh test-suite: Make test script numbers unique 2009-03-14 12:44:20 -07:00
t4036-format-patch-signer-mime.sh test-suite: Make test script numbers unique 2009-03-14 12:44:20 -07:00
t4037-diff-r-t-dirs.sh diff-tree -r -t: include added/removed directories in the output 2009-06-13 17:06:09 -07:00
t4038-diff-combined.sh diff --cc: a lost line at the beginning of the file is shown incorrectly 2009-07-22 15:38:22 -07:00
t4039-diff-assume-unchanged.sh Prevent diff machinery from examining assume-unchanged entries on worktree 2009-08-11 23:17:55 -07:00
t4041-diff-submodule.sh add tests for git diff --submodule 2009-10-23 17:07:33 -07:00
t4100-apply-stat.sh tests: use $TEST_DIRECTORY to refer to the t/ directory 2008-08-17 00:41:52 -07:00
t4101-apply-nonl.sh tests: use $TEST_DIRECTORY to refer to the t/ directory 2008-08-17 00:41:52 -07:00
t4102-apply-rename.sh Skip tests that fail if the executable bit is not handled by the filesystem 2009-03-22 17:26:44 +01:00
t4103-apply-binary.sh tests: use "git xyzzy" form (t3600 - t6999) 2008-09-03 14:13:59 -07:00
t4104-apply-boundary.sh git-apply: Loosen "match_beginning" logic 2008-08-30 13:23:02 -07:00
t4105-apply-fuzz.sh add test_cmp function for test scripts 2008-03-13 00:57:52 -07:00
t4106-apply-stdin.sh Resurrect "git apply --flags -" to read from the standard input 2009-01-09 22:21:36 -08:00
t4107-apply-ignore-whitespace.sh t3409 t4107 t7406 t9150: use dashless commands 2009-11-29 23:09:47 -08: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 tests: remove exit after test_done call 2009-04-05 00:38:26 -07:00
t4115-apply-symlink.sh tests: remove exit after test_done call 2009-04-05 00:38:26 -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 t4118: avoid sed invocation on file without terminating newline 2009-05-06 11:49:14 -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
t4121-apply-diffs.sh
t4122-apply-symlink-inside.sh tests: remove exit after test_done call 2009-04-05 00:38:26 -07:00
t4123-apply-shrink.sh
t4124-apply-ws-rule.sh Merge branch 'jc/maint-1.6.0-blank-at-eof' (early part) into jc/maint-blank-at-eof 2009-09-15 03:28:08 -07: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 tests: use "git xyzzy" form (t3600 - t6999) 2008-09-03 14:13:59 -07:00
t4128-apply-root.sh builtin-apply.c: pay attention to -p<n> when determining the name 2009-11-26 19:02:24 -08:00
t4129-apply-samemode.sh Skip tests that fail if the executable bit is not handled by the filesystem 2009-03-22 17:26:44 +01:00
t4130-apply-criss-cross-rename.sh tests: make test-apply-criss-cross-rename more robust 2009-04-20 13:47:02 -07:00
t4131-apply-fake-ancestor.sh apply, fmt-merge-msg: use relative filenames 2009-05-23 15:45:52 -07:00
t4132-apply-removal.sh apply: notice creation/removal patches produced by GNU diff 2009-07-11 06:41:15 -07:00
t4150-am.sh am: allow individual e-mail files as input 2009-08-10 16:54:23 -07:00
t4151-am-abort.sh format-patch: autonumber by default 2008-10-18 07:18:03 -07:00
t4200-rerere.sh t4200: convert sed expression which operates on non-text file to perl 2009-05-06 16:43:29 -07:00
t4201-shortlog.sh t4201: use ISO8859-1 rather than ISO-8859-1 2009-12-03 10:06:13 -08:00
t4202-log.sh strbuf_add_wrapped_text(): factor out strbuf_add_indented_text() 2009-11-22 16:22:02 -08:00
t4203-mailmap.sh Change current mailmap usage to do matching on both name and email of author/committer. 2009-02-08 12:36:54 -08:00
t4204-patch-id.sh test-suite: Make test script numbers unique 2009-03-14 12:44:20 -07:00
t4252-am-options.sh git-am: implement --reject option passed to git-apply 2009-01-23 17:00:12 -08:00
t5000-tar-tree.sh Git archive and trailing "/" in prefix 2009-10-08 22:17:07 -07:00
t5001-archive-attr.sh archive test: attributes 2009-04-17 21:05:49 -07:00
t5100-mailinfo.sh git am/mailinfo: Don't look at in-body headers when rebasing 2009-11-20 23:14:02 -08:00
t5300-pack-object.sh Merge branch 'jc/maint-1.6.0-pack-directory' into maint-1.6.1 2009-03-21 22:53:36 -07:00
t5301-sliding-window.sh tests: use "git xyzzy" form (t3600 - t6999) 2008-09-03 14:13:59 -07:00
t5302-pack-index.sh t5302: Use prerequisite tags to skip 64-bit offset tests 2009-03-22 17:26:44 +01:00
t5303-pack-corruption-resilience.sh sha1_file: Fix infinite loop when pack is corrupted 2009-10-14 13:39:37 -07:00
t5304-prune.sh test local clone by copying 2009-09-13 13:22:29 -07:00
t5305-include-tag.sh tests: use "git xyzzy" form (t3600 - t6999) 2008-09-03 14:13:59 -07:00
t5306-pack-nobase.sh pack-objects: Allow missing base objects when creating thin packs 2008-08-12 15:39:46 -07:00
t5307-pack-missing-commit.sh revision traversal and pack: notice and die on missing commit 2009-02-11 01:29:52 -08:00
t5400-send-pack.sh receive-pack: receive.denyDeleteCurrent 2009-02-10 22:26:49 -08:00
t5401-update-hooks.sh tests: use "git xyzzy" form (t3600 - t6999) 2008-09-03 14:13:59 -07:00
t5402-post-merge-hook.sh tests: use "git xyzzy" form (t3600 - t6999) 2008-09-03 14:13:59 -07:00
t5403-post-checkout-hook.sh disable post-checkout test on Cygwin 2009-03-17 13:36:24 -07: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 Fix fetch/pull when run without --update-head-ok 2008-10-13 10:46:03 -07: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 Merge branch 'np/maint-1.6.3-deepen' 2009-08-28 19:38:56 -07:00
t5502-quickfetch.sh quickfetch(): Prevent overflow of the rev-list command line 2009-07-10 23:53:17 -07:00
t5503-tagfollow.sh tests: remove exit after test_done call 2009-04-05 00:38:26 -07:00
t5505-remote.sh Merge branch 'bg/fetch-multi' 2009-11-23 00:03:15 -08:00
t5506-remote-groups.sh Teach the --all option to 'git fetch' 2009-11-10 01:01:06 -08:00
t5510-fetch.sh remote: fix use-after-free error detected by glibc in ref_remove_duplicates 2009-11-14 16:03:06 -08:00
t5511-refspec.sh Support '*' in the middle of a refspec 2009-03-07 12:19:28 -08: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
t5514-fetch-multiple.sh Add the configuration option skipFetchAll 2009-11-10 01:01:07 -08:00
t5515-fetch-merge-logic.sh test-lib: Simplify test counting. 2009-03-19 21:47:14 +01:00
t5516-fetch-push.sh Add url.<base>.pushInsteadOf: URL rewriting for push only 2009-09-08 01:18:46 -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 Use 'fast-forward' all over the place 2009-10-24 23:50:28 -07:00
t5519-push-alternates.sh revision traversal: allow UNINTERESTING objects to be missing 2009-01-28 11:00:28 -08:00
t5520-pull.sh allow pull --rebase on branch yet to be born 2009-08-12 15:50:09 -07:00
t5521-pull-options.sh Teach/Fix pull/fetch -q/-v options 2008-11-14 17:18:32 -08:00
t5522-pull-symlink.sh tests: remove exit after test_done call 2009-04-05 00:38:26 -07:00
t5530-upload-pack-error.sh Merge branch 'js/run-command-updates' 2009-08-10 22:14:57 -07:00
t5531-deep-submodule-push.sh tests: make all test files executable 2009-10-02 04:00:02 -04:00
t5540-http-push.sh test smart http fetch and push 2009-11-04 17:58:16 -08:00
t5541-http-push.sh test smart http fetch and push 2009-11-04 17:58:16 -08:00
t5550-http-fetch.sh test smart http fetch and push 2009-11-04 17:58:16 -08:00
t5551-http-fetch.sh t5551-http-fetch: Work around broken Accept header in libcurl 2009-11-09 16:41:13 -08:00
t5560-http-backend.sh http-backend: Protect GIT_PROJECT_ROOT from /../ requests 2009-11-09 16:37:33 -08:00
t5600-clone-fail-cleanup.sh tests: use "git xyzzy" form (t3600 - t6999) 2008-09-03 14:13:59 -07:00
t5601-clone.sh Merge branch 'maint-1.6.2' into maint-1.6.3 2009-09-03 09:42:38 -07:00
t5602-clone-remote-exec.sh t5602: Work around path mangling on MSYS 2009-03-19 21:47:15 +01:00
t5700-clone-reference.sh t5700-clone-reference: Quote $U 2008-05-27 21:29:01 -07:00
t5701-clone-local.sh t5701: do not get stuck in empty-push/ 2009-04-27 16:33:53 -07:00
t5702-clone-options.sh Implement git clone -v 2008-10-09 11:26:17 -07:00
t5704-bundle.sh bundle: allow rev-list options to exclude annotated tags 2009-01-05 10:47:07 -08:00
t5705-clone-2gb.sh Add an (optional, since expensive) test for >2gb clones 2009-03-07 20:27:48 -08:00
t5706-clone-branch.sh clone: add --branch option to select a different HEAD 2009-08-26 19:36:20 -07: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
t6002-rev-list-bisect.sh tests: use $TEST_DIRECTORY to refer to the t/ directory 2008-08-17 00:41:52 -07:00
t6003-rev-list-topo-order.sh tests: use $TEST_DIRECTORY to refer to the t/ directory 2008-08-17 00:41:52 -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
t6006-rev-list-format.sh Merge branch 'jc/pretty-lf' 2009-11-30 14:44:22 -08:00
t6007-rev-list-cherry-pick-file.sh
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 git-merge-base/git-show-branch --merge-base: Documentation and test 2009-08-05 10:29:37 -07:00
t6011-rev-list-with-bad-commit.sh restore legacy behavior for read_sha1_file() 2008-07-14 23:35:32 -07:00
t6012-rev-list-simplify.sh Topo-sort before --simplify-merges 2008-08-03 17:47:16 -07:00
t6013-rev-list-reverse-parents.sh t6013: replace use of 'tac' with equivalent Perl 2008-08-31 16:34:11 -07:00
t6014-rev-list-all.sh revision walker: include a detached HEAD in --all 2009-01-17 22:01:37 -08:00
t6015-rev-list-show-all-parents.sh graph API: fix bug in graph_is_interesting() 2009-08-21 12:41:25 -07:00
t6016-rev-list-graph-simplify-history.sh Add tests for rev-list --graph with options that simplify history 2009-08-24 14:39:29 -07:00
t6017-rev-list-stdin.sh Add trivial tests for --stdin option to log family 2009-11-23 00:49:47 -08:00
t6020-merge-df.sh Add a reminder test case for a merge with F/D transition 2009-07-29 10:26:10 -07: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
t6023-merge-file.sh Merge branch 'cb/maint-1.6.0-xdl-merge-fix' into maint 2009-06-02 07:48:44 -07:00
t6024-recursive-merge.sh Remove filename from conflict markers 2009-07-01 19:46:30 -07:00
t6025-merge-symlinks.sh Avoid using non-portable echo -n in tests. 2008-10-31 21:38:48 -07:00
t6026-merge-attr.sh Merge branch 'mv/merge-recursive' 2008-09-25 09:49:19 -07:00
t6027-merge-binary.sh tests: use $TEST_DIRECTORY to refer to the t/ directory 2008-08-17 00:41:52 -07:00
t6028-merge-up-to-date.sh Use 'fast-forward' all over the place 2009-10-24 23:50: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 git-bisect: call the found commit "*the* first bad commit" 2009-08-26 12:05:57 -07:00
t6031-merge-recursive.sh Skip tests that fail if the executable bit is not handled by the filesystem 2009-03-22 17:26:44 +01: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
t6034-merge-rename-nocruft.sh test-suite: Make test script numbers unique 2009-03-14 12:44:20 -07:00
t6035-merge-dir-to-symlink.sh t6035-merge-dir-to-symlink depends on SYMLINKS prerequisite 2009-08-09 10:37:24 -07:00
t6036-recursive-corner-cases.sh merge-recursive: don't segfault while handling rename clashes 2009-07-30 19:25:05 -07:00
t6040-tracking-info.sh Merge branch 'mg/track' 2009-05-23 01:44:00 -07:00
t6050-replace.sh replace: use a GIT_NO_REPLACE_OBJECTS env variable 2009-11-20 22:08:10 -08:00
t6101-rev-parse-parents.sh tests: use $TEST_DIRECTORY to refer to the t/ directory 2008-08-17 00:41:52 -07:00
t6120-describe.sh describe: do not use unannotated tag even if exact match 2009-11-20 21:58:11 -08:00
t6200-fmt-merge-msg.sh Merge branch 'sb/maint-1.6.2-opt-filename-fix' into maint 2009-06-02 07:47:03 -07:00
t6300-for-each-ref.sh for-each-ref: utilize core.warnAmbiguousRefs for :short-format 2009-04-13 09:36:52 -07:00
t7001-mv.sh Use prerequisite tags to skip tests that depend on symbolic links 2009-03-22 17:26:44 +01:00
t7002-grep.sh Merge branch 'bc/grep-i-F' into maint 2009-12-03 13:51:26 -08:00
t7003-filter-branch.sh filter-branch: nearest-ancestor rewriting outside subdir filter 2009-11-13 11:26:43 -08:00
t7004-tag.sh t7004: Use prerequisite tags to skip tests that need gpg 2009-03-22 17:52:43 +01:00
t7005-editor.sh Provide a build time default-editor setting 2009-11-13 12:20:54 -08:00
t7007-show.sh git-show: do not segfault when showing a bad tag 2008-12-15 01:29:44 -08:00
t7010-setup.sh Fix tests breaking when checkout path contains shell metacharacters 2008-05-05 14:37:02 -07:00
t7060-wtstatus.sh status: show worktree status of conflicted paths separately 2009-08-06 21:16:01 -07:00
t7101-reset.sh Merge branch 'maint' 2008-09-03 16:08:23 -07:00
t7102-reset.sh reset: make the reminder output consistent with "checkout" 2009-08-21 21:19:35 -07:00
t7103-reset-bare.sh reset: improve worktree safety valves 2009-12-05 10:28:20 -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
t7105-reset-patch.sh Implement 'git reset --patch' 2009-08-15 15:17:47 -07:00
t7201-co.sh test: checkout shouldn't say that HEAD has moved if it didn't 2009-05-16 19:49:25 -07:00
t7300-clean.sh clean: require double -f options to nuke nested git repository and work tree 2009-07-29 12:22:30 -07:00
t7400-submodule-basic.sh git submodule add: make the <path> parameter optional 2009-09-22 12:24:49 -07:00
t7401-submodule-summary.sh git submodule summary: add --files option 2009-08-14 19:50:11 -07:00
t7402-submodule-rebase.sh t/: Use "test_must_fail git" instead of "! git" 2008-07-13 13:21:26 -07:00
t7403-submodule-sync.sh tests: add a testcase for "git submodule sync" 2008-10-02 18:38:37 -07:00
t7405-submodule-merge.sh merge-recursive: do not die on a conflicting submodule 2009-04-29 16:50:21 -07:00
t7406-submodule-update.sh t3409 t4107 t7406 t9150: use dashless commands 2009-11-29 23:09:47 -08:00
t7407-submodule-foreach.sh git clone: Add --recursive to automatically checkout (nested) submodules 2009-08-20 16:59:50 -07:00
t7408-submodule-reference.sh Make test number t7406- unique 2009-08-21 09:56:31 -07:00
t7500-commit.sh commit: -F overrides -t 2009-05-23 15:45:52 -07:00
t7501-commit.sh Do not use VISUAL editor on dumb terminals 2009-11-13 12:15:28 -08:00
t7502-commit.sh builtin-commit.c: fix logic to omit empty line before existing footers 2009-11-06 23:17:26 -08:00
t7503-pre-commit-hook.sh Skip tests that require a filesystem that obeys POSIX permissions 2009-03-22 17:26:44 +01:00
t7504-commit-msg-hook.sh Skip tests that require a filesystem that obeys POSIX permissions 2009-03-22 17:26:44 +01:00
t7505-prepare-commit-msg-hook.sh tests: use "git xyzzy" form (t7200 - t9001) 2008-09-03 14:51:48 -07:00
t7506-status-submodule.sh tests: use "git xyzzy" form (t7200 - t9001) 2008-09-03 14:51:48 -07:00
t7507-commit-verbose.sh status: show "-v" diff even for initial commit 2008-11-12 13:55:17 -08:00
t7508-status.sh test-suite: Make test script numbers unique 2009-03-14 12:44:20 -07:00
t7509-commit.sh commit -c/-C/--amend: reset timestamp and authorship to committer with --reset-author 2009-11-04 16:59:15 -08:00
t7600-merge.sh Teach 'git merge' and 'git pull' the option --ff-only 2009-10-30 16:02:26 -07:00
t7601-merge-pull-config.sh tests: use "git xyzzy" form (t7200 - t9001) 2008-09-03 14:51:48 -07:00
t7602-merge-octopus-many.sh tests: use "git xyzzy" form (t7200 - t9001) 2008-09-03 14:51:48 -07:00
t7603-merge-reduce-heads.sh t7603: add new testcases to ensure builtin-commit uses reduce_heads() 2008-09-10 16:11:05 -07:00
t7604-merge-custom-message.sh merge: do not add standard message when message is given with -m option 2009-12-02 10:02:08 -08:00
t7605-merge-resolve.sh tests: use "git xyzzy" form (t7200 - t9001) 2008-09-03 14:51:48 -07:00
t7606-merge-custom.sh tests: use "git foo" without dash in strings 2008-09-09 22:59:00 -07:00
t7607-merge-overwrite.sh merge-recursive: do not clobber untracked working tree garbage 2008-12-15 02:39:57 -08:00
t7608-merge-messages.sh merge: indicate remote tracking branches in merge message 2009-08-09 12:34:21 -07:00
t7610-mergetool.sh mergetool: fix running mergetool in sub-directories 2009-01-31 10:28:33 -08:00
t7700-repack.sh git repack: keep commits hidden by a graft 2009-07-24 09:10:16 -07:00
t7701-repack-unpack-unreachable.sh Windows: Fix intermittent failures of t7701 2009-01-28 10:31:04 -08:00
t7800-difftool.sh t7800-difftool: fix the effectless GIT_DIFFTOOL_PROMPT test 2009-10-24 17:21:24 -07:00
t8001-annotate.sh tests: use $TEST_DIRECTORY to refer to the t/ directory 2008-08-17 00:41:52 -07:00
t8002-blame.sh tests: use $TEST_DIRECTORY to refer to the t/ directory 2008-08-17 00:41:52 -07:00
t8003-blame.sh Prevent git blame from segfaulting on a missing author name 2009-12-22 11:51:17 -08:00
t8004-blame.sh
t8005-blame-i18n.sh Merge branch 'maint' 2009-07-25 02:16:25 -07:00
t9001-send-email.sh t9001: use older Getopt::Long boolean prefix '--no' rather than '--no-' 2009-12-03 10:07:17 -08:00
t9100-git-svn-basic.sh git-svn: let 'dcommit $rev' work on $rev instead of HEAD 2009-06-25 00:38:16 -07:00
t9101-git-svn-props.sh git-svn: ignore leading blank lines in svn:ignore 2009-08-10 02:35:55 -07:00
t9102-git-svn-deep-rmdir.sh git-svn testsuite: use standard configuration for Subversion tools 2009-05-21 00:31:07 -07:00
t9103-git-svn-tracked-directory-removed.sh git-svn testsuite: use standard configuration for Subversion tools 2009-05-21 00:31:07 -07:00
t9104-git-svn-follow-parent.sh svn: allow branches outside of refs/remotes 2009-08-12 22:17:56 -07:00
t9105-git-svn-commit-diff.sh git-svn testsuite: use standard configuration for Subversion tools 2009-05-21 00:31:07 -07:00
t9106-git-svn-commit-diff-clobber.sh git-svn testsuite: use standard configuration for Subversion tools 2009-05-21 00:31:07 -07:00
t9107-git-svn-migrate.sh svn: allow branches outside of refs/remotes 2009-08-12 22:17:56 -07:00
t9108-git-svn-glob.sh git-svn testsuite: use standard configuration for Subversion tools 2009-05-21 00:31:07 -07:00
t9109-git-svn-multi-glob.sh git-svn testsuite: use standard configuration for Subversion tools 2009-05-21 00:31:07 -07:00
t9110-git-svn-use-svm-props.sh t/t91XX git-svn tests: run "git svn" not "git-svn" 2008-09-08 14:22:58 -07:00
t9111-git-svn-use-svnsync-props.sh t/t91XX git-svn tests: run "git svn" not "git-svn" 2008-09-08 14:22:58 -07:00
t9112-git-svn-md5less-file.sh tests: use "git foo" without dash in strings 2008-09-09 22:59:00 -07:00
t9113-git-svn-dcommit-new-file.sh git-svn testsuite: use standard configuration for Subversion tools 2009-05-21 00:31:07 -07:00
t9114-git-svn-dcommit-merge.sh git-svn testsuite: use standard configuration for Subversion tools 2009-05-21 00:31:07 -07:00
t9115-git-svn-dcommit-funky-renames.sh git svn: attempt to create empty dirs on clone+rebase 2009-11-15 19:30:06 -08:00
t9116-git-svn-log.sh git-svn testsuite: use standard configuration for Subversion tools 2009-05-21 00:31:07 -07:00
t9117-git-svn-init-clone.sh git-svn testsuite: use standard configuration for Subversion tools 2009-05-21 00:31:07 -07:00
t9118-git-svn-funky-branch-names.sh git-svn testsuite: use standard configuration for Subversion tools 2009-05-21 00:31:07 -07:00
t9119-git-svn-info.sh git-svn testsuite: use standard configuration for Subversion tools 2009-05-21 00:31:07 -07:00
t9120-git-svn-clone-with-percent-escapes.sh svn: assume URLs from the command-line are URI-encoded 2009-08-18 20:47:37 -07:00
t9121-git-svn-fetch-renamed-dir.sh t/t91XX git-svn tests: run "git svn" not "git-svn" 2008-09-08 14:22:58 -07:00
t9122-git-svn-author.sh git-svn testsuite: use standard configuration for Subversion tools 2009-05-21 00:31:07 -07:00
t9123-git-svn-rebuild-with-rewriteroot.sh git-svn testsuite: use standard configuration for Subversion tools 2009-05-21 00:31:07 -07:00
t9124-git-svn-dcommit-auto-props.sh git-svn testsuite: use standard configuration for Subversion tools 2009-05-21 00:31:07 -07:00
t9125-git-svn-multi-glob-branch-names.sh git-svn testsuite: use standard configuration for Subversion tools 2009-05-21 00:31:07 -07:00
t9126-git-svn-follow-deleted-readded-directory.sh git-svn: Always create a new RA when calling do_switch for svn:// 2008-09-18 19:21:40 -07:00
t9127-git-svn-partial-rebuild.sh git-svn testsuite: use standard configuration for Subversion tools 2009-05-21 00:31:07 -07:00
t9128-git-svn-cmd-branch.sh git-svn testsuite: use standard configuration for Subversion tools 2009-05-21 00:31:07 -07:00
t9129-git-svn-i18n-commitencoding.sh t9139 uses ancient, backwards-compatible iconv names 2009-05-30 22:30:55 -07:00
t9130-git-svn-authors-file.sh git svn: add authorsfile test case for ~/.gitconfig 2009-11-14 14:43:59 -08:00
t9131-git-svn-empty-symlink.sh Use prerequisite tags to skip tests that depend on symbolic links 2009-03-22 17:26:44 +01:00
t9132-git-svn-broken-symlink.sh Use prerequisite tags to skip tests that depend on symbolic links 2009-03-22 17:26:44 +01:00
t9133-git-svn-nested-git-repo.sh git-svn testsuite: use standard configuration for Subversion tools 2009-05-21 00:31:07 -07:00
t9134-git-svn-ignore-paths.sh git-svn testsuite: use standard configuration for Subversion tools 2009-05-21 00:31:07 -07:00
t9135-git-svn-moved-branch-empty-file.sh svn: initial "master" points to trunk if possible 2009-08-12 21:41:09 -07:00
t9136-git-svn-recreated-branch-empty-file.sh git-svn: fix delete+add branch tracking with empty files 2009-02-22 20:31:08 -08:00
t9137-git-svn-dcommit-clobber-series.sh git-svn testsuite: use standard configuration for Subversion tools 2009-05-21 00:31:07 -07:00
t9138-git-svn-authors-prog.sh svn: properly escape arguments for authors-prog 2009-09-13 01:28:07 -07:00
t9139-git-svn-non-utf8-commitencoding.sh t9139 uses ancient, backwards-compatible iconv names 2009-05-30 22:30:55 -07:00
t9140-git-svn-reset.sh git svn: rename tests that had conflicting numbers 2009-07-19 22:50:06 -07:00
t9141-git-svn-multiple-branches.sh git svn: the branch command no longer needs the full path 2009-07-25 04:09:43 -07:00
t9142-git-svn-shallow-clone.sh t9142: stop httpd after the test 2009-07-25 04:09:44 -07:00
t9143-git-svn-gc.sh svn: allow branches outside of refs/remotes 2009-08-12 22:17:56 -07:00
t9144-git-svn-old-rev_map.sh svn: allow branches outside of refs/remotes 2009-08-12 22:17:56 -07:00
t9145-git-svn-master-branch.sh svn: initial "master" points to trunk if possible 2009-08-12 21:41:09 -07:00
t9146-git-svn-empty-dirs.sh t9146: use 'svn_cmd' wrapper 2009-12-19 23:06:20 -08:00
t9150-svk-mergetickets.sh t3409 t4107 t7406 t9150: use dashless commands 2009-11-29 23:09:47 -08:00
t9151-svn-mergeinfo.sh git-svn: detect cherry-picks correctly. 2009-12-21 02:32:53 -08:00
t9152-svn-empty-dirs-after-gc.sh git svn: add test for a git svn gc followed by a git svn mkdirs 2009-12-23 11:58:05 -08:00
t9200-git-cvsexportcommit.sh cvsexportcommit: reorder tests to quiet intermittent failure 2009-07-18 16:57:49 -07:00
t9300-fast-import.sh fast-import: Add support for importing commit notes 2009-10-19 19:00:24 -07:00
t9301-fast-export.sh Add new fast-export testcases 2009-06-27 14:10:10 -07:00
t9400-git-cvsserver-server.sh Make sure $PERL_PATH is defined when the test suite is run. 2009-11-17 08:37:03 -08:00
t9401-git-cvsserver-crlf.sh Make sure $PERL_PATH is defined when the test suite is run. 2009-11-17 08:37:03 -08:00
t9500-gitweb-standalone-no-errors.sh gitweb: split test suite into library and tests 2009-08-27 19:56:02 -07:00
t9501-gitweb-standalone-http-status.sh Merge branch 'mr/gitweb-snapshot' 2009-11-23 22:28:31 -08:00
t9502-gitweb-standalone-parse-output.sh gitweb: Smarter snapshot names 2009-11-08 19:22:45 -08:00
t9600-cvsimport.sh Merge branch 'hv/cvsps-tests' 2009-07-29 10:39:57 -07:00
t9601-cvsimport-vendor-branch.sh Add some tests of git-cvsimport's handling of vendor branches 2009-02-23 21:56:47 -08:00
t9602-cvsimport-branches-tags.sh Add a test of "git cvsimport"'s handling of tags and branches 2009-02-23 21:56:48 -08:00
t9603-cvsimport-patchsets.sh cvsimport: extend testcase about patchset order to contain branches 2009-03-20 23:41:01 -07:00
t9700-perl-git.sh Make sure $PERL_PATH is defined when the test suite is run. 2009-11-17 08:37:03 -08:00
test4012.png
test9200a.png
test9200b.png
test-lib.sh Do not use VISUAL editor on dumb terminals 2009-11-13 12:15:28 -08: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, or by setting GIT_TEST_OPTS
appropriately before running "make".

--verbose::
	This makes the test more verbose.  Specifically, the
	command being run and their output if any are also
	output.

--debug::
	This may help the person who is developing a new test.
	It causes the command defined with test_debug to run.

--immediate::
	This causes the test to immediately exit upon the first
	failed test.

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

--valgrind::
	Execute all Git binaries with valgrind and exit with status
	126 on errors (just like regular tests, this will only stop
	the test script when running under -i).  Valgrind errors
	go to stderr, so you might want to pass the -v option, too.

	Since it makes no sense to run the tests with --valgrind and
	not see any output, this option implies --verbose.  For
	convenience, it also implies --tee.

--tee::
	In addition to printing the test output to the terminal,
	write it to files named 't/test-results/$TEST_NAME.out'.
	As the names depend on the tests' file names, it is safe to
	run the tests with this option in parallel.

You can also set the GIT_TEST_INSTALLED environment variable to
the bindir of an existing git installation to test that installation.
You still need to have built this git sandbox, from which various
test-* support programs, templates, and perl libraries are used.
If your installed git is incomplete, it will silently test parts of
your built version instead.

When using GIT_TEST_INSTALLED, you can also set GIT_TEST_EXEC_PATH to
override the location of the dashed-form subcommands (what
GIT_EXEC_PATH would be used for during normal operation).
GIT_TEST_EXEC_PATH defaults to `$GIT_TEST_INSTALLED/git --exec-path`.


Skipping Tests
--------------

In some environments, certain tests have no way of succeeding
due to platform limitation, such as lack of 'unzip' program, or
filesystem that do not allow arbitrary sequence of non-NUL bytes
as pathnames.

You should be able to say something like

    $ GIT_SKIP_TESTS=t9200.8 sh ./t9200-git-cvsexport-commit.sh

and even:

    $ GIT_SKIP_TESTS='t[0-4]??? t91?? t9200.8' make

to omit such tests.  The value of the environment variable is a
SP separated list of patterns that tells which tests to skip,
and either can match the "t[0-9]{4}" part to skip the whole
test, or t[0-9]{4} followed by ".$number" to say which
particular test to skip.

Note that some tests in the existing test suite rely on previous
test item, so you cannot arbitrarily disable one and expect the
remainder of test to check what the test originally was intended
to check.


Naming Tests
------------

The test files are named as:

	tNNNN-commandname-details.sh

where N is a decimal digit.

First digit tells the family:

	0 - the absolute basics and global stuff
	1 - the basic commands concerning database
	2 - the basic commands concerning the working tree
	3 - the other basic commands (e.g. ls-files)
	4 - the diff commands
	5 - the pull and exporting commands
	6 - the revision tree commands (even e.g. merge-base)
	7 - the porcelainish commands concerning the working tree
	8 - the porcelainish commands concerning forensics
	9 - the git tools

Second digit tells the particular command we are testing.

Third digit (optionally) tells the particular switch or group of switches
we are testing.

If you create files under t/ directory (i.e. here) that is not
the top-level test script, never name the file to match the above
pattern.  The Makefile here considers all such files as the
top-level test script and tries to run all of them.  A care is
especially needed if you are creating a common test library
file, similar to test-lib.sh, because such a library file may
not be suitable for standalone execution.


Writing Tests
-------------

The test script is written as a shell script.  It should start
with the standard "#!/bin/sh" with copyright notices, and an
assignment to variable 'test_description', like this:

	#!/bin/sh
	#
	# Copyright (c) 2005 Junio C Hamano
	#

	test_description='xxx test (option --frotz)

	This test registers the following structure in the cache
	and tries to run git-ls-files with option --frotz.'


Source 'test-lib.sh'
--------------------

After assigning test_description, the test script should source
test-lib.sh like this:

	. ./test-lib.sh

This test harness library does the following things:

 - If the script is invoked with command line argument --help
   (or -h), it shows the test_description and exits.

 - Creates an empty test directory with an empty .git/objects
   database and chdir(2) into it.  This directory is 't/trash directory'
   if you must know, but I do not think you care.

 - Defines standard test helper functions for your scripts to
   use.  These functions are designed to make all scripts behave
   consistently when command line arguments --verbose (or -v),
   --debug (or -d), and --immediate (or -i) is given.


End with test_done
------------------

Your script will be a sequence of tests, using helper functions
from the test harness library.  At the end of the script, call
'test_done'.


Test harness library
--------------------

There are a handful helper functions defined in the test harness
library for your script to use.

 - test_expect_success <message> <script>

   This takes two strings as parameter, and evaluates the
   <script>.  If it yields success, test is considered
   successful.  <message> should state what it is testing.

   Example:

	test_expect_success \
	    'git-write-tree should be able to write an empty tree.' \
	    'tree=$(git-write-tree)'

 - test_expect_failure <message> <script>

   This is NOT the opposite of test_expect_success, but is used
   to mark a test that demonstrates a known breakage.  Unlike
   the usual test_expect_success tests, which say "ok" on
   success and "FAIL" on failure, this will say "FIXED" on
   success and "still broken" on failure.  Failures from these
   tests won't cause -i (immediate) to stop.

 - test_debug <script>

   This takes a single argument, <script>, and evaluates it only
   when the test script is started with --debug command line
   argument.  This is primarily meant for use during the
   development of a new test script.

 - test_done

   Your test script must have test_done at the end.  Its purpose
   is to summarize successes and failures in the test script and
   exit with an appropriate error code.

 - test_tick

   Make commit and tag names consistent by setting the author and
   committer times to defined stated.  Subsequent calls will
   advance the times by a fixed amount.

 - test_commit <message> [<filename> [<contents>]]

   Creates a commit with the given message, committing the given
   file with the given contents (default for both is to reuse the
   message string), and adds a tag (again reusing the message
   string as name).  Calls test_tick to make the SHA-1s
   reproducible.

 - test_merge <message> <commit-or-tag>

   Merges the given rev using the given message.  Like test_commit,
   creates a tag and calls test_tick before committing.

Tips for Writing Tests
----------------------

As with any programming projects, existing programs are the best
source of the information.  However, do _not_ emulate
t0000-basic.sh when writing your tests.  The test is special in
that it tries to validate the very core of GIT.  For example, it
knows that there will be 256 subdirectories under .git/objects/,
and it knows that the object ID of an empty tree is a certain
40-byte string.  This is deliberately done so in t0000-basic.sh
because the things the very basic core test tries to achieve is
to serve as a basis for people who are changing the GIT internal
drastically.  For these people, after making certain changes,
not seeing failures from the basic test _is_ a failure.  And
such drastic changes to the core GIT that even changes these
otherwise supposedly stable object IDs should be accompanied by
an update to t0000-basic.sh.

However, other tests that simply rely on basic parts of the core
GIT working properly should not have that level of intimate
knowledge of the core GIT internals.  If all the test scripts
hardcoded the object IDs like t0000-basic.sh does, that defeats
the purpose of t0000-basic.sh, which is to isolate that level of
validation in one place.  Your test also ends up needing
updating when such a change to the internal happens, so do _not_
do it and leave the low level of validation to t0000-basic.sh.