git/t
Jay Soffian 9fa8aecdeb revert.c: defer writing CHERRY_PICK_HEAD till it is safe to do so
do_pick_commit() writes out CHERRY_PICK_HEAD before invoking merge (either
via do_recursive_merge() or try_merge_command()) on the assumption that if
the merge fails it is due to conflict. However, if the tree is dirty, the
merge may not even start, aborting before do_pick_commit() can remove
CHERRY_PICK_HEAD.

Instead, defer writing CHERRY_PICK_HEAD till after merge has returned.
At this point we know the merge has either succeeded or failed due
to conflict. In either case, we want CHERRY_PICK_HEAD to be written
so that it may be picked up by the subsequent invocation of commit.

Note that do_recursive_merge() aborts if the merge cannot start, while
try_merge_command() returns a non-zero value other than 1.

Signed-off-by: Jay Soffian <jaysoffian@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2011-10-06 16:56:34 -07:00
..
lib-httpd Merge branch 'gc/http-with-non-ascii-username-url' into maint 2010-12-14 07:35:18 -08:00
t1509 Add test for using Git at root of file system 2010-02-16 08:55:56 -08:00
t3900 t3900: use ancient iconv names for backward compatibility 2009-05-18 20:53:11 -07:00
t4013 Teach --dirstat not to completely ignore rearranged lines within a file 2011-04-11 11:16:15 -07:00
t4020
t4034 t4034 (diff --word-diff): add a minimum Perl drier test vector 2011-01-18 09:44:22 -08:00
t4100
t4101
t4109
t4110
t4135 apply: handle patches with funny filename and colon in timezone 2010-11-10 08:42:40 -08:00
t4252
t5100 mailinfo: do not strip leading spaces even for a header line 2010-02-19 21:55:33 -08:00
t5515
t7004
t7500 Do not strip empty lines / trailing spaces from a commit message template 2011-05-11 11:20:28 -07:00
t8005 Remove unused t/t8005/iso8859-5.txt 2009-08-29 00:50:31 -07:00
t9110
t9111
t9115
t9121
t9126
t9135
t9136
t9150 git-svn: add test data for SVK merge, with script. 2009-10-26 23:45:41 -07:00
t9151 t9151: Add two new svn:mergeinfo test cases 2010-02-26 01:30:23 -08:00
t9153 git-svn: allow UUID to be manually remapped via rewriteUUID 2010-01-23 03:23:04 -08:00
t9154 git-svn: allow subset of branches/tags to be specified in glob spec 2010-01-23 03:23:04 -08:00
t9601/cvsroot
t9602
t9603/cvsroot
t9700 perl: command_bidi_pipe() method should set-up git environmens 2011-02-14 15:28:13 -08:00
valgrind valgrind: ignore SSE-based strlen invalid reads 2011-03-16 13:19:56 -07:00
.gitattributes
.gitignore tests: Ignore the Test::Harness .prove file 2010-07-25 23:14:48 -07:00
aggregate-results.sh t/aggregate-results: accomodate systems with small max argument list length 2010-06-02 09:36:49 -07:00
annotate-tests.sh t/annotate-tests: Use echo & cat instead of sed 2011-05-05 09:24:21 -07:00
diff-lib.sh tests: move convenience regexp to match object names to test-lib.sh 2010-01-03 21:17:16 -08:00
gitweb-lib.sh t/gitweb-lib.sh: Ensure that errors are shown for --debug --immediate 2011-02-21 10:38:40 -08:00
harness tests: Infrastructure for Git smoke testing 2010-08-18 12:42:14 -07:00
lib-cvs.sh tests: factor HOME=$(pwd) in test-lib.sh 2010-08-31 12:12:02 -07:00
lib-git-svn.sh lib-git-svn.sh: Move web-server handling code into separate function 2011-01-04 15:31:04 -08:00
lib-httpd.sh i18n: use test_i18ngrep in lib-httpd and t2019 2011-04-13 15:52:47 -07:00
lib-pager.sh t/lib-pager.sh: remove unnecessary '^' from 'expr' regular expression 2010-06-21 11:11:11 -07:00
lib-patch-mode.sh lib-patch-mode tests: change from skip_all=* to prereq skip 2010-08-18 12:43:23 -07:00
lib-prereq-FILEMODE.sh tests: Move FILEMODE prerequisite to lib-prereq-FILEMODE.sh 2010-08-18 12:43:23 -07:00
lib-read-tree-m-3way.sh
lib-read-tree.sh Teach read-tree the -n|--dry-run option 2011-05-25 15:04:25 -07:00
lib-rebase.sh rebase -i: add exec command to launch a shell command 2010-08-11 10:21:34 -07:00
lib-t6000.sh Merge branch 'gv/portable' 2010-06-21 06:02:44 -07:00
lib-terminal.sh tests: skip terminal output tests on OS X 2011-02-17 15:50:37 -08:00
Makefile t/Makefile: pass test opts to valgrind target properly 2011-06-17 11:40:39 -07:00
README Merge branch 'mk/grep-pcre' 2011-05-30 00:00:07 -07:00
t0000-basic.sh Name make_*_path functions more accurately 2011-03-17 16:08:30 -07:00
t0001-init.sh Merge branch 'maint' 2011-05-25 15:25:44 -07:00
t0002-gitfile.sh
t0003-attributes.sh Merge branch 'en/and-cascade-tests' 2010-11-24 15:51:49 -08:00
t0004-unwritable.sh t0004 (unwritable files): simplify error handling 2010-09-30 10:39:06 -07:00
t0005-signals.sh t0005: work around strange $? in ksh when program terminated by a signal 2010-07-09 16:27:31 -07:00
t0006-date.sh date: avoid "X years, 12 months" in relative dates 2011-04-20 19:23:16 -07:00
t0010-racy-git.sh
t0020-crlf.sh tests: add missing &&, batch 2 2010-11-09 14:45:22 -08:00
t0021-conversion.sh t0021: avoid getting filter killed with SIGPIPE 2010-12-22 15:18:47 -08:00
t0022-crlf-rename.sh t0022: replace non-portable literal CR 2010-01-25 16:43:28 -08:00
t0023-crlf-am.sh
t0024-crlf-archive.sh tests: add missing && 2010-11-09 11:59:49 -08:00
t0025-crlf-auto.sh Rename the "crlf" attribute "text" 2010-05-19 20:42:34 -07:00
t0026-eol-config.sh tests: add missing && 2010-11-09 11:59:49 -08:00
t0030-stripspace.sh
t0040-parse-options.sh Make <identifier> lowercase as per CodingGuidelines 2011-02-15 11:53:11 -08:00
t0050-filesystem.sh Merge branch 'maint' 2010-12-21 14:45:28 -08: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
t0061-run-command.sh tests: check error message from run_command 2011-04-20 10:08:54 -07:00
t0070-fundamental.sh Improve error messages when temporary file creation fails 2010-12-21 19:51:17 -08:00
t0080-vcs-svn.sh tests: give vcs-svn/line_buffer its own test script 2011-02-26 04:57:59 -06:00
t0081-line-buffer.sh Revert "t0081 (line-buffer): add buffering tests" 2011-03-30 13:56:09 -05:00
t0100-previous.sh
t0101-at-syntax.sh t0101: use absolute date 2010-01-28 00:58:17 -08:00
t0201-gettext-fallbacks.sh git-sh-i18n--envsubst: our own envsubst(1) for eval_gettext() 2011-05-14 20:29:05 -07:00
t556x_common Merge branch 'en/and-cascade-tests' 2010-11-24 15:51:49 -08:00
t1000-read-tree-m-3way.sh Teach read-tree the -n|--dry-run option 2011-05-25 15:04:25 -07:00
t1001-read-tree-m-2way.sh Teach read-tree the -n|--dry-run option 2011-05-25 15:04:25 -07:00
t1002-read-tree-m-u-2way.sh Teach read-tree the -n|--dry-run option 2011-05-25 15:04:25 -07:00
t1003-read-tree-prefix.sh
t1004-read-tree-m-u-wf.sh Teach read-tree the -n|--dry-run option 2011-05-25 15:04:25 -07:00
t1005-read-tree-reset.sh Teach read-tree the -n|--dry-run option 2011-05-25 15:04:25 -07:00
t1006-cat-file.sh
t1007-hash-object.sh Make hash-object more robust against malformed objects 2011-02-07 15:05:25 -08:00
t1008-read-tree-overlay.sh Teach read-tree the -n|--dry-run option 2011-05-25 15:04:25 -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 t1010-mktree: Adjust expected result to code and documentation 2010-04-17 10:30:00 -07:00
t1011-read-tree-sparse-checkout.sh Teach read-tree the -n|--dry-run option 2011-05-25 15:04:25 -07:00
t1012-read-tree-df.sh Teach read-tree the -n|--dry-run option 2011-05-25 15:04:25 -07:00
t1020-subdirectory.sh Teach read-tree the -n|--dry-run option 2011-05-25 15:04:25 -07:00
t1021-rerere-in-workdir.sh rerere: make sure it works even in a workdir attached to a young repository 2011-03-23 16:05:44 -07:00
t1050-large.sh Bigfile: teach "git add" to send a large file straight to a pack 2011-05-13 16:11:18 -07:00
t1100-commit-tree-options.sh
t1200-tutorial.sh i18n: use test_i18ncmp in t1200 and t2200 2011-04-13 15:52:47 -07:00
t1300-repo-config.sh Merge branch 'jk/maint-config-alias-fix' 2011-05-30 20:19:14 -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 tests: add missing && 2010-11-09 11:59:49 -08:00
t1303-wacky-config.sh config: support values longer than 1023 bytes 2011-04-11 14:10:06 -07:00
t1304-default-acl.sh t/t1304-default-acl: change from skip_all=* to prereq skip 2010-08-18 12:42:45 -07:00
t1400-update-ref.sh Merge branch 'jc/fix-diff-files-unmerged' into maint 2011-05-13 10:41:54 -07:00
t1401-symbolic-ref.sh tests: add missing && 2010-11-09 11:59:49 -08:00
t1402-check-ref-format.sh tests: add missing && 2010-11-09 11:59:49 -08:00
t1410-reflog.sh tests: add missing && 2010-11-09 11:59:49 -08:00
t1411-reflog-show.sh reflog: fix overriding of command line options 2011-04-01 14:42:31 -07:00
t1412-reflog-loop.sh reflogs: clear flags properly in corner case 2010-11-23 16:24:24 -08:00
t1420-lost-found.sh
t1450-fsck.sh tests: add missing && 2010-11-09 11:59:49 -08:00
t1500-rev-parse.sh
t1501-worktree.sh Merge branch 'jc/fix-diff-files-unmerged' into maint 2011-05-13 10:41:54 -07:00
t1502-rev-parse-parseopt.sh t1502 (rev-parse --parseopt): test exit code from "-h" 2010-11-09 15:00:10 -08:00
t1503-rev-parse-verify.sh t1503: Fix arithmetic expansion syntax error when using dash 2010-09-27 10:43:49 -07:00
t1504-ceiling-dirs.sh test-lib: make test_expect_code a test command 2010-10-06 13:26:11 -07:00
t1505-rev-parse-last.sh
t1506-rev-parse-diagnosis.sh t1507: avoid "${parameter<op>'word'}" inside double-quotes 2011-05-09 09:19:42 -07:00
t1507-rev-parse-upstream.sh Change incorrect "remote branch" to "remote tracking branch" in C code 2010-11-03 09:20:47 -07:00
t1508-at-combinations.sh reject @{-1} not at beginning of object name 2010-01-28 12:12:50 -08:00
t1509-root-worktree.sh shell portability: no "export VAR=VAL" 2010-10-13 11:36:36 -07:00
t1510-repo-setup.sh trace: give repo_setup trace its own key 2011-03-08 12:12:04 -08:00
t1511-rev-parse-caret.sh get_sha1: support $commit^{/regex} syntax 2010-12-14 16:50:45 -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
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
t2006-checkout-index-basic.sh checkout-index -h: show usage even in an invalid repository 2010-10-22 11:03:56 -07:00
t2007-checkout-symlink.sh tests: add missing && 2010-11-09 11:59:49 -08:00
t2008-checkout-subdir.sh
t2009-checkout-statinfo.sh
t2010-checkout-ambiguous.sh
t2011-checkout-invalid-head.sh test: use $_z40 from test-lib 2011-04-23 22:34:43 -07:00
t2012-checkout-last.sh "checkout A...B" switches to the merge base between A and B 2009-10-18 12:34:56 -07:00
t2013-checkout-submodule.sh checkout: Use submodule.*.ignore settings from .git/config and .gitmodules 2010-08-30 00:37:37 -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 tests: add missing && 2010-11-09 11:59:49 -08:00
t2017-checkout-orphan.sh tests: add missing && 2010-11-09 11:59:49 -08:00
t2018-checkout-branch.sh builtin/checkout: handle -B from detached HEAD correctly 2010-08-09 12:57:17 -07:00
t2019-checkout-ambiguous-ref.sh i18n: use test_i18ngrep in lib-httpd and t2019 2011-04-13 15:52:47 -07:00
t2020-checkout-detach.sh i18n: use test_i18ngrep in t2020, t2204, t3030, and t3200 2011-04-13 15:52:47 -07:00
t2021-checkout-overwrite.sh t2021: mark a test as fixed 2011-04-12 00:03:54 -07:00
t2030-unresolve-info.sh Make 'rerere forget' work from a subdirectory. 2010-01-21 00:42:20 -08:00
t2050-git-dir-relative.sh tests: add missing && 2010-11-09 11:59:49 -08: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: add missing && 2010-11-09 11:59:49 -08:00
t2102-update-index-symlinks.sh tests: Say "pass" rather than "ok" on empty lines for TAP 2010-06-25 10:08:24 -07:00
t2103-update-index-ignore-missing.sh
t2104-update-index-skip-worktree.sh Introduce "skip-worktree" bit in index, teach Git to get/set this bit 2009-08-23 17:11:28 -07:00
t2105-update-index-gitfile.sh t2105 (gitfile): add missing && 2010-09-09 15:58:45 -07:00
t2106-update-index-assume-unchanged.sh do not overwrite files marked "assume unchanged" 2010-05-01 12:00:44 -07:00
t2107-update-index-basic.sh t2107: mark passing test as success 2010-12-19 10:49:34 -08:00
t2200-add-update.sh Merge branch 'jc/fix-add-u-unmerged' into maint 2011-05-16 16:37:33 -07:00
t2201-add-update-typechange.sh test: use $_z40 from test-lib 2011-04-23 22:34:43 -07:00
t2202-add-addremove.sh
t2203-add-intent.sh
t2204-add-ignored.sh i18n: use test_i18ngrep in t2020, t2204, t3030, and t3200 2011-04-13 15:52:47 -07: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 t3000 (ls-files -o): modernize style 2010-07-11 23:14:17 -07:00
t3001-ls-files-others-exclude.sh tests: add missing && 2010-11-09 11:59:49 -08:00
t3002-ls-files-dashpath.sh
t3003-ls-files-exclude.sh ls-files: unbreak "ls-files -i" 2009-10-30 14:41:29 -07:00
t3004-ls-files-basic.sh ls-files -h: show usage even with corrupt index 2010-10-22 11:04:53 -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 t3020 (ls-files-error-unmatch): remove stray '1' from end of file 2010-10-03 17:55:22 -07:00
t3030-merge-recursive.sh i18n: use test_i18ngrep in t2020, t2204, t3030, and t3200 2011-04-13 15:52:47 -07:00
t3031-merge-criscross.sh merge-recursive: never leave index unmerged while recursing 2009-05-09 21:05:52 -07:00
t3032-merge-recursive-options.sh Merge branch 'jn/cherry-pick-strategy-option' 2011-02-09 16:41:16 -08:00
t3040-subprojects-basic.sh
t3050-subprojects-fetch.sh tests: add missing && 2010-11-09 11:59:49 -08:00
t3060-ls-files-with-tree.sh tests: subshell indentation stylefix 2010-09-09 15:56:20 -07:00
t3100-ls-tree-restrict.sh ls-tree $di $dir: do not mistakenly recurse into directories 2010-09-12 13:52:03 -07:00
t3101-ls-tree-dirname.sh t3101: modernise style 2010-09-12 13:46:58 -07:00
t3102-ls-tree-wildcards.sh Tweak t3102-ls-tree-wildcards to run on Windows 2011-05-12 22:35:47 -07:00
t3200-branch.sh Merge branch 'jc/fix-diff-files-unmerged' into maint 2011-05-13 10:41:54 -07:00
t3201-branch-contains.sh
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 i18n: use test_i18ncmp and test_i18ngrep in t3203, t3501 and t3507 2011-04-13 15:52:47 -07:00
t3210-pack-refs.sh pack-refs: remove newly empty directories 2010-07-07 09:11:37 -07:00
t3300-funny-names.sh tests: add missing && 2010-11-09 11:59:49 -08:00
t3301-notes.sh notes remove: --stdin reads from the standard input 2011-05-19 10:54:16 -07:00
t3302-notes-index-expensive.sh Merge branch 'ab/test-2' 2010-09-04 08:15:36 -07:00
t3303-notes-subtrees.sh notes.c: Use two newlines (instead of one) when concatenating notes 2010-11-17 13:21:29 -08:00
t3304-notes-mixed.sh builtin-notes: Deprecate the -m/-F options for "git notes edit" 2010-02-13 19:36:16 -08:00
t3305-notes-fanout.sh builtin-notes: Deprecate the -m/-F options for "git notes edit" 2010-02-13 19:36:16 -08:00
t3306-notes-prune.sh t3306,t5304: avoid clock skew issues 2011-04-14 10:47:18 -07:00
t3307-notes-man.sh tests: add missing && 2010-11-09 11:59:49 -08:00
t3308-notes-merge.sh git notes merge: Handle real, non-conflicting notes merges 2010-11-17 13:21:34 -08:00
t3309-notes-merge-auto-resolve.sh git notes merge: Add another auto-resolving strategy: "cat_sort_uniq" 2010-11-17 13:22:53 -08:00
t3310-notes-merge-manual-resolve.sh git notes merge: --commit should fail if underlying notes ref has moved 2010-11-17 13:22:49 -08:00
t3311-notes-merge-fanout.sh git notes merge: Add testcases for merging notes trees at different fanouts 2010-11-17 13:23:55 -08:00
t3400-rebase.sh rebase: use @{upstream} if no upstream specified 2011-02-10 14:45:25 -08:00
t3401-rebase-partial.sh
t3402-rebase-merge.sh t3402: test "rebase -s<strategy> -X<opt>" 2010-11-11 13:30:55 -08:00
t3403-rebase-skip.sh rebase: stricter check of standalone sub command 2011-02-10 14:08:08 -08:00
t3404-rebase-interactive.sh rebase: write a reflog entry when finishing 2011-05-27 15:52:03 -07:00
t3405-rebase-malformed.sh
t3406-rebase-message.sh tests: add missing && 2010-11-09 11:59:49 -08:00
t3407-rebase-abort.sh rebase: stricter check of standalone sub command 2011-02-10 14:08:08 -08:00
t3408-rebase-multi-line.sh tests: add missing && 2010-11-09 11:59:49 -08:00
t3409-rebase-preserve-merges.sh git-rebase--interactive.sh: preserve-merges fails on merges created with no-ff 2011-04-28 09:56:55 -07:00
t3410-rebase-preserve-dropped-merges.sh Convert "! git" to "test_must_fail git" 2010-07-20 16:47:17 -07: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 tests: add missing && 2010-11-09 11:59:49 -08:00
t3413-rebase-hook.sh
t3414-rebase-preserve-onto.sh tests: use "$TEST_DIRECTORY" instead of ".." 2009-08-09 10:48:39 -07:00
t3415-rebase-autosquash.sh Merge branch 'pn/commit-autosquash' 2010-12-03 16:13:06 -08:00
t3416-rebase-onto-threedots.sh Make test case numbers unique 2010-01-21 00:01:00 -08:00
t3417-rebase-whitespace-fix.sh tests: add missing && 2010-11-09 11:59:49 -08:00
t3418-rebase-continue.sh rebase -m: remember allow_rerere_autoupdate option 2011-02-10 14:08:09 -08:00
t3419-rebase-patch-id.sh t3419-*.sh: Fix arithmetic expansion syntax error 2010-12-21 12:26:21 -08:00
t3500-cherry.sh war on "sleep" in tests 2010-04-06 21:55:27 -07:00
t3501-revert-cherry-pick.sh i18n: use test_i18ncmp and test_i18ngrep in t3203, t3501 and t3507 2011-04-13 15:52:47 -07:00
t3502-cherry-pick-merge.sh
t3503-cherry-pick-root.sh t3503: test cherry picking and reverting root commits 2011-05-16 13:05:03 -07:00
t3504-cherry-pick-rerere.sh tests: add missing && 2010-11-09 11:59:49 -08:00
t3505-cherry-pick-empty.sh revert: fix off by one read when searching the end of a commit subject 2010-07-23 16:08:14 -07:00
t3506-cherry-pick-ff.sh builtin/revert.c: don't dereference a NULL pointer 2010-09-27 10:39:54 -07:00
t3507-cherry-pick-conflict.sh revert.c: defer writing CHERRY_PICK_HEAD till it is safe to do so 2011-10-06 16:56:34 -07:00
t3508-cherry-pick-many-commits.sh Eliminate “Finished cherry-pick/revert” message 2010-08-15 19:12:00 -07:00
t3509-cherry-pick-merge-df.sh t3509: use unconstrained initial test to setup repository. 2011-02-07 14:27:10 -08:00
t3600-rm.sh Merge branch 'jc/fix-diff-files-unmerged' into maint 2011-05-13 10:41:54 -07:00
t3700-add.sh i18n: use test_i18ncmp and test_i18ngrep in t3700, t4001 and t4014 2011-04-13 15:52:47 -07:00
t3701-add-interactive.sh Merge branch 'jc/maint-add-p-overlapping-hunks' into maint 2011-05-16 16:36:46 -07:00
t3702-add-edit.sh t3702: fix reliance on SHELL_PATH being '/bin/sh' 2009-04-27 18:23:55 -07:00
t3703-add-magic-pathspec.sh t3703: skip more tests using colons in file names on Windows 2011-06-07 08:32:14 -07:00
t3800-mktag.sh Use test_expect_success for test setups 2010-03-20 09:15:17 -07:00
t3900-i18n-commit.sh add tests of commit --squash 2010-11-04 13:53:36 -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 tests: add missing && 2010-11-09 11:59:49 -08:00
t3903-stash.sh Fix typo: existant->existent 2011-06-16 10:33:50 -07:00
t3904-stash-patch.sh stash: ensure --no-keep-index and --patch can be used in any order 2011-04-07 15:54:04 -07:00
t4000-diff-format.sh
t4001-diff-rename.sh Merge branch 'ab/i18n-fixup' 2011-05-02 15:58:40 -07:00
t4002-diff-basic.sh Merge branch 'jc/fix-diff-files-unmerged' into maint 2011-05-13 10:41:54 -07:00
t4003-diff-rename-1.sh diffcore-rename: properly honor the difference between -M and -C 2011-02-18 22:26:28 -08:00
t4004-diff-rename-symlink.sh diffcore-rename: properly honor the difference between -M and -C 2011-02-18 22:26:28 -08:00
t4005-diff-rename-2.sh diffcore-rename: properly honor the difference between -M and -C 2011-02-18 22:26:28 -08:00
t4006-diff-mode.sh tests: move convenience regexp to match object names to test-lib.sh 2010-01-03 21:17:16 -08: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 diffcore-rename: properly honor the difference between -M and -C 2011-02-18 22:26:28 -08:00
t4009-diff-rename-4.sh diffcore-rename: properly honor the difference between -M and -C 2011-02-18 22:26:28 -08:00
t4010-diff-pathspec.sh tree_entry_interesting(): optimize wildcard matching when base is matched 2011-02-03 14:08:30 -08:00
t4011-diff-symlink.sh Merge branch 'jk/no-textconv-symlink' into maint 2010-11-24 12:46:20 -08:00
t4012-diff-binary.sh rev-list: handle %x00 NUL in user format 2010-10-13 18:58:33 -07:00
t4013-diff-various.sh Teach --dirstat not to completely ignore rearranged lines within a file 2011-04-11 11:16:15 -07:00
t4014-format-patch.sh format-patch: make zero-length subject prefixes prettier 2011-05-30 11:18:59 -07:00
t4015-diff-whitespace.sh Make the tab width used for whitespace checks configurable 2010-12-01 14:47:51 -08:00
t4016-diff-quote.sh t/t4016-diff-quote: change from skip_all=* to prereq skip 2010-08-18 12:42:46 -07:00
t4017-diff-retval.sh t4017 (diff-retval): replace manual exit code check with test_expect_code 2010-10-06 13:26:11 -07:00
t4018-diff-funcname.sh userdiff/perl: tighten BEGIN/END block pattern to reject here-doc delimiters 2011-05-23 11:39:13 -07:00
t4019-diff-wserror.sh Merge branch 'js/configurable-tab' 2010-12-12 21:49:52 -08:00
t4020-diff-external.sh test: use $_z40 from test-lib 2011-04-23 22:34:43 -07:00
t4021-format-patch-numbered.sh tests: add missing && 2010-11-09 11:59:49 -08:00
t4022-diff-rewrite.sh git diff -D: omit the preimage of deletes 2011-04-02 23:52:20 -07:00
t4023-diff-rename-typechange.sh tests: implicitly skip SYMLINKS tests using <prereq> 2010-08-18 12:42:45 -07:00
t4024-diff-optimize-common.sh
t4025-hunk-header.sh
t4026-color.sh t4026 (color): remove unneeded and unchained command 2010-10-06 13:26:12 -07:00
t4027-diff-submodule.sh Merge branch 'jc/fix-diff-files-unmerged' into maint 2011-05-13 10:41:54 -07:00
t4028-format-patch-mime-headers.sh
t4029-diff-trailing-space.sh t4029: use sh instead of bash 2009-05-06 18:16:26 -07:00
t4030-diff-textconv.sh t4030, t4031: work around bogus MSYS bash path conversion 2010-01-05 23:41:51 -08:00
t4031-diff-rewrite-binary.sh diff: handle diffstat of rewritten binary files 2011-02-22 10:57:58 -08:00
t4032-diff-inter-hunk-context.sh
t4033-diff-patience.sh
t4034-diff-words.sh do not read beyond end of malloc'd buffer 2011-05-20 11:39:49 -07:00
t4035-diff-quiet.sh
t4036-format-patch-signer-mime.sh
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 combined diff: correctly handle truncated file 2010-04-17 10:23:59 -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
t4040-whitespace-status.sh Merge branch 'jk/diff-not-so-quick' 2011-06-06 11:40:14 -07:00
t4041-diff-submodule-option.sh tests: use test_cmp instead of piping to diff(1) 2010-11-14 10:57:19 -08:00
t4042-diff-textconv-caching.sh diff: cache textconv output 2010-04-02 00:05:31 -07:00
t4043-diff-rename-binary.sh diff: fix "git show -C -C" output when renaming a binary file 2010-06-06 15:14:27 -07:00
t4044-diff-index-unique-abbrev.sh diff.c: Ensure "index $from..$to" line contains unambiguous SHA1s 2010-05-31 17:44:01 -07:00
t4045-diff-relative.sh diff: strip extra "/" when stripping prefix 2010-08-11 09:46:47 -07:00
t4046-diff-unmerged.sh diff-files: show unmerged entries correctly 2011-04-23 22:35:13 -07:00
t4047-diff-dirstat.sh Mark dirstat error messages for translation 2011-04-29 11:22:56 -07:00
t4100-apply-stat.sh
t4101-apply-nonl.sh
t4102-apply-rename.sh tests: Move FILEMODE prerequisite to lib-prereq-FILEMODE.sh 2010-08-18 12:43:23 -07:00
t4103-apply-binary.sh Merge branch 'en/and-cascade-tests' 2010-11-24 15:51:49 -08:00
t4104-apply-boundary.sh apply: Remove the quick rejection test 2010-03-06 23:53:00 -08:00
t4105-apply-fuzz.sh
t4106-apply-stdin.sh
t4107-apply-ignore-whitespace.sh t3409 t4107 t7406 t9150: use dashless commands 2009-11-29 23:09:47 -08:00
t4109-apply-multifrag.sh
t4110-apply-scan.sh
t4111-apply-subdir.sh tests: add missing && 2010-11-09 11:59:49 -08:00
t4112-apply-renames.sh
t4113-apply-ending.sh
t4114-apply-typechange.sh tests: implicitly skip SYMLINKS tests using <prereq> 2010-08-18 12:42:45 -07:00
t4115-apply-symlink.sh tests: implicitly skip SYMLINKS tests using <prereq> 2010-08-18 12:42:45 -07:00
t4116-apply-reverse.sh
t4117-apply-reject.sh
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 tests: add missing && 2010-11-09 11:59:49 -08:00
t4120-apply-popt.sh t4120-apply-popt: help systems with core.filemode=false 2011-02-07 14:27:25 -08:00
t4121-apply-diffs.sh
t4122-apply-symlink-inside.sh tests: implicitly skip SYMLINKS tests using <prereq> 2010-08-18 12:42:45 -07:00
t4123-apply-shrink.sh
t4124-apply-ws-rule.sh Make the tab width used for whitespace checks configurable 2010-12-01 14:47:51 -08:00
t4125-apply-ws-fuzz.sh fix portability issues with $ in double quotes 2010-01-26 15:16:54 -08:00
t4126-apply-empty.sh
t4127-apply-same-fn.sh tests: add missing && 2010-11-09 11:59:49 -08: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 tests: Move FILEMODE prerequisite to lib-prereq-FILEMODE.sh 2010-08-18 12:43:23 -07:00
t4130-apply-criss-cross-rename.sh tests: add missing && 2010-11-09 11:59:49 -08: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: Recognize epoch timestamps with : in the timezone 2010-10-13 16:39:45 -07:00
t4133-apply-filenames.sh tests: add missing && 2010-11-09 11:59:49 -08:00
t4134-apply-submodule.sh tests: add missing && 2010-11-09 11:59:49 -08:00
t4135-apply-weird-filenames.sh apply: handle patches with funny filename and colon in timezone 2010-11-10 08:42:40 -08:00
t4150-am.sh tests: add missing && 2010-11-09 11:59:49 -08:00
t4151-am-abort.sh am --abort: keep unrelated commits since the last failure and warn 2010-12-21 11:16:28 -08:00
t4152-am-subjects.sh format-patch: preserve subject newlines with -k 2011-05-26 15:56:55 -07:00
t4200-rerere.sh Merge branch 'jn/merge-renormalize' 2010-09-03 09:43:41 -07:00
t4201-shortlog.sh tests: add missing && 2010-11-09 11:59:49 -08:00
t4202-log.sh Add log.abbrevCommit config variable 2011-05-18 12:40:15 -07:00
t4203-mailmap.sh Fix typo: existant->existent 2011-06-16 10:33:50 -07:00
t4204-patch-id.sh git-patch-id: do not trip over "no newline" markers 2011-02-17 11:56:50 -08:00
t4205-log-pretty-formats.sh Fix typo: existant->existent 2011-06-16 10:33:50 -07:00
t4206-log-follow-harder-copies.sh tests: rename duplicate t4205 2010-05-10 11:52:03 -07:00
t4207-log-decoration-colors.sh Add test for correct coloring of git log --decoration 2010-06-30 11:14:44 -07:00
t4208-log-magic-pathspec.sh t3703, t4208: add test cases for magic pathspec 2011-05-10 12:42:59 -07:00
t4252-am-options.sh tests: add missing && 2010-11-09 11:59:49 -08:00
t4253-am-keep-cr-dos.sh git-am: Add tests for --keep-cr, --no-keep-cr and am.keepcr 2010-02-28 11:10:39 -08:00
t4300-merge-tree.sh merge-tree: fix where two branches share no changes 2010-07-14 12:56:49 -07:00
t5000-tar-tree.sh Skip 'git archive --remote' test on msysGit 2010-10-01 23:08:48 +01:00
t5001-archive-attr.sh archive: abbreviate substituted commit ids again 2010-07-27 13:28:54 -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
t5150-request-pull.sh t/t5150: remove space from sed script 2010-06-02 09:30:35 -07:00
t5300-pack-object.sh tests: add missing && 2010-11-09 11:59:49 -08:00
t5301-sliding-window.sh tests: add missing && 2010-11-09 11:59:49 -08:00
t5302-pack-index.sh tests: add missing && 2010-11-09 11:59:49 -08: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 t3306,t5304: avoid clock skew issues 2011-04-14 10:47:18 -07:00
t5305-include-tag.sh
t5306-pack-nobase.sh
t5307-pack-missing-commit.sh
t5400-send-pack.sh t5400: Fix a couple of typos 2011-05-13 09:57:16 -07:00
t5401-update-hooks.sh receive-pack: Send internal errors over side-band #2 2010-02-10 09:51:07 -08:00
t5402-post-merge-hook.sh
t5403-post-checkout-hook.sh Merge branch 'maint-1.6.2' into maint-1.6.3 2010-01-18 21:29:47 -08:00
t5404-tracking-branches.sh
t5405-send-pack-rewind.sh Refuse updating the current branch in a non-bare repository via push 2009-07-29 10:15:00 -07:00
t5406-remote-rejects.sh
t5407-post-rewrite-hook.sh rebase --skip: correctly wrap-up when skipping the last patch 2010-12-22 16:50:28 -08:00
t5500-fetch-pack.sh tests: add missing && 2010-11-09 11:59:49 -08:00
t5501-fetch-push-alternates.sh fetch-pack: objects in our alternates are available to us 2011-03-17 16:18:55 -07:00
t5502-quickfetch.sh tests: add missing && 2010-11-09 11:59:49 -08:00
t5503-tagfollow.sh Merge branch 'en/and-cascade-tests' 2010-11-24 15:51:49 -08:00
t5505-remote.sh remote: allow "-t" with fetch mirrors 2011-05-26 11:38:18 -07:00
t5506-remote-groups.sh Fix typo: existant->existent 2011-06-16 10:33:50 -07:00
t5510-fetch.sh tests: add missing && 2010-11-09 11:59:49 -08:00
t5511-refspec.sh
t5512-ls-remote.sh ls-remote: the --exit-code option reports "no matching refs" 2011-05-18 14:37:46 -07:00
t5513-fetch-track.sh Replace "remote tracking" with "remote-tracking" 2010-11-03 09:19:04 -07:00
t5514-fetch-multiple.sh tests: add missing && 2010-11-09 11:59:49 -08:00
t5515-fetch-merge-logic.sh
t5516-fetch-push.sh Fix typo: existant->existent 2011-06-16 10:33:50 -07:00
t5517-push-mirror.sh Refuse updating the current branch in a non-bare repository via push 2009-07-29 10:15:00 -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 tests: add missing && 2010-11-09 11:59:49 -08:00
t5520-pull.sh pull: do not clobber untracked files on initial pull 2011-04-03 12:35:39 -07:00
t5521-pull-options.sh fetch --all/--multiple: keep all the fetched branch information 2010-02-24 11:16:36 -08:00
t5522-pull-symlink.sh tests: implicitly skip SYMLINKS tests using <prereq> 2010-08-18 12:42:45 -07:00
t5523-push-upstream.sh push: pass --progress down to git-pack-objects 2010-10-18 16:20:19 -07:00
t5524-pull-msg.sh pull: re-fix command line generation 2010-01-24 10:11:27 -08:00
t5525-fetch-tagopt.sh fetch: allow command line --tags to override config 2010-08-14 19:24:23 -07:00
t5526-fetch-submodules.sh i18n: do not overuse C_LOCALE_OUTPUT 2011-04-12 11:23:23 -07:00
t5530-upload-pack-error.sh upload-pack: Improve error message when bad ref requested 2010-08-02 15:31:59 -07:00
t5531-deep-submodule-push.sh tests: add missing && 2010-11-09 11:59:49 -08:00
t5532-fetch-proxy.sh test core.gitproxy configuration 2011-05-18 12:52:00 -07:00
t5540-http-push.sh tests: Skip tests in a way that makes sense under TAP 2010-06-25 10:08:20 -07:00
t5541-http-push.sh Merge branch 'dm/http-cleanup' 2011-05-11 11:37:38 -07:00
t5550-http-fetch.sh Merge branch 'tc/http-urls-ends-with-slash' into maint 2010-12-14 07:36:10 -08:00
t5551-http-fetch.sh smart-http: Don't change POST to GET when following redirect 2010-09-27 11:38:55 -07:00
t5560-http-backend-noserver.sh Merge branch 'maint' 2010-10-13 20:20:09 -07:00
t5561-http-backend.sh tests: Skip tests in a way that makes sense under TAP 2010-06-25 10:08:20 -07:00
t5600-clone-fail-cleanup.sh
t5601-clone.sh i18n: .git file is not a human readable message (t5601) 2011-04-13 15:52:47 -07:00
t5602-clone-remote-exec.sh t5602 (clone-remote-exec): add missing && 2010-10-06 13:26:12 -07:00
t5700-clone-reference.sh tests: use "test_cmp", not "diff", when verifying the result 2010-05-31 16:59:27 -07:00
t5701-clone-local.sh clone: die when trying to clone missing local path 2011-02-18 07:05:54 -08:00
t5702-clone-options.sh clone: use --progress to force progress reporting 2009-12-28 18:49:19 -08:00
t5704-bundle.sh bundle: detect if bundle file cannot be created 2010-08-27 16:46:26 -07:00
t5705-clone-2gb.sh t/t5705-clone-2gb: change from skip_all=* to prereq skip 2010-08-18 12:42:45 -07: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
t5800-remote-helpers.sh t/t5800-remote-helpers.sh: Skip with prereq on python <2.4 2010-08-18 12:42:45 -07:00
t6000-rev-list-misc.sh Add testcases showing how pathspecs are handled with rev-list --objects 2011-02-03 14:10:46 -08:00
t6001-rev-list-graft.sh tests: add missing && 2010-11-09 11:59:49 -08:00
t6002-rev-list-bisect.sh Move t6000lib.sh to lib-* 2010-05-07 21:36:27 -07:00
t6003-rev-list-topo-order.sh Move t6000lib.sh to lib-* 2010-05-07 21:36:27 -07:00
t6004-rev-list-path-optim.sh t6004: add pathspec globbing test for log family 2011-02-03 14:08:31 -08:00
t6005-rev-list-count.sh
t6006-rev-list-format.sh rev-list: handle %x00 NUL in user format 2010-10-13 18:58:33 -07:00
t6007-rev-list-cherry-pick-file.sh rev-list --count: separate count for --cherry-mark 2011-04-26 13:13:20 -07:00
t6008-rev-list-submodule.sh
t6009-rev-list-parent.sh tests: avoid nonportable {foo,bar} glob 2011-03-24 11:40:50 -07:00
t6010-merge-base.sh tests: eliminate unnecessary setup test assertions 2011-05-06 14:42:06 -07:00
t6011-rev-list-with-bad-commit.sh
t6012-rev-list-simplify.sh tests: move convenience regexp to match object names to test-lib.sh 2010-01-03 21:17:16 -08:00
t6013-rev-list-reverse-parents.sh
t6014-rev-list-all.sh
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 t6016 (rev-list-graph-simplify-history): add missing && 2010-10-06 13:26:12 -07:00
t6017-rev-list-stdin.sh setup_revisions(): take pathspec from command line and --stdin correctly 2011-05-11 14:43:56 -07:00
t6018-rev-list-glob.sh revisions: allow --glob and friends in parse_options-enabled commands 2011-04-21 10:56:39 -07:00
t6019-rev-list-ancestry-path.sh revision: Turn off history simplification in --ancestry-path mode 2010-06-06 10:16:37 -07:00
t6020-merge-df.sh Merge branch 'en/merge-recursive' 2010-11-29 17:52:35 -08:00
t6021-merge-criss-cross.sh
t6022-merge-rename.sh Revert "Merge branch 'en/merge-recursive'" 2011-05-19 20:33:38 -07:00
t6023-merge-file.sh merge-file: correctly find files when called in subdir 2010-10-18 16:10:57 -07:00
t6024-recursive-merge.sh tests: add missing && 2010-11-09 11:59:49 -08:00
t6025-merge-symlinks.sh
t6026-merge-attr.sh conflict-marker-size: add test and docs 2010-01-20 23:49:27 -08:00
t6027-merge-binary.sh
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: add missing && 2010-11-09 11:59:49 -08:00
t6030-bisect-porcelain.sh tests: add missing && 2010-11-09 11:59:49 -08:00
t6031-merge-recursive.sh Merge branch 'ab/test-2' 2010-09-04 08:15:36 -07:00
t6032-merge-large-rename.sh t6032: Add a test checking for excessive output from merge 2010-09-29 17:32:36 -07:00
t6033-merge-crlf.sh tests: consolidate CR removal/addition functions 2010-01-25 16:42:23 -08:00
t6034-merge-rename-nocruft.sh
t6035-merge-dir-to-symlink.sh do not overwrite untracked symlinks 2011-02-21 22:51:07 -08:00
t6036-recursive-corner-cases.sh Merge branch 'en/merge-recursive' 2010-11-29 17:52:35 -08:00
t6037-merge-ours-theirs.sh Convert "! git" to "test_must_fail git" 2010-07-20 16:47:17 -07:00
t6038-merge-text-auto.sh t6038-*.sh: Pass the -b (--binary) option to sed on cygwin 2011-01-08 23:36:37 -08:00
t6040-tracking-info.sh i18n: use test_i18ncmp and test_i18ngrep in t5541, t6040, t6120, t7004, t7012 and t7060 2011-04-13 15:52:47 -07:00
t6050-replace.sh t6050: make sure we test not just commit replacement 2011-05-15 15:23:32 -07:00
t6060-merge-index.sh merge-one-file: fix broken merges with alternate work trees 2011-04-29 15:37:43 -07:00
t6101-rev-parse-parents.sh Move t6000lib.sh to lib-* 2010-05-07 21:36:27 -07:00
t6110-rev-list-sparse.sh Merge branch 'jc/maint-rev-list-culled-boundary' 2011-03-22 21:37:59 -07:00
t6120-describe.sh i18n: use test_i18ncmp and test_i18ngrep in t5541, t6040, t6120, t7004, t7012 and t7060 2011-04-13 15:52:47 -07:00
t6200-fmt-merge-msg.sh t6200-fmt-merge-msg: Exercise '--log' to configure shortlog length 2010-09-09 11:39:26 -07:00
t6300-for-each-ref.sh for-each-ref: Field with abbreviated objectname 2010-05-18 21:49:04 -07:00
t6500-gc.sh gc -h: show usage even with broken configuration 2010-10-22 11:04:53 -07:00
t7001-mv.sh tests: add missing &&, batch 2 2010-11-09 14:45:22 -08:00
t7003-filter-branch.sh Merge branch 'bg/fix-t7003' 2010-09-16 07:43:41 -07:00
t7004-tag.sh i18n: use test_i18ncmp and test_i18ngrep in t5541, t6040, t6120, t7004, t7012 and t7060 2011-04-13 15:52:47 -07:00
t7005-editor.sh t/t7005-editor: change from skip_all=* to prereq skip 2010-08-18 12:42:45 -07:00
t7006-pager.sh Merge branch 'jk/pager-per-command' 2010-12-08 11:24:14 -08:00
t7007-show.sh
t7008-grep-binary.sh t/t7008: workaround broken handling of \000 by printf on IRIX 2010-09-09 17:11:06 -07:00
t7010-setup.sh ls-files: allow relative pathspec 2010-06-05 09:14:31 -07:00
t7011-skip-worktree-reading.sh test: use $_z40 from test-lib 2011-04-23 22:34:43 -07:00
t7012-skip-worktree-writing.sh Merge branch 'jc/fix-diff-files-unmerged' into maint 2011-05-13 10:41:54 -07:00
t7060-wtstatus.sh Merge branch 'mz/maint-rename-unmerged' into maint 2011-05-13 10:41:24 -07:00
t7101-reset.sh
t7102-reset.sh i18n: use test_i18ncmp and test_i18ngrep in t7102 and t7110 2011-04-13 15:52:47 -07:00
t7103-reset-bare.sh reset: disallow "reset --keep" outside a work tree 2010-03-06 20:06:50 -08:00
t7104-reset.sh
t7105-reset-patch.sh tests: add missing && 2010-11-09 11:59:49 -08:00
t7110-reset-merge.sh i18n: use test_i18ncmp and test_i18ngrep in t7102 and t7110 2011-04-13 15:52:47 -07:00
t7111-reset-table.sh reset: disallow using --keep when there are unmerged entries 2010-03-06 20:06:50 -08:00
t7201-co.sh i18n: use test_i18ngrep in t7201 2011-04-13 15:52:47 -07:00
t7300-clean.sh Merge branch 'ar/clean-rmdir-empty' into maint 2011-05-04 14:57:06 -07:00
t7400-submodule-basic.sh Merge branch 'tr/submodule-relative-scp-url' into maint 2011-01-19 08:26:41 -08:00
t7401-submodule-summary.sh tests: use test_cmp instead of piping to diff(1) 2010-11-14 10:57:19 -08:00
t7402-submodule-rebase.sh
t7403-submodule-sync.sh fetch/pull: recurse into submodules when necessary 2011-03-09 13:10:35 -08:00
t7405-submodule-merge.sh submodule: process conflicting submodules only once 2011-03-30 17:34:08 -07:00
t7406-submodule-update.sh Merge branch 'nm/submodule-update-force' 2011-05-02 15:58:36 -07:00
t7407-submodule-foreach.sh t7407: fix line endings for mingw build 2011-02-07 14:27:46 -08:00
t7408-submodule-reference.sh Make test number t7406- unique 2009-08-21 09:56:31 -07:00
t7500-commit.sh Merge branch 'bf/commit-template-no-cleanup' 2011-05-13 11:03:08 -07:00
t7501-commit.sh Merge branch 'ci/commit--interactive-atomic' 2011-05-16 16:47:10 -07:00
t7502-commit.sh i18n: use test_i18ngrep and test_i18ncmp in t7502 2011-04-13 16:17:50 -07: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 merge: honor prepare-commit-msg hook 2011-02-15 13:35:35 -08:00
t7506-status-submodule.sh Merge branch 'jl/submodule-conflicted-gitmodules' 2011-05-19 20:37:21 -07:00
t7507-commit-verbose.sh
t7508-status.sh Merge branch 'bc/maint-status-z-to-use-porcelain' 2011-06-06 11:40:08 -07:00
t7509-commit.sh Teach commit about CHERRY_PICK_HEAD 2011-02-21 22:58:32 -08:00
t7600-merge.sh Merge branch 'mg/merge-ff-config' 2011-05-16 16:46:23 -07:00
t7601-merge-pull-config.sh t7601 (merge-pull-config): add missing && 2010-10-06 13:26:13 -07:00
t7602-merge-octopus-many.sh tests: add missing && 2010-11-09 11:59:49 -08:00
t7603-merge-reduce-heads.sh
t7604-merge-custom-message.sh merge: --log appends shortlog to message if specified 2010-05-10 12:02:20 -07:00
t7605-merge-resolve.sh
t7606-merge-custom.sh t7606: Avoid using head as a file name 2010-08-24 09:56:34 -07:00
t7607-merge-overwrite.sh i18n: use test_i18n{cmp,grep} in t7600, t7607, t7611 and t7811 2011-04-14 14:36:14 -07:00
t7608-merge-messages.sh Change incorrect "remote branch" to "remote tracking branch" in C code 2010-11-03 09:20:47 -07:00
t7609-merge-co-error-msgs.sh use persistent memory for rejected paths 2010-12-14 08:55:13 -08:00
t7610-mergetool.sh mergetool: Teach about submodules 2011-04-13 12:21:45 -07:00
t7611-merge-abort.sh i18n: use test_i18n{cmp,grep} in t7600, t7607, t7611 and t7811 2011-04-14 14:36:14 -07:00
t7700-repack.sh tests: add missing &&, batch 2 2010-11-09 14:45:22 -08:00
t7701-repack-unpack-unreachable.sh more war on "sleep" in tests 2010-04-17 18:20:23 -07:00
t7800-difftool.sh t7800 (difftool): add missing && 2010-10-06 13:26:13 -07:00
t7810-grep.sh t7810: avoid unportable use of "echo" 2011-06-20 14:49:34 -07:00
t7811-grep-open.sh i18n: use test_i18n{cmp,grep} in t7600, t7607, t7611 and t7811 2011-04-14 14:36:14 -07:00
t8001-annotate.sh t8001: check the exit status of the command being tested 2011-03-30 12:22:05 -07:00
t8002-blame.sh blame: tolerate bogus e-mail addresses a bit better 2011-04-29 11:09:42 -07:00
t8003-blame-corner-cases.sh t800?-blame.sh: retitle uniquely 2010-12-13 11:54:39 -08:00
t8004-blame-with-conflicts.sh t800?-blame.sh: retitle uniquely 2010-12-13 11:54:39 -08:00
t8005-blame-i18n.sh Merge branch 'maint' 2009-07-25 02:16:25 -07:00
t8006-blame-textconv.sh Work around broken ln on solaris as used in t8006 2011-03-20 21:58:09 -07:00
t8007-cat-file-textconv.sh blame,cat-file --textconv: Don't assume mode is ``S_IFREF | 0664'' 2010-09-29 16:53:25 -07:00
t8008-blame-formats.sh blame: add --line-porcelain output format 2011-05-09 15:27:50 -07:00
t9001-send-email.sh Merge branch 'ao/t9001-fix' 2011-01-05 13:31:25 -08:00
t9010-svn-fe.sh tests: make sure input to sed is newline terminated 2011-03-29 02:14:23 -05:00
t9100-git-svn-basic.sh prefer test -h over test -L in shell scripts 2010-09-27 10:48:23 -07:00
t9101-git-svn-props.sh tests: subshell indentation stylefix 2010-09-09 15:56:20 -07:00
t9102-git-svn-deep-rmdir.sh tests: subshell indentation stylefix 2010-09-09 15:56:20 -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 tests: add missing && 2010-11-09 11:59:49 -08:00
t9105-git-svn-commit-diff.sh tests: subshell indentation stylefix 2010-09-09 15:56:20 -07:00
t9106-git-svn-commit-diff-clobber.sh tests: subshell indentation stylefix 2010-09-09 15:56:20 -07:00
t9107-git-svn-migrate.sh tests: subshell indentation stylefix 2010-09-09 15:56:20 -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
t9111-git-svn-use-svnsync-props.sh
t9112-git-svn-md5less-file.sh
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 tests: subshell indentation stylefix 2010-09-09 15:56:20 -07:00
t9115-git-svn-dcommit-funky-renames.sh tests: subshell indentation stylefix 2010-09-09 15:56:20 -07:00
t9116-git-svn-log.sh git-svn: Fix git svn log --show-commit 2011-05-20 09:30:09 -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 t9118 (git-svn): prevent early failure from taking down later tests 2010-07-08 20:57:53 +00:00
t9119-git-svn-info.sh t9119: do not compare "Text Last Updated" line from "svn info" 2010-12-06 16:30:42 -08:00
t9120-git-svn-clone-with-percent-escapes.sh tests: subshell indentation stylefix 2010-09-09 15:56:20 -07:00
t9121-git-svn-fetch-renamed-dir.sh
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 tests: add missing && 2010-11-09 11:59:49 -08:00
t9124-git-svn-dcommit-auto-props.sh tests: add missing && 2010-11-09 11:59:49 -08:00
t9125-git-svn-multi-glob-branch-names.sh Several tests: cd inside subshell instead of around 2010-09-06 14:30:53 -07:00
t9126-git-svn-follow-deleted-readded-directory.sh
t9127-git-svn-partial-rebuild.sh Several tests: cd inside subshell instead of around 2010-09-06 14:30:53 -07:00
t9128-git-svn-cmd-branch.sh Several tests: cd inside subshell instead of around 2010-09-06 14:30:53 -07:00
t9129-git-svn-i18n-commitencoding.sh tests: Skip tests in a way that makes sense under TAP 2010-06-25 10:08:20 -07:00
t9130-git-svn-authors-file.sh config: drop support for GIT_CONFIG_NOGLOBAL 2011-03-15 12:23:30 -07:00
t9131-git-svn-empty-symlink.sh prefer test -h over test -L in shell scripts 2010-09-27 10:48:23 -07: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
t9137-git-svn-dcommit-clobber-series.sh Several tests: cd inside subshell instead of around 2010-09-06 14:30:53 -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 Convert "! git" to "test_must_fail git" 2010-07-20 16:47:17 -07:00
t9140-git-svn-reset.sh Convert "! git" to "test_must_fail git" 2010-07-20 16:47:17 -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: Move call to start_httpd into the setup test 2010-12-14 11:07:52 -08:00
t9143-git-svn-gc.sh t9143: do not fail when unhandled.log.gz is not created 2010-12-10 04:18:03 +08: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 git-svn: add an option to skip the creation of empty directories 2011-04-01 12:53:18 -07:00
t9150-svk-mergetickets.sh t9150,t9151: Add rewrite-root option to init 2010-03-13 01:16:17 -08:00
t9151-svn-mergeinfo.sh tests: add missing && 2010-11-09 11:59:49 -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
t9153-git-svn-rewrite-uuid.sh git-svn: allow UUID to be manually remapped via rewriteUUID 2010-01-23 03:23:04 -08:00
t9154-git-svn-fancy-glob.sh git-svn: allow subset of branches/tags to be specified in glob spec 2010-01-23 03:23:04 -08:00
t9155-git-svn-fetch-deleted-tag.sh t9155: fix compatibility with older SVN 2010-08-19 12:14:34 -07:00
t9156-git-svn-fetch-deleted-tag-2.sh git-svn: fix fetch with deleted tag 2010-08-15 23:43:37 +00:00
t9157-git-svn-fetch-merge.sh t9157-*.sh: Make the svn version check more precise 2011-01-11 13:01:43 -08:00
t9158-git-svn-mergeinfo.sh tests: flip executable bit on t9158 2010-12-13 11:38:11 -08:00
t9200-git-cvsexportcommit.sh tests: Move FILEMODE prerequisite to lib-prereq-FILEMODE.sh 2010-08-18 12:43:23 -07:00
t9300-fast-import.sh Fix typo: existant->existent 2011-06-16 10:33:50 -07:00
t9301-fast-import-notes.sh Merge branch 'maint-1.7.0' into maint 2011-02-09 16:40:12 -08:00
t9350-fast-export.sh tests: add missing && 2010-11-09 11:59:49 -08:00
t9400-git-cvsserver-server.sh tests: add missing && 2010-11-09 11:59:49 -08:00
t9401-git-cvsserver-crlf.sh tests: add missing && 2010-11-09 11:59:49 -08:00
t9500-gitweb-standalone-no-errors.sh gitweb: do not misparse nonnumeric content tag files that contain a digit 2011-06-09 09:22:44 -07:00
t9501-gitweb-standalone-http-status.sh t/gitweb-lib.sh: Ensure that errors are shown for --debug --immediate 2011-02-21 10:38:40 -08:00
t9502-gitweb-standalone-parse-output.sh gitweb: Restructure projects list generation 2011-04-29 14:21:48 -07:00
t9600-cvsimport.sh cvsimport: handle the parsing of uppercase config options 2011-01-04 13:31:03 -08:00
t9601-cvsimport-vendor-branch.sh cvs tests: do not touch test CVS repositories shipped with source 2010-08-18 12:43:24 -07:00
t9602-cvsimport-branches-tags.sh cvs tests: do not touch test CVS repositories shipped with source 2010-08-18 12:43:24 -07:00
t9603-cvsimport-patchsets.sh Merge branch 'jl/maint-fix-test' 2010-09-06 16:46:36 -07:00
t9700-perl-git.sh tests: Skip tests in a way that makes sense under TAP 2010-06-25 10:08:20 -07:00
t9800-git-p4.sh git-p4: warn if git authorship won't be retained 2011-05-13 12:59:13 -07:00
test-lib.sh tests: link shell libraries into valgrind directory 2011-06-17 13:48:53 -07:00
test-terminal.perl Merge branch 'jk/push-progress' 2010-11-17 15:01:00 -08:00
test4012.png
test9200a.png
test9200b.png

Core GIT Tests
==============

This directory holds many test scripts for core GIT tools.  The
first part of this short document describes how to run the tests
and read their output.

When fixing the tools or adding enhancements, you are strongly
encouraged to add tests in this directory to cover what you are
trying to fix or enhance.  The later part of this short document
describes how your test scripts should be organized.


Running Tests
-------------

The easiest way to run tests is to say "make".  This runs all
the tests.

    *** t0000-basic.sh ***
    ok 1 - .git/objects should be empty after git init in an empty repo.
    ok 2 - .git/objects should have 3 subdirectories.
    ok 3 - success is reported like this
    ...
    ok 43 - very long name in the index handled sanely
    # fixed 1 known breakage(s)
    # still have 1 known breakage(s)
    # passed all remaining 42 test(s)
    1..43
    *** t0001-init.sh ***
    ok 1 - plain
    ok 2 - plain with GIT_WORK_TREE
    ok 3 - plain bare

Since the tests all output TAP (see http://testanything.org) they can
be run with any TAP harness. Here's an example of parallel testing
powered by a recent version of prove(1):

    $ prove --timer --jobs 15 ./t[0-9]*.sh
    [19:17:33] ./t0005-signals.sh ................................... ok       36 ms
    [19:17:33] ./t0022-crlf-rename.sh ............................... ok       69 ms
    [19:17:33] ./t0024-crlf-archive.sh .............................. ok      154 ms
    [19:17:33] ./t0004-unwritable.sh ................................ ok      289 ms
    [19:17:33] ./t0002-gitfile.sh ................................... ok      480 ms
    ===(     102;0  25/?  6/?  5/?  16/?  1/?  4/?  2/?  1/?  3/?  1... )===

prove and other harnesses come with a lot of useful options. The
--state option in particular is very useful:

    # Repeat until no more failures
    $ prove -j 15 --state=failed,save ./t[0-9]*.sh

You can give DEFAULT_TEST_TARGET=prove on the make command (or define it
in config.mak) to cause "make test" to run tests under prove.
GIT_PROVE_OPTS can be used to pass additional options, e.g.

    $ make DEFAULT_TEST_TARGET=prove GIT_PROVE_OPTS='--timer --jobs 16' test

You can also run each test individually from command line, like this:

    $ sh ./t3010-ls-files-killed-modified.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.
    ok 4 - git ls-files -m to show modified files.
    ok 5 - validate git ls-files -m output.
    # passed all 5 test(s)
    1..5

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.
	The "trash" directory (used to store all temporary data
	during testing) is not deleted even if there are no
	failed tests so that you can inspect its contents after
	the test finished.

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

	Note that valgrind is run with the option --leak-check=no,
	as the git process is short-lived and some errors are not
	interesting. In order to run a single command under the same
	conditions manually, you should set GIT_VALGRIND to point to
	the 't/valgrind/' directory and use the commands under
	't/valgrind/bin/'.

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

--with-dashes::
	By default tests are run without dashed forms of
	commands (like git-commit) in the PATH (it only uses
	wrappers from ../bin-wrappers).  Use this option to include
	the build directory (..) in the PATH, which contains all
	the dashed forms of commands.  This option is currently
	implied by other options like --valgrind and
	GIT_TEST_INSTALLED.

--root=<directory>::
	Create "trash" directories used to store all temporary data during
	testing under <directory>, instead of the t/ directory.
	Using this option with a RAM-based filesystem (such as tmpfs)
	can massively speed up the test suite.

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.  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.$test_name_without_dotsh', with t/ subject to change by
   the --root option documented above.

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

Do's, don'ts & things to keep in mind
-------------------------------------

Here are a few examples of things you probably should and shouldn't do
when writing tests.

Do:

 - Put all code inside test_expect_success and other assertions.

   Even code that isn't a test per se, but merely some setup code
   should be inside a test assertion.

 - Chain your test assertions

   Write test code like this:

	git merge foo &&
	git push bar &&
	test ...

   Instead of:

	git merge hla
	git push gh
	test ...

   That way all of the commands in your tests will succeed or fail. If
   you must ignore the return value of something, consider using a
   helper function (e.g. use sane_unset instead of unset, in order
   to avoid unportable return value for unsetting a variable that was
   already unset), or prepending the command with test_might_fail or
   test_must_fail.

 - Check the test coverage for your tests. See the "Test coverage"
   below.

   Don't blindly follow test coverage metrics; if a new function you added
   doesn't have any coverage, then you're probably doing something wrong,
   but having 100% coverage doesn't necessarily mean that you tested
   everything.

   Tests that are likely to smoke out future regressions are better
   than tests that just inflate the coverage metrics.

 - When a test checks for an absolute path that a git command generated,
   construct the expected value using $(pwd) rather than $PWD,
   $TEST_DIRECTORY, or $TRASH_DIRECTORY. It makes a difference on
   Windows, where the shell (MSYS bash) mangles absolute path names.
   For details, see the commit message of 4114156ae9.

Don't:

 - exit() within a <script> part.

   The harness will catch this as a programming error of the test.
   Use test_done instead if you need to stop the tests early (see
   "Skipping tests" below).

 - Break the TAP output

   The raw output from your test may be interpreted by a TAP harness. TAP
   harnesses will ignore everything they don't know about, but don't step
   on their toes in these areas:

   - Don't print lines like "$x..$y" where $x and $y are integers.

   - Don't print lines that begin with "ok" or "not ok".

   TAP harnesses expect a line that begins with either "ok" and "not
   ok" to signal a test passed or failed (and our harness already
   produces such lines), so your script shouldn't emit such lines to
   their output.

   You can glean some further possible issues from the TAP grammar
   (see http://search.cpan.org/perldoc?TAP::Parser::Grammar#TAP_Grammar)
   but the best indication is to just run the tests with prove(1),
   it'll complain if anything is amiss.

Keep in mind:

 - Inside <script> part, the standard output and standard error
   streams are discarded, and the test harness only reports "ok" or
   "not ok" to the end user running the tests. Under --verbose, they
   are shown to help debugging the tests.


Skipping tests
--------------

If you need to skip tests you should do so by using the three-arg form
of the test_* functions (see the "Test harness library" section
below), e.g.:

    test_expect_success PERL 'I need Perl' "
        '$PERL_PATH' -e 'hlagh() if unf_unf()'
    "

The advantage of skipping tests like this is that platforms that don't
have the PERL and other optional dependencies get an indication of how
many tests they're missing.

If the test code is too hairy for that (i.e. does a lot of setup work
outside test assertions) you can also skip all remaining tests by
setting skip_all and immediately call test_done:

	if ! test_have_prereq PERL
	then
	    skip_all='skipping perl interface tests, perl not available'
	    test_done
	fi

The string you give to skip_all will be used as an explanation for why
the test was skipped.

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 [<prereq>] <message> <script>

   Usually takes two strings as parameters, 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)'

   If you supply three parameters the first will be taken to be a
   prerequisite; see the test_set_prereq and test_have_prereq
   documentation below:

	test_expect_success TTY 'git --paginate rev-list uses a pager' \
	    ' ... '

   You can also supply a comma-separated list of prerequisites, in the
   rare case where your test depends on more than one:

	test_expect_success PERL,PYTHON 'yo dawg' \
	    ' test $(perl -E 'print eval "1 +" . qx[python -c "print 2"]') == "4" '

 - test_expect_failure [<prereq>] <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.

   Like test_expect_success this function can optionally use a three
   argument invocation with a prerequisite as the first argument.

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

 - test_set_prereq <prereq>

   Set a test prerequisite to be used later with test_have_prereq. The
   test-lib will set some prerequisites for you, see the
   "Prerequisites" section below for a full list of these.

   Others you can set yourself and use later with either
   test_have_prereq directly, or the three argument invocation of
   test_expect_success and test_expect_failure.

 - test_have_prereq <prereq>

   Check if we have a prerequisite previously set with
   test_set_prereq. The most common use of this directly is to skip
   all the tests if we don't have some essential prerequisite:

	if ! test_have_prereq PERL
	then
	    skip_all='skipping perl interface tests, perl not available'
	    test_done
	fi

 - test_external [<prereq>] <message> <external> <script>

   Execute a <script> with an <external> interpreter (like perl). This
   was added for tests like t9700-perl-git.sh which do most of their
   work in an external test script.

	test_external \
	    'GitwebCache::*FileCache*' \
	    "$PERL_PATH" "$TEST_DIRECTORY"/t9503/test_cache_interface.pl

   If the test is outputting its own TAP you should set the
   test_external_has_tap variable somewhere before calling the first
   test_external* function. See t9700-perl-git.sh for an example.

	# The external test will outputs its own plan
	test_external_has_tap=1

 - test_external_without_stderr [<prereq>] <message> <external> <script>

   Like test_external but fail if there's any output on stderr,
   instead of checking the exit code.

	test_external_without_stderr \
	    'Perl API' \
	    "$PERL_PATH" "$TEST_DIRECTORY"/t9700/test.pl

 - test_expect_code <exit-code> <command>

   Run a command and ensure that it exits with the given exit code.
   For example:

	test_expect_success 'Merge with d/f conflicts' '
		test_expect_code 1 git merge "merge msg" B master
	'

 - test_must_fail <git-command>

   Run a git command and ensure it fails in a controlled way.  Use
   this instead of "! <git-command>".  When git-command dies due to a
   segfault, test_must_fail diagnoses it as an error; "! <git-command>"
   treats it as just another expected failure, which would let such a
   bug go unnoticed.

 - test_might_fail <git-command>

   Similar to test_must_fail, but tolerate success, too.  Use this
   instead of "<git-command> || :" to catch failures due to segv.

 - test_cmp <expected> <actual>

   Check whether the content of the <actual> file matches the
   <expected> file.  This behaves like "cmp" but produces more
   helpful output when the test is run with "-v" option.

 - test_line_count (= | -lt | -ge | ...) <length> <file>

   Check whether a file has the length it is expected to.

 - test_path_is_file <path> [<diagnosis>]
   test_path_is_dir <path> [<diagnosis>]
   test_path_is_missing <path> [<diagnosis>]

   Check if the named path is a file, if the named path is a
   directory, or if the named path does not exist, respectively,
   and fail otherwise, showing the <diagnosis> text.

 - test_when_finished <script>

   Prepend <script> to a list of commands to run to clean up
   at the end of the current test.  If some clean-up command
   fails, the test will not pass.

   Example:

	test_expect_success 'branch pointing to non-commit' '
		git rev-parse HEAD^{tree} >.git/refs/heads/invalid &&
		test_when_finished "git update-ref -d refs/heads/invalid" &&
		...
	'

Prerequisites
-------------

These are the prerequisites that the test library predefines with
test_have_prereq.

See the prereq argument to the test_* functions in the "Test harness
library" section above and the "test_have_prereq" function for how to
use these, and "test_set_prereq" for how to define your own.

 - PERL & PYTHON

   Git wasn't compiled with NO_PERL=YesPlease or
   NO_PYTHON=YesPlease. Wrap any tests that need Perl or Python in
   these.

 - POSIXPERM

   The filesystem supports POSIX style permission bits.

 - BSLASHPSPEC

   Backslashes in pathspec are not directory separators. This is not
   set on Windows. See 6fd1106a for details.

 - EXECKEEPSPID

   The process retains the same pid across exec(2). See fb9a2bea for
   details.

 - SYMLINKS

   The filesystem we're on supports symbolic links. E.g. a FAT
   filesystem doesn't support these. See 704a3143 for details.

 - SANITY

   Test is not run by root user, and an attempt to write to an
   unwritable file is expected to fail correctly.

 - LIBPCRE

   Git was compiled with USE_LIBPCRE=YesPlease. Wrap any tests
   that use git-grep --perl-regexp or git-grep -P in these.

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.

Test coverage
-------------

You can use the coverage tests to find code paths that are not being
used or properly exercised yet.

To do that, run the coverage target at the top-level (not in the t/
directory):

    make coverage

That'll compile Git with GCC's coverage arguments, and generate a test
report with gcov after the tests finish. Running the coverage tests
can take a while, since running the tests in parallel is incompatible
with GCC's coverage mode.

After the tests have run you can generate a list of untested
functions:

    make coverage-untested-functions

You can also generate a detailed per-file HTML report using the
Devel::Cover module. To install it do:

   # On Debian or Ubuntu:
   sudo aptitude install libdevel-cover-perl

   # From the CPAN with cpanminus
   curl -L http://cpanmin.us | perl - --sudo --self-upgrade
   cpanm --sudo Devel::Cover

Then, at the top-level:

    make cover_db_html

That'll generate a detailed cover report in the "cover_db_html"
directory, which you can then copy to a webserver, or inspect locally
in a browser.

Smoke testing
-------------

The Git test suite has support for smoke testing. Smoke testing is
when you submit the results of a test run to a central server for
analysis and aggregation.

Running a smoke tester is an easy and valuable way of contributing to
Git development, particularly if you have access to an uncommon OS on
obscure hardware.

After building Git you can generate a smoke report like this in the
"t" directory:

    make clean smoke

You can also pass arguments via the environment. This should make it
faster:

    GIT_TEST_OPTS='--root=/dev/shm' TEST_JOBS=10 make clean smoke

The "smoke" target will run the Git test suite with Perl's
"TAP::Harness" module, and package up the results in a .tar.gz archive
with "TAP::Harness::Archive". The former is included with Perl v5.10.1
or later, but you'll need to install the latter from the CPAN. See the
"Test coverage" section above for how you might do that.

Once the "smoke" target finishes you'll see a message like this:

    TAP Archive created at <path to git>/t/test-results/git-smoke.tar.gz

To upload the smoke report you need to have curl(1) installed, then
do:

    make smoke_report

To upload the report anonymously. Hopefully that'll return something
like "Reported #7 added.".

If you're going to be uploading reports frequently please request a
user account by E-Mailing gitsmoke@v.nix.is. Once you have a username
and password you'll be able to do:

    SMOKE_USERNAME=<username> SMOKE_PASSWORD=<password> make smoke_report

You can also add an additional comment to attach to the report, and/or
a comma separated list of tags:

    SMOKE_USERNAME=<username> SMOKE_PASSWORD=<password> \
        SMOKE_COMMENT=<comment> SMOKE_TAGS=<tags> \
        make smoke_report

Once the report is uploaded it'll be made available at
http://smoke.git.nix.is, here's an overview of Recent Smoke Reports
for Git:

    http://smoke.git.nix.is/app/projects/smoke_reports/1

The reports will also be mirrored to GitHub every few hours:

    http://github.com/gitsmoke/smoke-reports

The Smolder SQLite database is also mirrored and made available for
download:

    http://github.com/gitsmoke/smoke-database

Note that the database includes hashed (with crypt()) user passwords
and E-Mail addresses. Don't use a valuable password for the smoke
service if you have an account, or an E-Mail address you don't want to
be publicly known. The user accounts are just meant to be convenient
labels, they're not meant to be secure.