git/t
Elijah Newren c976260d0f t6036: Test index and worktree state, not just that merge fails
c94736a (merge-recursive: don't segfault while handling rename clashes
2009-07-30) added this testcase with an interesting corner case test,
which previously had cased git to segfault.  This test ensures that the
segfault does not return and that the merge correctly fails; just add
some checks that verify the state of the index and worktree after the merge
are correct.

Signed-off-by: Elijah Newren <newren@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2010-09-29 17:32:37 -07:00
..
lib-httpd Smart-http: check if repository is OK to export before serving it 2010-01-06 01:16:50 -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 diff: parse separate options like -S foo 2010-08-06 09:14:22 -07:00
t4020
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
t4135 tests: exercise "git apply" with weird filenames 2010-08-21 23:04:25 -07:00
t4252 git-am: implement --reject option passed to git-apply 2009-01-23 17:00:12 -08:00
t5100 mailinfo: do not strip leading spaces even for a header line 2010-02-19 21:55:33 -08:00
t5515
t7004
t7006 t7006-pager: if stdout is not a terminal, make a new one 2010-02-21 11:08:17 -08:00
t7500
t8005 Remove unused t/t8005/iso8859-5.txt 2009-08-29 00:50:31 -07:00
t9110
t9111
t9115
t9121
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 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 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 t/t9700/test.pl: don't access private object members, use public access methods 2010-06-29 09:32:56 -07: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 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.sh: avoid passing a non-newline terminated file to sed 2009-05-06 11:50:44 -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 tests: Use skip_all=* to skip tests 2010-07-08 17:53:12 -07: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 t/lib-git-svn.sh: use $PERL_PATH for perl, not perl from $PATH 2010-08-11 10:41:08 -07:00
lib-httpd.sh t/{t5541,lib-httpd}: replace problematic '!()' notation with test_must_fail 2010-07-20 11:37:45 -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-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
Makefile cvs tests: do not touch test CVS repositories shipped with source 2010-08-18 12:43:24 -07:00
README Merge branch 'ab/test-2' 2010-09-04 08:15:36 -07:00
t556x_common Smart-http tests: Test http-backend without curl or a webserver 2010-01-06 01:18:37 -08:00
t0000-basic.sh t/t0000-basic.sh: Run the passing TODO test inside its own test-lib 2010-08-31 12:12:01 -07:00
t0001-init.sh tests: factor HOME=$(pwd) in test-lib.sh 2010-08-31 12:12:02 -07:00
t0002-gitfile.sh tests: grep portability fixes 2008-09-30 12:39:58 -07:00
t0003-attributes.sh t0003: add missing && at end of lines 2010-08-29 22:36:32 -07:00
t0004-unwritable.sh tests: A SANITY test prereq for testing if we're root 2010-08-18 12:42:04 -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 t/t0006: specify timezone as EST5 not EST to comply with POSIX 2010-07-07 09:13:17 -07:00
t0010-racy-git.sh
t0020-crlf.sh autocrlf: Make it work also for un-normalized repositories 2010-05-11 23:02:49 -07:00
t0021-conversion.sh convert: Keep foreign $Id$ on checkout. 2010-04-10 21:45:01 -07:00
t0022-crlf-rename.sh t0022: replace non-portable literal CR 2010-01-25 16:43:28 -08: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
t0025-crlf-auto.sh Rename the "crlf" attribute "text" 2010-05-19 20:42:34 -07:00
t0026-eol-config.sh Add "core.eol" config variable 2010-06-06 21:20:04 -07:00
t0030-stripspace.sh tests: do not use implicit "git diff --no-index" 2008-05-24 00:01:56 -07:00
t0040-parse-options.sh print the usage string on stdout instead of stderr 2010-05-31 18:06:41 -07:00
t0050-filesystem.sh t0050: mark non-working test as such 2010-03-13 23:22:50 -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 start_command: detect execvp failures early 2010-01-10 10:15:03 -08:00
t0070-fundamental.sh Add ctype test 2009-01-17 18:30:23 -08:00
t0080-vcs-svn.sh Add stream helper library 2010-08-14 19:35:37 -07:00
t0100-previous.sh Teach @{-1} to git merge 2009-02-13 23:46:42 -08:00
t0101-at-syntax.sh t0101: use absolute date 2010-01-28 00:58:17 -08:00
t1000-read-tree-m-3way.sh tests: move convenience regexp to match object names to test-lib.sh 2010-01-03 21:17:16 -08:00
t1001-read-tree-m-2way.sh Convert "! git" to "test_must_fail git" 2010-07-20 16:47:17 -07:00
t1002-read-tree-m-u-2way.sh tests: move convenience regexp to match object names to test-lib.sh 2010-01-03 21:17:16 -08:00
t1003-read-tree-prefix.sh
t1004-read-tree-m-u-wf.sh tests: A SANITY test prereq for testing if we're root 2010-08-18 12:42:04 -07: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 hash-object: support --stdin-paths with --no-filters 2010-03-05 02:57:54 -08: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 t1010-mktree: Adjust expected result to code and documentation 2010-04-17 10:30:00 -07:00
t1011-read-tree-sparse-checkout.sh unpack-trees: mark new entries skip-worktree appropriately 2010-08-09 12:16:02 -07:00
t1012-read-tree-df.sh unpack-trees.c: look ahead in the index 2010-01-07 15:00:14 -08:00
t1020-subdirectory.sh t1020: Get rid of 'cd "$HERE"' at the start of each test 2010-09-09 16:03:11 -07: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: work around a bug in some implementations of "find" 2009-12-26 13:59:31 -08:00
t1300-repo-config.sh Sync with 1.7.1.2 2010-07-27 16:40:23 -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 t1302 (core.repositoryversion): style tweaks 2010-09-09 16:01:10 -07:00
t1303-wacky-config.sh Fix buffer overflow in config parser 2009-04-17 20:59:01 -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 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 Allow "check-ref-format --branch" from subdirectory 2010-08-06 10:01:45 -07:00
t1410-reflog.sh reflog: honor gc.reflogexpire=never 2010-02-28 10:28:26 -08:00
t1411-reflog-show.sh don't use default revision if a rev was specified 2010-03-13 21:23:43 -08:00
t1420-lost-found.sh
t1450-fsck.sh t1450 (fsck): remove dangling objects 2010-09-09 15:58:32 -07:00
t1500-rev-parse.sh t1500: more 'git rev-parse --git-dir' tests 2009-02-14 21:29:50 -08:00
t1501-worktree.sh t1501 (rev-parse): clarify 2010-07-25 22:07:58 -07:00
t1502-rev-parse-parseopt.sh Merge branch 'maint' 2010-07-07 11:18:26 -07:00
t1503-rev-parse-verify.sh t1503: fix broken test_must_fail calls 2010-08-31 09:49:23 -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
t1506-rev-parse-diagnosis.sh rev-parse: tests git rev-parse --verify master@{n}, for various n 2010-08-24 10:46:15 -07:00
t1507-rev-parse-upstream.sh Fix log -g this@{upstream} 2010-01-26 13:49:50 -08: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 tests: Skip tests in a way that makes sense under TAP 2010-06-25 10:08:20 -07: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 Avoid using non-portable echo -n in tests. 2008-10-31 21:38:48 -07:00
t2007-checkout-symlink.sh tests: implicitly skip SYMLINKS tests using <prereq> 2010-08-18 12:42:45 -07:00
t2008-checkout-subdir.sh
t2009-checkout-statinfo.sh
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 "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 t2016 (checkout -p): add missing && 2010-09-09 16:02:47 -07:00
t2017-checkout-orphan.sh tests: correct "does reflog exist?" tests 2010-07-21 12:54:48 -07:00
t2018-checkout-branch.sh builtin/checkout: handle -B from detached HEAD correctly 2010-08-09 12:57:17 -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: 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 Several tests: cd inside subshell instead of around 2010-09-06 14:30:53 -07: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 refresh-index: fix bitmask assignment 2008-07-20 00:00:46 -07:00
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
t2200-add-update.sh test for add with non-existent pathspec 2010-02-16 22:53:40 -08: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
t2204-add-ignored.sh tests for "git add ignored-dir/file" without -f 2010-03-13 23:23:22 -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 t3000 (ls-files -o): modernize style 2010-07-11 23:14:17 -07:00
t3001-ls-files-others-exclude.sh Merge branch 'jc/ls-files-ignored-pathspec' 2010-01-20 14:43:54 -08: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 Use test_expect_success for test setups 2010-03-20 09:15:17 -07:00
t3030-merge-recursive.sh t3030: Add a testcase for resolvable rename/add conflict with symlinks 2010-09-29 17:32:35 -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
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
t3200-branch.sh tests: correct "does reflog exist?" tests 2010-07-21 12:54:48 -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 add basic branch display tests 2009-02-18 19:59:21 -08:00
t3210-pack-refs.sh pack-refs: remove newly empty directories 2010-07-07 09:11:37 -07:00
t3300-funny-names.sh t/t3300-funny-names: change from skip_all=* to prereq skip 2010-08-18 12:42:46 -07:00
t3301-notes.sh notes: Don't create (empty) commit when removing non-existing notes 2010-08-31 11:07:34 -07:00
t3302-notes-index-expensive.sh Merge branch 'ab/test-2' 2010-09-04 08:15:36 -07:00
t3303-notes-subtrees.sh Teach notes code to properly preserve non-notes in the notes tree 2010-02-13 19:36:13 -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 Convert "! git" to "test_must_fail git" 2010-07-20 16:47:17 -07:00
t3307-notes-man.sh Documentation/notes: describe content of notes blobs 2010-05-08 22:30:02 -07:00
t3400-rebase.sh Merge branch 'dg/local-mod-error-messages' 2010-08-21 23:26:46 -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 rebase: support -X to pass through strategy options 2010-08-03 15:14:20 -07:00
t3403-rebase-skip.sh tests: use "git xyzzy" form (t0000 - t3599) 2008-09-03 12:41:46 -07:00
t3404-rebase-interactive.sh t3404 & t7508: cd inside subshell instead of around 2010-09-06 14:27:35 -07:00
t3405-rebase-malformed.sh
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 test-lib: user-friendly alternatives to test [-d|-f|-e] 2010-08-11 10:21:36 -07:00
t3408-rebase-multi-line.sh fix portability issues with $ in double quotes 2010-01-26 15:16:54 -08:00
t3409-rebase-preserve-merges.sh tests: subshell indentation stylefix 2010-09-09 15:56:20 -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 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
t3415-rebase-autosquash.sh add configuration variable for --autosquash option of interactive rebase 2010-07-14 08:47:29 -07:00
t3416-rebase-onto-threedots.sh Make test case numbers unique 2010-01-21 00:01:00 -08:00
t3417-rebase-whitespace-fix.sh t3417: Add test cases for "rebase --whitespace=fix" 2010-03-06 23:53:00 -08:00
t3418-rebase-continue.sh Fix git rebase --continue to work with touched files 2010-07-28 13:57:36 -07:00
t3500-cherry.sh war on "sleep" in tests 2010-04-06 21:55:27 -07:00
t3501-revert-cherry-pick.sh Merge branch 'cc/cherry-pick-stdin' 2010-06-30 11:55:39 -07: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 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 cherry-pick: add tests for new --ff option 2010-03-06 23:58:47 -08:00
t3507-cherry-pick-conflict.sh tests: fix syntax error in "Use advise() for hints" test 2010-08-18 13:20:56 -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 merge-recursive: D/F conflicts where was_a_dir/file -> was_a_dir 2010-09-09 17:03:02 -07:00
t3600-rm.sh tests: A SANITY test prereq for testing if we're root 2010-08-18 12:42:04 -07:00
t3700-add.sh tests: A SANITY test prereq for testing if we're root 2010-08-18 12:42:04 -07:00
t3701-add-interactive.sh t/t3701-add-interactive.sh: change from skip_all=* to prereq skip 2010-08-18 12:43:23 -07: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 Use test_expect_success for test setups 2010-03-20 09:15:17 -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 t/t3902-quoted: change from skip_all=* to prereq skip 2010-08-18 12:42:46 -07:00
t3903-stash.sh tests: subshell indentation stylefix 2010-09-09 15:56:20 -07:00
t3904-stash-patch.sh lib-patch-mode tests: change from skip_all=* to prereq skip 2010-08-18 12:43:23 -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 tests: use "test_cmp", not "diff", when verifying the result 2010-05-31 16:59:27 -07: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 t/t4004-diff-rename-symlink.sh: use three-arg <prereq> 2010-08-18 12:42:45 -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 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 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: implicitly skip SYMLINKS tests using <prereq> 2010-08-18 12:42:45 -07:00
t4012-diff-binary.sh tests: consolidate CR removal/addition functions 2010-01-25 16:42:23 -08:00
t4013-diff-various.sh diff: parse separate options like -S foo 2010-08-06 09:14:22 -07:00
t4014-format-patch.sh format-patch: Add a signature option (--signature) 2010-06-16 10:08:59 -07:00
t4015-diff-whitespace.sh Merge branch 'cc/maint-diff-CC-binary' 2010-06-18 11:16:57 -07: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 Merge branch 'jc/conflict-marker-size' into maint 2010-04-09 22:38:34 -07:00
t4018-diff-funcname.sh t/t4018: avoid two unnecessary sub-shell invocations 2010-09-10 09:30:14 -07:00
t4019-diff-wserror.sh t4019 "grep" portability fix 2009-12-26 13:59:34 -08: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: 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 Merge branch 'jc/color-attrs' into maint 2010-03-24 16:24:13 -07:00
t4027-diff-submodule.sh Add tests for the diff.ignoreSubmodules config option 2010-08-09 09:11:50 -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 t4030, t4031: work around bogus MSYS bash path conversion 2010-01-05 23:41:51 -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 diff: add --word-diff option that generalizes --color-words 2010-04-14 10:56:53 -07: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 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 Make test case number unique 2009-08-27 16:45:12 -07:00
t4041-diff-submodule-option.sh tests: subshell indentation stylefix 2010-09-09 15:56:20 -07: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
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 tests: Move FILEMODE prerequisite to lib-prereq-FILEMODE.sh 2010-08-18 12:43:23 -07:00
t4103-apply-binary.sh Use test_expect_success for test setups 2010-03-20 09:15:17 -07: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 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
t4111-apply-subdir.sh setup: do not forget working dir from subdir of gitdir 2010-08-04 11:21:44 -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: 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 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 apply: split quoted filename handling into new function 2010-08-21 23:04:22 -07: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 Merge branch 'gv/portable' 2010-06-21 06:02:44 -07: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 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 "test_cmp", not "diff", when verifying the result 2010-05-31 16:59:27 -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 tests: Move FILEMODE prerequisite to lib-prereq-FILEMODE.sh 2010-08-18 12:43:23 -07: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
t4133-apply-filenames.sh builtin-apply.c: fix the --- and +++ header filename consistency check 2010-01-18 17:08:59 -08:00
t4134-apply-submodule.sh Introduce remove_or_warn function 2010-03-28 09:53:04 -07:00
t4135-apply-weird-filenames.sh apply: handle traditional patches with space in filename 2010-08-21 23:04:29 -07:00
t4150-am.sh Teach "apply --index-info" to handle rename patches 2010-07-23 14:44:38 -07:00
t4151-am-abort.sh MERGE_RR is in .git, not .git/rr-cache 2010-07-14 13:04:25 -07:00
t4200-rerere.sh Merge branch 'jn/merge-renormalize' 2010-09-03 09:43:41 -07:00
t4201-shortlog.sh pretty: Respect --abbrev option 2010-05-04 15:38:58 -07:00
t4202-log.sh Merge branch 'mm/shortopt-detached' 2010-08-21 23:28:31 -07: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 patch-id: Add support for mbox format 2010-04-19 13:01:49 -07:00
t4205-log-pretty-formats.sh pretty: add aliases for pretty formats 2010-05-03 09:40:32 -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
t4252-am-options.sh git-am: implement --reject option passed to git-apply 2009-01-23 17:00:12 -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 archive: simplify archive format guessing 2010-02-07 15:40:27 -08: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: use "test_cmp", not "diff", when verifying the result 2010-05-31 16:59:27 -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 tests: Skip tests in a way that makes sense under TAP 2010-06-25 10:08:20 -07: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 prune: honor --expire=never 2010-02-28 10:28:05 -08: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 do not pass "git -c foo=bar" params to transport helpers 2010-08-24 09:54:00 -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 tests: use "git xyzzy" form (t3600 - t6999) 2008-09-03 14:13:59 -07:00
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 t/: Use "test_must_fail git" instead of "! git" 2008-07-13 13:21:26 -07:00
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 t/: Use "test_must_fail git" instead of "! git" 2008-07-13 13:21:26 -07:00
t5407-post-rewrite-hook.sh rebase -i: make post-rewrite work for 'edit' 2010-03-28 21:34:40 -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 t/t5503-tagfollow: change from skip_all=* to prereq skip 2010-08-18 12:42:46 -07:00
t5505-remote.sh Merge branch 'xx/trivial' into maint 2010-09-06 00:11:59 -07:00
t5506-remote-groups.sh Teach the --all option to 'git fetch' 2009-11-10 01:01:06 -08:00
t5510-fetch.sh Merge branch 'jl/fix-test' 2010-09-15 12:40:12 -07:00
t5511-refspec.sh Support '*' in the middle of a refspec 2009-03-07 12:19:28 -08:00
t5512-ls-remote.sh ls-remote: print URL when no repo is specified 2010-05-11 22:55:44 -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 Merge branch 'tr/receive-pack-aliased-update-fix' into maint 2010-07-07 10:25:15 -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 revision traversal: allow UNINTERESTING objects to be missing 2009-01-28 11:00:28 -08:00
t5520-pull.sh Merge branch 'en/rebase-against-rebase-fix' into maint 2010-09-01 13:43:55 -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 Add push --set-upstream 2010-01-16 16:39:58 -08: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
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: make all test files executable 2009-10-02 04:00:02 -04: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 t/{t5541,lib-httpd}: replace problematic '!()' notation with test_must_fail 2010-07-20 11:37:45 -07:00
t5550-http-fetch.sh tests: Skip tests in a way that makes sense under TAP 2010-06-25 10:08:20 -07:00
t5551-http-fetch.sh tests: Skip tests in a way that makes sense under TAP 2010-06-25 10:08:20 -07:00
t5560-http-backend-noserver.sh Test t5560: Fix test when run with dash 2010-01-15 21:05:35 -08: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 tests: use "git xyzzy" form (t3600 - t6999) 2008-09-03 14:13:59 -07:00
t5601-clone.sh Merge branch 'ab/test-2' 2010-09-04 08:15:36 -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 tests: use "test_cmp", not "diff", when verifying the result 2010-05-31 16:59:27 -07:00
t5701-clone-local.sh Refuse updating the current branch in a non-bare repository via push 2009-07-29 10:15:00 -07: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
t6001-rev-list-graft.sh tests: use "test_cmp", not "diff", when verifying the result 2010-05-31 16:59:27 -07: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
t6005-rev-list-count.sh
t6006-rev-list-format.sh Merge branch 'jn/shortlog' into maint 2010-06-16 16:22:51 -07:00
t6007-rev-list-cherry-pick-file.sh rev-list: introduce --count option 2010-06-12 09:39:06 -07:00
t6008-rev-list-submodule.sh git-submodule - make "submodule add" more strict, and document it 2008-07-14 23:35:31 -07:00
t6009-rev-list-parent.sh
t6010-merge-base.sh merge-base --independent to print reduced parent list in a merge 2010-08-18 14:02:03 -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 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 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
t6018-rev-list-glob.sh log: parse separate option for --glob 2010-08-06 09:14:50 -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 t6020: Add a testcase for modify/delete + directory/file conflict 2010-09-29 17:32:37 -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 t6022: Add tests for rename/rename combined with D/F conflicts 2010-09-29 17:32:36 -07:00
t6023-merge-file.sh merge-file --diff3: add a label for ancestor 2010-03-20 20:36:11 -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 conflict-marker-size: add test and docs 2010-01-20 23:49:27 -08: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 Extend merge-subtree tests to test -Xsubtree=dir. 2010-01-17 22:46:28 -08:00
t6030-bisect-porcelain.sh Merge branch 'cc/maint-bisect-paths' into maint 2010-03-04 22:25:23 -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 test-suite: Make test script numbers unique 2009-03-14 12:44:20 -07:00
t6035-merge-dir-to-symlink.sh Merge branch 'ab/test-2' 2010-09-04 08:15:36 -07:00
t6036-recursive-corner-cases.sh t6036: Test index and worktree state, not just that merge fails 2010-09-29 17:32:37 -07: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 (merge.renormalize): check that it can be turned off 2010-08-06 09:20:00 -07:00
t6040-tracking-info.sh Add branch --set-upstream 2010-01-18 17:09:32 -08:00
t6050-replace.sh tests: subshell indentation stylefix 2010-09-09 15:56:20 -07:00
t6101-rev-parse-parents.sh Move t6000lib.sh to lib-* 2010-05-07 21:36:27 -07:00
t6120-describe.sh describe: Break annotated tag ties by tagger date 2010-04-13 13:04:50 -07:00
t6200-fmt-merge-msg.sh fmt-merge-msg -m to override merge title 2010-08-18 14:02:04 -07:00
t6300-for-each-ref.sh for-each-ref: Field with abbreviated objectname 2010-05-18 21:49:04 -07:00
t7001-mv.sh git-mv: fix moving more than one source to a single destination 2010-01-22 14:31:30 -08:00
t7003-filter-branch.sh Merge branch 'bg/fix-t7003' 2010-09-16 07:43:41 -07:00
t7004-tag.sh tests: Skip tests in a way that makes sense under TAP 2010-06-25 10:08:20 -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 t7006 (pager): add missing TTY prerequisites 2010-08-16 09:41:26 -07:00
t7007-show.sh git-show: do not segfault when showing a bad tag 2008-12-15 01:29:44 -08:00
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 commit: correctly respect skip-worktree bit 2009-12-14 14:05:34 -08:00
t7012-skip-worktree-writing.sh t7012: Mark missing tests as TODO 2010-04-19 18:05:00 -07:00
t7060-wtstatus.sh status/commit: do not suggest "reset HEAD <path>" while merging 2009-12-12 01:22:10 -08:00
t7101-reset.sh Merge branch 'maint' 2008-09-03 16:08:23 -07:00
t7102-reset.sh Merge branch 'maint-1.6.4' into maint-1.6.5 2010-01-18 21:37:12 -08: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 t/t7105-reset-patch.sh: Add a PERL prerequisite 2010-08-18 12:43:23 -07:00
t7110-reset-merge.sh reset: disallow using --keep when there are unmerged entries 2010-03-06 20:06:50 -08: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 checkout -m --conflict=diff3: add a label for ancestor 2010-03-20 20:36:11 -07:00
t7300-clean.sh t/t7300: workaround ancient touch by rearranging arguments 2010-09-17 14:42:13 -07:00
t7400-submodule-basic.sh tests: subshell indentation stylefix 2010-09-09 15:56:20 -07:00
t7401-submodule-summary.sh tests: subshell indentation stylefix 2010-09-09 15:56:20 -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 Merge branch 'da/fix-submodule-sync-superproject-config' into maint 2010-09-01 13:50:46 -07:00
t7405-submodule-merge.sh t7405: cd inside subshell instead of around 2010-09-03 09:33:23 -07:00
t7406-submodule-update.sh t7406 & t7407: add missing && at end of lines 2010-09-03 09:34:32 -07:00
t7407-submodule-foreach.sh t7406 & t7407: add missing && at end of lines 2010-09-03 09:34:32 -07:00
t7408-submodule-reference.sh Make test number t7406- unique 2009-08-21 09:56:31 -07:00
t7500-commit.sh Add option to git-commit to allow empty log messages 2010-04-07 15:22:57 -07:00
t7501-commit.sh commit --amend: copy notes to the new commit 2010-03-12 21:55:40 -08:00
t7502-commit.sh Merge branch 'tc/commit-abbrev-fix' into maint 2010-06-22 09:31:47 -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 tests: use "git xyzzy" form (t7200 - t9001) 2008-09-03 14:51:48 -07:00
t7506-status-submodule.sh Teach diff --submodule and status to handle .git files in submodules 2010-04-10 11:51:56 -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 t3404 & t7508: cd inside subshell instead of around 2010-09-06 14:27:35 -07:00
t7509-commit.sh Convert "! git" to "test_must_fail git" 2010-07-20 16:47:17 -07:00
t7600-merge.sh t7600 (merge): test merge from branch yet to be born 2010-08-18 14:02:03 -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 octopus: reenable fast-forward merges 2009-12-13 23:40:24 -08: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: --log appends shortlog to message if specified 2010-05-10 12:02:20 -07:00
t7605-merge-resolve.sh tests: use "git xyzzy" form (t7200 - t9001) 2008-09-03 14:51:48 -07:00
t7606-merge-custom.sh t7606: Avoid using head as a file name 2010-08-24 09:56:34 -07:00
t7607-merge-overwrite.sh Convert "! git" to "test_must_fail git" 2010-07-20 16:47:17 -07:00
t7608-merge-messages.sh merge: indicate remote tracking branches in merge message 2009-08-09 12:34:21 -07:00
t7609-merge-co-error-msgs.sh t7609-merge-co-error-msgs: test non-fast forward case too. 2010-09-03 09:31:59 -07:00
t7610-mergetool.sh t7610: cd inside subshell instead of around 2010-08-24 09:33:09 -07:00
t7700-repack.sh more war on "sleep" in tests 2010-04-17 18:20:23 -07:00
t7701-repack-unpack-unreachable.sh more war on "sleep" in tests 2010-04-17 18:20:23 -07:00
t7800-difftool.sh t/t7800-difftool.sh: Skip with prereq on no PERL 2010-08-18 12:42:45 -07:00
t7810-grep.sh Convert "! git" to "test_must_fail git" 2010-07-20 16:47:17 -07:00
t7811-grep-open.sh grep -O: Do not pass color sequences as filenames to pager 2010-07-07 11:23:17 -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 blame: fix indent of line numbers 2010-03-13 12:04:17 -08:00
t8004-blame.sh
t8005-blame-i18n.sh Merge branch 'maint' 2009-07-25 02:16:25 -07:00
t8006-blame-textconv.sh t/t8006: test textconv support for blame 2010-06-18 09:41:29 -07:00
t8007-cat-file-textconv.sh t/t8007: test textconv support for cat-file 2010-06-18 12:57:47 -07:00
t9001-send-email.sh t/t9001-send-email.sh: convert setup code to tests 2010-08-18 12:43:23 -07:00
t9010-svn-fe.sh t/t9010-svn-fe.sh: add an +x bit to this test 2010-08-19 13:07:14 -07:00
t9100-git-svn-basic.sh tests: subshell indentation stylefix 2010-09-09 15:56:20 -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: subshell indentation stylefix 2010-09-09 15:56:20 -07: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 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 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 tests: subshell indentation stylefix 2010-09-09 15:56:20 -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 tests: subshell indentation stylefix 2010-09-09 15:56:20 -07: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 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 Several tests: cd inside subshell instead of around 2010-09-06 14:30:53 -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 Several tests: cd inside subshell instead of around 2010-09-06 14:30:53 -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 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 Merge branch 'ab/test-2' 2010-09-04 08:15:36 -07: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 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: stop httpd after the test 2009-07-25 04:09:44 -07:00
t9143-git-svn-gc.sh tests: Skip tests in a way that makes sense under TAP 2010-06-25 10:08:20 -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 t9150,t9151: Add rewrite-root option to init 2010-03-13 01:16:17 -08:00
t9151-svn-mergeinfo.sh t9150,t9151: Add rewrite-root option to init 2010-03-13 01:16:17 -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
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 Merge branch 'jl/maint-fix-test' 2010-09-06 16:46:36 -07:00
t9301-fast-import-notes.sh Add more testcases to test fast-import of notes 2009-12-07 13:52:52 -08:00
t9350-fast-export.sh Merge branch 'en/d-f-conflict-fix' 2010-08-31 16:23:58 -07:00
t9400-git-cvsserver-server.sh tests: Skip tests in a way that makes sense under TAP 2010-06-25 10:08:20 -07:00
t9401-git-cvsserver-crlf.sh Several tests: cd inside subshell instead of around 2010-09-06 14:30:53 -07:00
t9500-gitweb-standalone-no-errors.sh gitweb: Refactor syntax highlighting support 2010-05-03 09:38:54 -07:00
t9501-gitweb-standalone-http-status.sh Use test_expect_success for test setups 2010-03-20 09:15:17 -07:00
t9502-gitweb-standalone-parse-output.sh gitweb: Smarter snapshot names 2009-11-08 19:22:45 -08:00
t9600-cvsimport.sh Merge branch 'jl/maint-fix-test' 2010-09-06 16:46:36 -07: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
test4012.png
test9200a.png
test9200b.png
test-lib.sh Merge branch 'jk/test-must-fail-missing' 2010-09-08 09:17:01 -07:00

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

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

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


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

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

    *** t0000-basic.sh ***
    ok 1 - .git/objects should be empty after git init in an empty repo.
    ok 2 - .git/objects should have 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 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.

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

--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.  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.$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 (e.g., the return
   after unsetting a variable that was already unset is unportable) it's
   best to indicate so explicitly with a semicolon:

	unset HLAGH;
	git merge hla &&
	git push gh &&
	test ...

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

   Don't blindly follow test coverage metrics, they're a good way to
   spot if you've missed something. If a new function you added
   doesn't have any coverage 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.

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 be 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 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)'

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

   Analogous to test_expect_success, but pass the test if it exits
   with a given exit <code>

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

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

 - test_set_prereq SOME_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 SOME 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_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_path_is_file <file> [<diagnosis>]
   test_path_is_dir <dir> [<diagnosis>]
   test_path_is_missing <path> [<diagnosis>]

   Check whether a file/directory exists or doesn't. <diagnosis> will
   be displayed if the test fails.

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

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.