git-commit-vandalism/t
Junio C Hamano d96855ff51 merge-base: teach "--fork-point" mode
The "git pull --rebase" command computes the fork point of the
branch being rebased using the reflog entries of the "base" branch
(typically a remote-tracking branch) the branch's work was based on,
in order to cope with the case in which the "base" branch has been
rewound and rebuilt.  For example, if the history looked like this:

                     o---B1
                    /
    ---o---o---B2--o---o---o---Base
            \
             B3
              \
               Derived

where the current tip of the "base" branch is at Base, but earlier
fetch observed that its tip used to be B3 and then B2 and then B1
before getting to the current commit, and the branch being rebased
on top of the latest "base" is based on commit B3, it tries to find
B3 by going through the output of "git rev-list --reflog base" (i.e.
Base, B1, B2, B3) until it finds a commit that is an ancestor of the
current tip "Derived".

Internally, we have get_merge_bases_many() that can compute this
with one-go.  We would want a merge-base between Derived and a
fictitious merge commit that would result by merging all the
historical tips of "base".  When such a commit exist, we should get
a single result, which exactly match one of the reflog entries of
"base".

Teach "git merge-base" a new mode, "--fork-point", to compute
exactly that.

Helped-by: Martin von Zweigbergk <martinvonz@gmail.com>
Helped-by: John Keeping <john@keeping.me.uk>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2013-10-29 13:06:08 -07:00
..
Git-SVN git-svn: introduce add_path_to_url function 2012-08-02 21:46:03 +00:00
lib-gpg merge/pull Check for untrusted good GPG signatures 2013-03-31 22:38:49 -07:00
lib-httpd Merge branch 'jk/apache-test-for-2.4' into maint 2013-07-19 10:41:01 -07:00
perf Merge branch 'tr/test-v-and-v-subtest-only' 2013-07-05 01:15:48 -07:00
t0200
t0202
t1013/objects
t1509 tests: use a lowercase "usage:" string 2013-02-24 21:30:10 -08:00
t3900
t4013
t4020
t4034 Add userdiff patterns for Ada 2012-09-16 21:54:47 -07:00
t4100
t4101
t4109
t4110
t4135
t4211 t4211: fix broken test when one -L range is subset of another 2013-07-09 09:24:59 -07:00
t4252
t5000 t5000: test long filenames 2013-05-20 15:31:46 -07:00
t5003 t5003: check if unzip supports symlinks 2013-01-07 08:47:55 -08:00
t5004 t5004: resurrect original empty tar archive test 2013-05-09 12:22:31 -07:00
t5100 Merge branch 'jc/maint-mailinfo-mime-attr' into maint 2012-09-29 22:30:48 -07:00
t5515
t7500 commit: make default of "cleanup" option configurable 2013-01-10 11:45:02 -08:00
t8005
t9110
t9111
t9115
t9121
t9126
t9135
t9136
t9150
t9151
t9153
t9154
t9161
t9601/cvsroot
t9602
t9603/cvsroot
t9604/cvsroot git-cvsimport: allow author-specific timezones 2012-10-16 22:23:18 -07:00
t9700 t9700: do not close STDERR 2013-04-04 14:49:56 -07:00
valgrind Merge branch 'tr/test-v-and-v-subtest-only' 2013-07-05 01:15:48 -07:00
.gitattributes
.gitignore
aggregate-results.sh
annotate-tests.sh t8001/t8002 (blame): add blame -L :funcname tests 2013-07-17 18:02:22 -07:00
check-non-portable-shell.pl test-lint: detect 'export FOO=bar' 2013-07-08 10:21:33 -07:00
diff-lib.sh
gitweb-lib.sh
lib-bash.sh
lib-credential.sh contrib: add win32 credential-helper 2012-08-16 20:34:56 -07:00
lib-cvs.sh
lib-diff-alternative.sh
lib-gettext.sh t0200: "locale" may not exist 2012-12-19 07:44:20 -08:00
lib-git-daemon.sh
lib-git-p4.sh git p4: cygwin p4 client does not mark read-only 2013-01-26 22:00:39 -08:00
lib-git-svn.sh tests: use a lowercase "usage:" string 2013-02-24 21:30:10 -08:00
lib-gpg.sh
lib-httpd.sh Verify Content-Type from smart HTTP servers 2013-02-04 10:22:36 -08:00
lib-pager.sh
lib-patch-mode.sh
lib-prereq-FILEMODE.sh
lib-read-tree-m-3way.sh
lib-read-tree.sh
lib-rebase.sh Merge branch 'maint' 2013-07-01 12:46:54 -07:00
lib-t6000.sh topology tests: teach a helper to set author dates as well 2013-06-21 11:16:31 -07:00
lib-terminal.sh
Makefile Merge branch 'jk/test-output' 2013-05-29 14:29:11 -07:00
README Merge branch 'tr/test-v-and-v-subtest-only' 2013-07-05 01:15:48 -07:00
t556x_common
t0000-basic.sh Merge branch 'tr/test-v-and-v-subtest-only' 2013-07-11 13:06:02 -07:00
t0001-init.sh
t0002-gitfile.sh
t0003-attributes.sh Sync with 1.8.1.5 2013-03-01 13:17:18 -08:00
t0004-unwritable.sh
t0005-signals.sh t0005: skip signal death exit code test on Windows 2013-06-06 10:22:52 -07:00
t0006-date.sh Fix tests under GETTEXT_POISON on relative dates 2012-08-27 09:26:29 -07:00
t0007-git-var.sh t: add tests for "git var" 2012-11-28 10:49:13 -08:00
t0008-ignores.sh t0008: avoid SIGPIPE race condition on fifo 2013-07-12 09:24:29 -07:00
t0009-prio-queue.sh prio-queue: priority queue of pointers to structs 2013-06-11 15:15:21 -07:00
t0010-racy-git.sh
t0020-crlf.sh diff: demote core.safecrlf=true to core.safecrlf=warn 2013-06-25 13:55:03 -07:00
t0021-conversion.sh
t0022-crlf-rename.sh
t0023-crlf-am.sh
t0024-crlf-archive.sh test-lib: factor out $GIT_UNZIP setup 2013-03-10 20:06:19 -07:00
t0025-crlf-auto.sh
t0026-eol-config.sh
t0030-stripspace.sh Allow custom "comment char" 2013-01-16 12:48:22 -08:00
t0040-parse-options.sh test: test_must_be_empty helper 2013-06-09 16:45:14 -07:00
t0050-filesystem.sh t0050: Use TAB for indentation 2013-01-21 17:13:51 -08:00
t0055-beyond-symlinks.sh
t0060-path-utils.sh test: run testcases with POSIX absolute paths on Windows 2013-06-26 11:25:12 -07:00
t0061-run-command.sh
t0062-revision-walking.sh
t0063-string-list.sh string_list_longest_prefix(): remove function 2012-10-29 02:34:58 -04:00
t0070-fundamental.sh t0070 "mktemp to unwritable directory" needs SANITY 2013-06-11 14:23:31 -07:00
t0081-line-buffer.sh Revert "t0081 (line-buffer): add buffering tests" 2011-03-30 13:56:09 -05:00
t0090-cache-tree.sh
t0100-previous.sh strbuf_branchname(): do not double-expand @{-1}~22 2013-05-16 12:53:59 -07:00
t0101-at-syntax.sh
t0200-gettext-basic.sh
t0201-gettext-fallbacks.sh i18n: rebase: mark messages for translation 2012-07-25 10:09:14 -07:00
t0202-gettext-perl.sh
t0203-gettext-setlocale-sanity.sh
t0204-gettext-reencode-sanity.sh
t0205-gettext-poison.sh
t0300-credentials.sh git credential fill: output the whole 'struct credential' 2012-06-25 11:56:24 -07:00
t0301-credential-cache.sh
t0302-credential-store.sh
t0303-credential-external.sh
t1000-read-tree-m-3way.sh
t1001-read-tree-m-2way.sh
t1002-read-tree-m-u-2way.sh
t1003-read-tree-prefix.sh
t1004-read-tree-m-u-wf.sh tests: use test_ln_s_add to remove SYMLINKS prerequisite (trivial cases) 2013-06-07 15:01:45 -07:00
t1005-read-tree-reset.sh
t1006-cat-file.sh cat-file: split --batch input lines on whitespace 2013-07-12 09:18:42 -07:00
t1007-hash-object.sh
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
t1010-mktree.sh tests: enclose $PERL_PATH in double quotes 2012-06-24 21:56:13 -07:00
t1011-read-tree-sparse-checkout.sh checkout: add --ignore-skip-worktree-bits in sparse checkout mode 2013-04-15 08:54:45 -07:00
t1012-read-tree-df.sh
t1013-loose-object-format.sh
t1020-subdirectory.sh Use longer alias names in subdirectory tests 2012-12-28 15:11:48 -08:00
t1021-rerere-in-workdir.sh
t1050-large.sh Merge branch 'nd/stream-pack-objects' 2012-06-28 15:19:51 -07:00
t1051-large-conversion.sh
t1060-object-corruption.sh clone: leave repo in place after checkout errors 2013-03-29 15:20:55 -07:00
t1100-commit-tree-options.sh t1100-*.sh: Fix an intermittent test failure 2012-07-29 18:07:47 -07:00
t1200-tutorial.sh
t1300-repo-config.sh t1300: document some aesthetic failures of the config editor 2013-03-29 15:13:53 -07:00
t1301-shared-repo.sh
t1302-repo-version.sh
t1303-wacky-config.sh
t1304-default-acl.sh t1304: improve setfacl prerequisite setup 2012-06-07 10:09:02 -07:00
t1305-config-include.sh
t1306-xdg-files.sh t1306: check that XDG_CONFIG_HOME works 2012-07-24 08:59:07 -07:00
t1307-config-blob.sh teach config --blob option to parse config from database 2013-07-12 09:34:57 -07:00
t1400-update-ref.sh Fix failure to delete a packed ref through a symref 2012-10-21 12:08:42 -07:00
t1401-symbolic-ref.sh git symbolic-ref --delete $symref 2012-10-21 12:17:38 -07:00
t1402-check-ref-format.sh t1402: work around shell quoting issue on NetBSD 2013-01-08 13:18:49 -08:00
t1403-show-ref.sh show-ref: make --head always show the HEAD ref 2013-07-17 17:52:28 -07:00
t1410-reflog.sh
t1411-reflog-show.sh
t1412-reflog-loop.sh
t1420-lost-found.sh
t1450-fsck.sh fsck: warn about ".git" in trees 2012-11-28 13:52:54 -08:00
t1500-rev-parse.sh
t1501-worktree.sh
t1502-rev-parse-parseopt.sh Fix tests under GETTEXT_POISON on parseopt 2012-08-27 09:26:30 -07:00
t1503-rev-parse-verify.sh
t1504-ceiling-dirs.sh Provide a mechanism to turn off symlink resolution in ceiling paths 2013-02-22 11:37:34 -08:00
t1505-rev-parse-last.sh tests: move test_cmp_rev to test-lib-functions 2012-12-22 19:06:35 -08:00
t1506-rev-parse-diagnosis.sh specifying ranges: we did not mean to make ".." an empty set 2012-08-23 14:37:49 -07:00
t1507-rev-parse-upstream.sh sha1_name: fix error message for @{u} 2013-05-22 12:46:02 -07:00
t1508-at-combinations.sh Add new @ shortcut for HEAD 2013-05-08 12:13:12 -07:00
t1509-root-worktree.sh
t1510-repo-setup.sh setup: suppress implicit "." work-tree for bare repos 2013-03-08 14:02:40 -08:00
t1511-rev-parse-caret.sh
t1512-rev-parse-disambiguation.sh Merge branch 'jc/t1512-fix' 2013-07-11 13:06:11 -07:00
t1513-rev-parse-prefix.sh rev-parse: add --prefix option 2013-06-17 13:30:01 -07:00
t2000-checkout-cache-clash.sh
t2001-checkout-cache-clash.sh tests: use test_ln_s_add to remove SYMLINKS prerequisite (trivial cases) 2013-06-07 15:01:45 -07:00
t2002-checkout-cache-u.sh
t2003-checkout-cache-mkdir.sh t2003: work around path mangling issue on Windows 2013-03-20 10:10:28 -07:00
t2004-checkout-cache-temp.sh tests: use test_ln_s_add to remove SYMLINKS prerequisite (trivial cases) 2013-06-07 15:01:45 -07:00
t2005-checkout-index-symlinks.sh
t2006-checkout-index-basic.sh Fix tests under GETTEXT_POISON on parseopt 2012-08-27 09:26:30 -07:00
t2007-checkout-symlink.sh tests: use test_ln_s_add to remove SYMLINKS prerequisite (trivial cases) 2013-06-07 15:01:45 -07:00
t2008-checkout-subdir.sh
t2009-checkout-statinfo.sh
t2010-checkout-ambiguous.sh
t2011-checkout-invalid-head.sh
t2012-checkout-last.sh checkout: respect GIT_REFLOG_ACTION 2013-06-17 10:05:40 -07:00
t2013-checkout-submodule.sh reset $pathspec: exit with code 0 if successful 2013-01-15 09:38:07 -08:00
t2014-switch.sh
t2015-checkout-unborn.sh
t2016-checkout-patch.sh
t2017-checkout-orphan.sh git-checkout: disallow --detach on unborn branch 2012-06-26 11:11:14 -07:00
t2018-checkout-branch.sh
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 status: add advice on how to push/pull to tracking branch 2012-11-16 11:24:11 -08:00
t2021-checkout-overwrite.sh tests: use test_ln_s_add to remove SYMLINKS prerequisite (trivial cases) 2013-06-07 15:01:45 -07:00
t2022-checkout-paths.sh checkout: avoid unnecessary match_pathspec calls 2013-03-27 08:53:15 -07:00
t2023-checkout-m.sh
t2024-checkout-dwim.sh branch.c: Validate tracking branches with refspecs instead of refs/remotes/* 2013-04-21 15:14:42 -07:00
t2030-unresolve-info.sh rerere forget: do not segfault if not all stages are present 2013-04-04 12:27:28 -07:00
t2050-git-dir-relative.sh
t2100-update-cache-badpath.sh
t2101-update-index-reupdate.sh
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
t2105-update-index-gitfile.sh
t2106-update-index-assume-unchanged.sh
t2107-update-index-basic.sh Merge branch 'nd/i18n-poison-test-updates' 2012-09-07 11:07:59 -07:00
t2200-add-update.sh tests: use test_ln_s_add to remove SYMLINKS prerequisite (trivial cases) 2013-06-07 15:01:45 -07:00
t2201-add-update-typechange.sh
t2202-add-addremove.sh t2202: make sure "git add" (no args) stays a no-op 2013-07-19 21:32:33 -07:00
t2203-add-intent.sh cache-tree: invalidate i-t-a paths after generating trees 2012-12-15 23:04:22 -08:00
t2204-add-ignored.sh
t2300-cd-to-toplevel.sh
t3000-ls-files-others.sh
t3001-ls-files-others-exclude.sh Merge branch 'kb/status-ignored-optim-2' into maint 2013-06-09 17:05:15 -07:00
t3002-ls-files-dashpath.sh
t3003-ls-files-exclude.sh
t3004-ls-files-basic.sh Fix tests under GETTEXT_POISON on parseopt 2012-08-27 09:26:30 -07:00
t3005-ls-files-relative.sh
t3006-ls-files-long.sh cache_name_compare(): do not truncate while comparing paths 2012-07-11 09:25:56 -07:00
t3010-ls-files-killed-modified.sh treat_directory(): do not declare submodules to be untracked 2013-07-01 14:23:24 -07:00
t3020-ls-files-error-unmatch.sh
t3030-merge-recursive.sh t3030: use test_ln_s_add to remove SYMLINKS prerequisite 2013-06-07 15:01:49 -07:00
t3031-merge-criscross.sh
t3032-merge-recursive-options.sh test-lib.sh - define and use GREP_STRIPS_CR 2013-07-18 16:44:40 -07:00
t3040-subprojects-basic.sh
t3050-subprojects-fetch.sh
t3060-ls-files-with-tree.sh
t3070-wildmatch.sh wildmatch: properly fold case everywhere 2013-06-02 14:13:05 -07:00
t3100-ls-tree-restrict.sh t3100: use test_ln_s_add to remove SYMLINKS prerequisite 2013-06-07 15:01:50 -07:00
t3101-ls-tree-dirname.sh
t3102-ls-tree-wildcards.sh
t3103-ls-tree-misc.sh
t3200-branch.sh branch.c: Validate tracking branches with refspecs instead of refs/remotes/* 2013-04-21 15:14:42 -07:00
t3201-branch-contains.sh branch: let branch filters imply --list 2013-01-31 16:37:24 -08:00
t3202-show-branch-octopus.sh
t3203-branch-output.sh branch: show more information when HEAD is detached 2013-03-16 22:11:02 -07:00
t3210-pack-refs.sh repack_without_ref(): silence errors for dangling packed refs 2013-05-01 15:33:10 -07:00
t3211-peel-ref.sh repack_without_ref(): write peeled refs in the rewritten file 2013-05-01 15:33:10 -07:00
t3300-funny-names.sh t3300-*.sh: Fix a TAP parse error 2012-09-02 19:32:30 -07:00
t3301-notes.sh
t3302-notes-index-expensive.sh
t3303-notes-subtrees.sh
t3304-notes-mixed.sh
t3305-notes-fanout.sh
t3306-notes-prune.sh
t3307-notes-man.sh
t3308-notes-merge.sh
t3309-notes-merge-auto-resolve.sh
t3310-notes-merge-manual-resolve.sh notes-merge: Don't remove .git/NOTES_MERGE_WORKTREE; it may be the user's cwd 2012-03-15 11:13:23 -07:00
t3311-notes-merge-fanout.sh
t3400-rebase.sh Merge branch 'rr/rebase-sha1-by-string-query' 2013-06-24 13:48:40 -07:00
t3402-rebase-merge.sh
t3403-rebase-skip.sh test: trivial cleanups 2013-05-28 09:03:14 -07:00
t3404-rebase-interactive.sh Merge branch 'rr/rebase-reflog-message-reword' 2013-07-18 12:48:20 -07:00
t3405-rebase-malformed.sh am --rebasing: get patch body from commit, not from mailbox 2012-06-26 13:17:56 -07:00
t3406-rebase-message.sh tests: move test for rebase messages from t3400 to t3406 2013-06-07 09:42:50 -07:00
t3407-rebase-abort.sh
t3408-rebase-multi-line.sh
t3409-rebase-preserve-merges.sh add tests for rebasing merged history 2013-06-07 09:41:59 -07:00
t3410-rebase-preserve-dropped-merges.sh
t3411-rebase-preserve-around-merges.sh Merge branch 'js/rebase-i-p-test-fix' 2012-05-23 13:35:16 -07:00
t3412-rebase-root.sh Merge branch 'cw/rebase-i-root' 2012-07-15 21:38:42 -07:00
t3413-rebase-hook.sh
t3414-rebase-preserve-onto.sh
t3415-rebase-autosquash.sh rebase -i: handle fixup! fixup! in --autosquash 2013-06-27 13:52:41 -07:00
t3416-rebase-onto-threedots.sh
t3417-rebase-whitespace-fix.sh
t3418-rebase-continue.sh
t3419-rebase-patch-id.sh
t3420-rebase-autostash.sh rebase: finish_rebase() in noop rebase 2013-06-13 15:31:06 -07:00
t3421-rebase-topology-linear.sh rebase topology tests: fix commit names on case-insensitive file systems 2013-06-18 07:40:31 -07:00
t3425-rebase-topology-merges.sh rebase topology tests: fix commit names on case-insensitive file systems 2013-06-18 07:40:31 -07:00
t3500-cherry.sh
t3501-revert-cherry-pick.sh learn to pick/revert into unborn branch 2012-12-23 10:40:37 -08:00
t3502-cherry-pick-merge.sh
t3503-cherry-pick-root.sh
t3504-cherry-pick-rerere.sh
t3505-cherry-pick-empty.sh test: trivial cleanups 2013-05-28 09:03:14 -07:00
t3506-cherry-pick-ff.sh learn to pick/revert into unborn branch 2012-12-23 10:40:37 -08:00
t3507-cherry-pick-conflict.sh tests: move test_cmp_rev to test-lib-functions 2012-12-22 19:06:35 -08:00
t3508-cherry-pick-many-commits.sh cherry-pick: make sure all input objects are commits 2013-04-11 09:54:25 -07:00
t3509-cherry-pick-merge-df.sh t3509, t4023, t4114: use test_ln_s_add to remove SYMLINKS prerequisite 2013-06-07 15:01:51 -07:00
t3510-cherry-pick-sequence.sh tests: move test_cmp_rev to test-lib-functions 2012-12-22 19:06:35 -08:00
t3511-cherry-pick-x.sh sequencer.c: teach append_signoff how to detect duplicate s-o-b 2013-02-12 11:17:10 -08:00
t3600-rm.sh rm: introduce advice.rmHints to shorten messages 2013-06-12 16:59:55 -07:00
t3700-add.sh tests: use test_ln_s_add to remove SYMLINKS prerequisite (trivial cases) 2013-06-07 15:01:45 -07:00
t3701-add-interactive.sh Correct common spelling mistakes in comments and tests 2013-04-12 13:38:40 -07:00
t3702-add-edit.sh
t3703-add-magic-pathspec.sh
t3800-mktag.sh
t3900-i18n-commit.sh commit: reject non-characters 2013-07-09 09:01:24 -07:00
t3901-8859-1.txt
t3901-i18n-patch.sh
t3901-utf8.txt
t3902-quoted.sh t3902-*.sh: Skip all tests rather than each test 2012-09-02 19:32:30 -07:00
t3903-stash.sh git stash: avoid data loss when "git stash save" kills a directory 2013-07-01 14:23:24 -07:00
t3904-stash-patch.sh
t3905-stash-include-untracked.sh
t3910-mac-os-precompose.sh t3910: use the UTF8_NFD_TO_NFC test prereq 2012-08-22 11:50:50 -07:00
t4000-diff-format.sh diff: allow --patch & cie to override -s/--no-patch 2013-07-17 17:50:56 -07:00
t4001-diff-rename.sh tests: make sure rename pretty print works 2013-03-06 13:58:56 -08:00
t4002-diff-basic.sh
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
t4005-diff-rename-2.sh
t4006-diff-mode.sh Fix "git diff --stat" for interesting - but empty - file changes 2012-10-17 11:50:50 -07:00
t4007-rename-3.sh
t4008-diff-break-rewrite.sh tests: use test_ln_s_add to remove SYMLINKS prerequisite (trivial cases) 2013-06-07 15:01:45 -07:00
t4009-diff-rename-4.sh
t4010-diff-pathspec.sh
t4011-diff-symlink.sh t4011: remove SYMLINKS prerequisite 2013-06-07 15:01:53 -07:00
t4012-diff-binary.sh Fix tests under GETTEXT_POISON on git-apply 2012-08-27 09:26:30 -07:00
t4013-diff-various.sh
t4014-format-patch.sh teach format-patch to place other authors into in-body "From" 2013-07-03 12:11:04 -07:00
t4015-diff-whitespace.sh diff: add --ignore-blank-lines option 2013-06-19 15:17:45 -07:00
t4016-diff-quote.sh t4016-*.sh: Skip all tests rather than each test 2012-09-02 19:32:30 -07:00
t4017-diff-retval.sh
t4018-diff-funcname.sh Merge branch 'rr/tests-dedup-test-config' into maint 2013-04-01 09:19:42 -07:00
t4019-diff-wserror.sh
t4020-diff-external.sh Merge branch 'jv/maint-no-ext-diff' into maint 2012-07-30 13:04:59 -07:00
t4021-format-patch-numbered.sh
t4022-diff-rewrite.sh Fix '\ No newline...' annotation in rewrite diffs 2012-08-05 12:37:52 -07:00
t4023-diff-rename-typechange.sh t3509, t4023, t4114: use test_ln_s_add to remove SYMLINKS prerequisite 2013-06-07 15:01:51 -07:00
t4024-diff-optimize-common.sh
t4025-hunk-header.sh
t4026-color.sh
t4027-diff-submodule.sh
t4028-format-patch-mime-headers.sh
t4029-diff-trailing-space.sh tests: enclose $PERL_PATH in double quotes 2012-06-24 21:56:13 -07:00
t4030-diff-textconv.sh tests: use test_ln_s_add to remove SYMLINKS prerequisite (trivial cases) 2013-06-07 15:01:45 -07:00
t4031-diff-rewrite-binary.sh tests: enclose $PERL_PATH in double quotes 2012-06-24 21:56:13 -07:00
t4032-diff-inter-hunk-context.sh
t4033-diff-patience.sh
t4034-diff-words.sh t4034: use test_config/test_unconfig to set/unset git config variables 2013-03-25 08:50:53 -07:00
t4035-diff-quiet.sh diff-no-index: exit(1) if 'diff --quiet <repo file> <external file>' finds changes 2012-06-22 10:26:13 -07:00
t4036-format-patch-signer-mime.sh
t4037-diff-r-t-dirs.sh
t4038-diff-combined.sh Merge branch 'mk/combine-diff-context-horizon-fix' into maint 2013-06-27 14:37:56 -07:00
t4039-diff-assume-unchanged.sh
t4040-whitespace-status.sh
t4041-diff-submodule-option.sh t4041, t4205, t6006, t7102: use iso8859-1 rather than iso-8859-1 2013-07-05 00:05:00 -07:00
t4042-diff-textconv-caching.sh logmsg_reencode: lazily load missing commit buffers 2013-01-26 13:28:22 -08:00
t4043-diff-rename-binary.sh
t4044-diff-index-unique-abbrev.sh
t4045-diff-relative.sh
t4046-diff-unmerged.sh
t4047-diff-dirstat.sh
t4048-diff-combined-binary.sh
t4049-diff-stat-count.sh t4049: refocus tests 2012-11-29 09:46:30 -08:00
t4050-diff-histogram.sh
t4051-diff-function-context.sh
t4052-stat-output.sh Merge branch 'zj/diff-stat-smaller-num-columns' 2012-05-02 13:53:28 -07:00
t4053-diff-no-index.sh diff: handle relative paths in no-index 2012-06-22 10:20:18 -07:00
t4054-diff-bogus-tree.sh diff: do not use null sha1 as a sentinel value 2012-07-29 15:04:32 -07:00
t4055-diff-context.sh t4055: avoid use of sed 'a' command 2012-10-02 12:05:38 -07:00
t4100-apply-stat.sh
t4101-apply-nonl.sh
t4102-apply-rename.sh
t4103-apply-binary.sh Merge branch 'jc/apply-binary-p0' into maint-1.7.11 2012-09-12 14:00:53 -07:00
t4104-apply-boundary.sh
t4105-apply-fuzz.sh
t4106-apply-stdin.sh
t4107-apply-ignore-whitespace.sh
t4108-apply-threeway.sh apply: tests for the --3way option 2012-07-09 23:50:10 -07:00
t4109-apply-multifrag.sh
t4110-apply-scan.sh
t4111-apply-subdir.sh apply: carefully strdup a possibly-NULL name 2013-06-21 08:36:07 -07:00
t4112-apply-renames.sh
t4113-apply-ending.sh
t4114-apply-typechange.sh t3509, t4023, t4114: use test_ln_s_add to remove SYMLINKS prerequisite 2013-06-07 15:01:51 -07:00
t4115-apply-symlink.sh tests: use test_ln_s_add to remove SYMLINKS prerequisite (trivial cases) 2013-06-07 15:01:45 -07:00
t4116-apply-reverse.sh tests: enclose $PERL_PATH in double quotes 2012-06-24 21:56:13 -07:00
t4117-apply-reject.sh apply: accept -3/--3way command line option 2012-07-09 14:36:51 -07:00
t4118-apply-empty-context.sh
t4119-apply-config.sh
t4120-apply-popt.sh Fix tests under GETTEXT_POISON on git-apply 2012-08-27 09:26:30 -07:00
t4121-apply-diffs.sh
t4122-apply-symlink-inside.sh tests: use test_ln_s_add to remove SYMLINKS prerequisite (trivial cases) 2013-06-07 15:01:45 -07:00
t4123-apply-shrink.sh
t4124-apply-ws-rule.sh Merge branch 'jc/apply-ws-fix-tab-in-indent' into maint 2013-04-22 11:26:56 -07:00
t4125-apply-ws-fuzz.sh
t4126-apply-empty.sh
t4127-apply-same-fn.sh
t4128-apply-root.sh
t4129-apply-samemode.sh
t4130-apply-criss-cross-rename.sh
t4131-apply-fake-ancestor.sh
t4132-apply-removal.sh
t4133-apply-filenames.sh Fix tests under GETTEXT_POISON on git-apply 2012-08-27 09:26:30 -07:00
t4134-apply-submodule.sh
t4135-apply-weird-filenames.sh
t4136-apply-check.sh
t4150-am.sh t/am: use test_path_is_missing() where appropriate 2013-06-17 08:59:53 -07:00
t4151-am-abort.sh
t4152-am-subjects.sh
t4200-rerere.sh Fix tests under GETTEXT_POISON on parseopt 2012-08-27 09:26:30 -07:00
t4201-shortlog.sh shortlog: fix wrapping lines of wraplen 2012-12-11 10:01:44 -08:00
t4202-log.sh Merge branch 'cb/log-follow-with-combined' into maint 2013-07-03 15:30:59 -07:00
t4203-mailmap.sh Merge branch 'es/check-mailmap' 2013-07-22 11:24:14 -07:00
t4204-patch-id.sh
t4205-log-pretty-formats.sh t4205 (log-pretty-formats): avoid using sed 2013-07-05 11:54:53 -07:00
t4206-log-follow-harder-copies.sh
t4207-log-decoration-colors.sh pretty: share code between format_decoration and show_decorations 2013-04-18 16:28:27 -07:00
t4208-log-magic-pathspec.sh Update :/abc ambiguity check 2013-01-21 16:57:24 -08:00
t4209-log-pickaxe.sh diffcore-pickaxe: respect --no-textconv 2013-04-05 10:30:44 -07:00
t4210-log-i18n.sh log: re-encode commit messages before grepping 2013-02-11 13:11:45 -08:00
t4211-line-log.sh t4211: fix incorrect rebase at f8395edc (range-set: satisfy non-empty ranges invariant) 2013-07-24 07:53:25 -07:00
t4212-log-corrupt.sh pretty: handle broken commit headers gracefully 2013-04-17 14:50:36 -07:00
t4252-am-options.sh
t4253-am-keep-cr-dos.sh Documentation: Fix misspellings 2012-06-22 14:25:04 -07:00
t4254-am-corrupt.sh
t4300-merge-tree.sh merge-tree: handle directory/empty conflict correctly 2013-05-06 22:17:00 -07:00
t5000-tar-tree.sh t5000: test long filenames 2013-05-20 15:31:46 -07:00
t5001-archive-attr.sh
t5002-archive-attr-pattern.sh t: check that a pattern without trailing slash matches a directory 2013-03-28 21:48:27 -07:00
t5003-archive-zip.sh t5000, t5003: create directories for extracted files lazily 2013-05-20 15:31:45 -07:00
t5004-archive-corner-cases.sh Merge branch 'rs/empty-archive' into maint 2013-07-03 15:36:54 -07:00
t5100-mailinfo.sh mailinfo: do not concatenate charset= attribute values from mime headers 2012-09-17 15:24:52 -07:00
t5150-request-pull.sh tests: allow sha1's as part of the path 2013-06-17 12:59:50 -07:00
t5300-pack-object.sh Fix tests under GETTEXT_POISON on pack-object 2012-08-27 09:26:30 -07:00
t5301-sliding-window.sh
t5302-pack-index.sh
t5303-pack-corruption-resilience.sh unpack_entry: do not die when we fail to apply a delta 2013-06-14 14:56:09 -07:00
t5304-prune.sh count-objects: report garbage files in pack directory too 2013-02-15 08:13:13 -08:00
t5305-include-tag.sh
t5306-pack-nobase.sh
t5307-pack-missing-commit.sh
t5400-send-pack.sh Merge branch 'bw/cp-a-is-gnuism' 2012-10-10 14:57:09 -07:00
t5401-update-hooks.sh
t5402-post-merge-hook.sh
t5403-post-checkout-hook.sh
t5404-tracking-branches.sh t5404: do not assume the "matching" push is the default 2013-01-04 22:28:41 -08:00
t5405-send-pack-rewind.sh
t5406-remote-rejects.sh
t5407-post-rewrite-hook.sh test: fix post rewrite hook report 2013-06-03 10:01:03 -07:00
t5500-fetch-pack.sh Merge branch 'nd/clone-connectivity-shortcut' (early part) into maint 2013-06-28 10:00:00 -07:00
t5501-fetch-push-alternates.sh
t5502-quickfetch.sh tests: add missing && 2010-11-09 11:59:49 -08:00
t5503-tagfollow.sh do not use GIT_TRACE_PACKET=3 in tests 2013-03-21 08:03:32 -07:00
t5504-fetch-receive-strict.sh receive-pack: drop "n/a" on unpacker errors 2012-09-21 09:50:13 -07:00
t5505-remote.sh Merge branch 'ms/remote-tracking-branches-in-doc' 2013-07-12 12:04:07 -07:00
t5506-remote-groups.sh
t5509-fetch-push-namespaces.sh
t5510-fetch.sh fetch: don't try to update unfetched tracking refs 2013-05-28 08:13:14 -07:00
t5511-refspec.sh
t5512-ls-remote.sh upload/receive-pack: allow hiding ref hierarchies 2013-02-07 13:48:47 -08:00
t5513-fetch-track.sh Replace "remote tracking" with "remote-tracking" 2010-11-03 09:19:04 -07:00
t5514-fetch-multiple.sh fetch --all: pass --tags/--no-tags through to each remote 2012-09-07 10:01:35 -07:00
t5515-fetch-merge-logic.sh
t5516-fetch-push.sh Merge branch 'jc/push-2.0-default-to-simple' (early part) 2013-04-18 11:47:59 -07:00
t5517-push-mirror.sh t5517: do not assume the "matching" push is the default 2013-01-04 22:28:41 -08:00
t5518-fetch-exit-status.sh
t5519-push-alternates.sh t5519: do not assume the "matching" push is the default 2013-01-04 22:28:41 -08:00
t5520-pull.sh Merge branch 'jk/pull-into-dirty-unborn' into maint 2013-07-15 10:35:43 -07:00
t5521-pull-options.sh test: test_must_be_empty helper 2013-06-09 16:45:14 -07:00
t5522-pull-symlink.sh
t5523-push-upstream.sh
t5524-pull-msg.sh
t5525-fetch-tagopt.sh
t5526-fetch-submodules.sh
t5527-fetch-odd-refs.sh
t5528-push-default.sh t/t5528-push-default: test pushdefault workflows 2013-06-24 10:19:25 -07:00
t5530-upload-pack-error.sh Fix tests under GETTEXT_POISON on pack-object 2012-08-27 09:26:30 -07:00
t5531-deep-submodule-push.sh t5531: do not assume the "matching" push is the default 2013-01-04 22:28:41 -08:00
t5532-fetch-proxy.sh tests: enclose $PERL_PATH in double quotes 2012-06-24 21:56:13 -07:00
t5535-fetch-push-symref.sh fetch: ignore wildcarded refspecs that update local symbolic refs 2012-12-11 14:53:32 -08:00
t5540-http-push.sh Merge branch 'nd/maint-remote-remove' into maint 2012-09-20 15:53:31 -07:00
t5541-http-push.sh Merge branch 'jk/doc-http-backend' 2013-04-21 18:40:09 -07:00
t5550-http-fetch.sh t5550: do not assume the "matching" push is the default 2013-04-03 10:02:40 -07:00
t5551-http-fetch.sh Merge branch 'jc/t5551-posix-sed-bre' into maint 2013-07-03 15:37:58 -07:00
t5560-http-backend-noserver.sh test-lib.sh - define and use GREP_STRIPS_CR 2013-07-18 16:44:40 -07:00
t5561-http-backend.sh
t5570-git-daemon.sh t5570: do not assume the "matching" push is the default 2013-04-03 10:02:40 -07:00
t5571-pre-push-hook.sh push: Add support for pre-push hooks 2013-01-18 11:13:22 -08:00
t5600-clone-fail-cleanup.sh clone: support atomic operation with --separate-git-dir 2013-01-05 22:44:11 -08:00
t5601-clone.sh clone: allow cloning local paths with colons in them 2013-05-07 08:32:14 -07:00
t5602-clone-remote-exec.sh
t5700-clone-reference.sh clone: Allow repo using gitfile as a reference 2013-04-09 15:40:00 -07:00
t5701-clone-local.sh clone: allow --no-local to turn off local optimizations 2012-05-30 09:51:22 -07:00
t5702-clone-options.sh test: test_must_be_empty helper 2013-06-09 16:45:14 -07:00
t5704-bundle.sh bundle: Accept prerequisites without commit messages 2013-04-07 14:45:56 -07:00
t5705-clone-2gb.sh
t5706-clone-branch.sh
t5707-clone-detached.sh
t5708-clone-config.sh
t5709-clone-refspec.sh clone --single: limit the fetch refspec to fetched branch 2012-09-20 14:15:35 -07:00
t5710-info-alternate.sh clone: drop connectivity check for local clones 2013-07-08 08:00:21 -07:00
t5800-remote-testpy.sh Merge branch 'fc/remote-testgit-feature-done' 2013-01-14 08:15:46 -08:00
t5801-remote-helpers.sh transport-helper: be quiet on read errors from helpers 2013-06-21 09:03:53 -07:00
t5900-repo-selection.sh
t6000-rev-list-misc.sh
t6001-rev-list-graft.sh
t6002-rev-list-bisect.sh topology tests: teach a helper to take abbreviated timestamps 2013-06-21 11:15:32 -07:00
t6003-rev-list-topo-order.sh t6003: add --author-date-order test 2013-06-21 11:16:31 -07:00
t6004-rev-list-path-optim.sh
t6005-rev-list-count.sh
t6006-rev-list-format.sh t6006 (rev-list-format): add tests for "%b" and "%s" for the case i18n.commitEncoding is not set 2013-07-05 11:43:28 -07:00
t6007-rev-list-cherry-pick-file.sh
t6008-rev-list-submodule.sh
t6009-rev-list-parent.sh Fix revision walk for commits with the same dates 2013-03-22 16:15:48 -07:00
t6010-merge-base.sh merge-base: teach "--fork-point" mode 2013-10-29 13:06:08 -07:00
t6011-rev-list-with-bad-commit.sh tests: enclose $PERL_PATH in double quotes 2012-06-24 21:56:13 -07:00
t6012-rev-list-simplify.sh simplify-merges: drop merge from irrelevant side branch 2013-05-16 11:51:09 -07:00
t6013-rev-list-reverse-parents.sh tests: enclose $PERL_PATH in double quotes 2012-06-24 21:56:13 -07:00
t6014-rev-list-all.sh
t6015-rev-list-show-all-parents.sh
t6016-rev-list-graph-simplify-history.sh
t6017-rev-list-stdin.sh
t6018-rev-list-glob.sh
t6019-rev-list-ancestry-path.sh revision.c: discount side branches when computing TREESAME 2013-05-16 11:51:10 -07:00
t6020-merge-df.sh
t6021-merge-criss-cross.sh update URL to the marc.info mail archive 2013-07-22 10:11:18 -07:00
t6022-merge-rename.sh i18n: merge-recursive: mark strings for translation 2012-07-26 22:34:15 -07:00
t6023-merge-file.sh
t6024-recursive-merge.sh
t6025-merge-symlinks.sh
t6026-merge-attr.sh
t6027-merge-binary.sh
t6028-merge-up-to-date.sh
t6029-merge-subtree.sh tests: add missing && 2010-11-09 11:59:49 -08:00
t6030-bisect-porcelain.sh bisect: Log possibly bad, skipped commits at bisection end 2013-04-23 09:09:44 -07:00
t6031-merge-recursive.sh
t6032-merge-large-rename.sh
t6033-merge-crlf.sh
t6034-merge-rename-nocruft.sh
t6035-merge-dir-to-symlink.sh t6035: use test_ln_s_add to remove SYMLINKS prerequisite 2013-06-07 15:01:52 -07:00
t6036-recursive-corner-cases.sh
t6037-merge-ours-theirs.sh attr: "binary" attribute should choose built-in "binary" merge driver 2012-09-08 21:28:55 -07:00
t6038-merge-text-auto.sh
t6040-tracking-info.sh test: do not rely on US English tracking-info messages 2012-04-14 16:16:55 -07:00
t6042-merge-rename-corner-cases.sh i18n: merge-recursive: mark strings for translation 2012-07-26 22:34:15 -07:00
t6050-replace.sh replace: parse revision argument for -d 2012-11-13 08:34:14 -05:00
t6060-merge-index.sh
t6101-rev-parse-parents.sh
t6110-rev-list-sparse.sh
t6111-rev-list-treesame.sh revision.c: make default history consider bottom commits 2013-05-16 11:51:10 -07:00
t6120-describe.sh describe: fix --contains when a tag is given as input 2013-07-18 15:16:23 -07:00
t6130-pathspec-noglob.sh t6130-pathspec-noglob: Windows does not allow a file named "f*" 2013-01-06 11:29:31 -08:00
t6200-fmt-merge-msg.sh Merge branch 'rt/commentchar-fmt-merge-msg' into maint 2013-04-26 11:10:47 -07:00
t6300-for-each-ref.sh for-each-ref: Fix sort with multiple keys 2012-08-21 14:42:12 -07:00
t6500-gc.sh Fix tests under GETTEXT_POISON on parseopt 2012-08-27 09:26:30 -07:00
t7001-mv.sh tests: use test_ln_s_add to remove SYMLINKS prerequisite (trivial cases) 2013-06-07 15:01:45 -07:00
t7003-filter-branch.sh Merge branch 'jk/filter-branch-come-back-to-original' into maint 2013-04-22 11:26:55 -07:00
t7004-tag.sh tag: --force does not have to warn when creating tags 2013-03-13 10:35:15 -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
t7007-show.sh log: fix --quiet synonym for -s 2012-08-28 15:37:29 -07:00
t7008-grep-binary.sh grep: stop looking at random places for .gitattributes 2012-10-12 08:24:44 -07:00
t7010-setup.sh
t7011-skip-worktree-reading.sh test: spell 'ls-files --delete' option correctly in test descriptions 2013-06-30 12:31:26 -07:00
t7012-skip-worktree-writing.sh
t7060-wtstatus.sh status: advise to consider use of -u when read_directory takes too long 2013-03-16 21:44:58 -07:00
t7061-wtstatus-ignore.sh dir.c: git-clean -d -X: don't delete tracked directories 2013-04-15 12:34:00 -07:00
t7062-wtstatus-ignorecase.sh name-hash.c: fix endless loop with core.ignorecase=true 2013-02-27 23:29:04 -08:00
t7101-reset.sh
t7102-reset.sh Merge branch 'as/log-output-encoding-in-user-format' 2013-07-12 12:04:01 -07:00
t7103-reset-bare.sh
t7104-reset.sh
t7105-reset-patch.sh
t7106-reset-unborn-branch.sh reset: allow reset on unborn branch 2013-01-15 09:38:08 -08:00
t7110-reset-merge.sh
t7111-reset-table.sh
t7201-co.sh t7201.24: Add refspec to keep --track working 2013-04-21 15:14:41 -07:00
t7300-clean.sh dir.c: git-clean -d -X: don't delete tracked directories 2013-04-15 12:34:00 -07:00
t7301-clean-interactive.sh test: add t7301 for git-clean--interactive 2013-06-26 11:25:11 -07:00
t7400-submodule-basic.sh Merge branch 'fg/submodule-clone-depth' 2013-07-15 10:28:48 -07:00
t7401-submodule-summary.sh submodule: drop the top-level requirement 2013-06-17 13:30:01 -07:00
t7402-submodule-rebase.sh git-am: record full index line in the patch used while rebasing 2013-01-31 20:30:55 -08:00
t7403-submodule-sync.sh submodule: drop the top-level requirement 2013-06-17 13:30:01 -07:00
t7405-submodule-merge.sh
t7406-submodule-update.sh Merge branch 'fg/submodule-clone-depth' 2013-07-15 10:28:48 -07:00
t7407-submodule-foreach.sh submodule: drop the top-level requirement 2013-06-17 13:30:01 -07:00
t7408-submodule-reference.sh Consistently use "superproject" instead of "supermodule" 2012-05-20 14:58:38 -07:00
t7409-submodule-detached-worktree.sh t7409: do not use export X=Y 2013-04-26 09:54:31 -07:00
t7500-commit.sh t7500: fix flipped actual/expect 2013-07-01 09:53:00 -07:00
t7501-commit.sh Test 'commit --only' after 'checkout --orphan' 2013-06-02 12:31:17 -07:00
t7502-commit.sh Merge branch 'rs/commit-m-no-edit' into maint 2013-06-27 14:38:07 -07:00
t7503-pre-commit-hook.sh
t7504-commit-msg-hook.sh
t7505-prepare-commit-msg-hook.sh merge: Honor prepare-commit-msg return code 2013-01-03 09:10:11 -08:00
t7506-status-submodule.sh
t7507-commit-verbose.sh
t7508-status.sh status/commit: make sure --porcelain is not affected by user-facing config 2013-06-24 12:49:53 -07:00
t7509-commit.sh
t7510-signed-commit.sh
t7511-status-index.sh
t7512-status-help.sh Merge branch 'rr/rebase-checkout-reflog' 2013-07-11 13:04:33 -07:00
t7600-merge.sh t7600: fix typo in test title 2013-07-23 10:08:40 -07:00
t7601-merge-pull-config.sh Correct common spelling mistakes in comments and tests 2013-04-12 13:38:40 -07:00
t7602-merge-octopus-many.sh
t7603-merge-reduce-heads.sh
t7604-merge-custom-message.sh
t7605-merge-resolve.sh
t7606-merge-custom.sh
t7607-merge-overwrite.sh tests: use test_ln_s_add to remove SYMLINKS prerequisite (trivial cases) 2013-06-07 15:01:45 -07:00
t7608-merge-messages.sh
t7609-merge-co-error-msgs.sh
t7610-mergetool.sh Correct common spelling mistakes in comments and tests 2013-04-12 13:38:40 -07:00
t7611-merge-abort.sh
t7612-merge-verify-signatures.sh merge/pull Check for untrusted good GPG signatures 2013-03-31 22:38:49 -07:00
t7700-repack.sh
t7701-repack-unpack-unreachable.sh
t7800-difftool.sh difftool --dir-diff: allow changing any clean working tree file 2013-05-29 12:50:08 -07:00
t7810-grep.sh t4018,7810,7811: remove test_config() redefinition 2013-03-19 09:10:15 -07:00
t7811-grep-open.sh t4018,7810,7811: remove test_config() redefinition 2013-03-19 09:10:15 -07:00
t8001-annotate.sh t8001/t8002 (blame): modernize style 2013-07-17 18:02:21 -07:00
t8002-blame.sh t8001/t8002 (blame): modernize style 2013-07-17 18:02:21 -07:00
t8003-blame-corner-cases.sh Refactor parse_loc 2013-03-28 10:28:41 -07:00
t8004-blame-with-conflicts.sh blame: allow "blame file" in the middle of a conflicted merge 2012-09-11 14:30:03 -07:00
t8005-blame-i18n.sh
t8006-blame-textconv.sh tests: use test_ln_s_add to remove SYMLINKS prerequisite (trivial cases) 2013-06-07 15:01:45 -07:00
t8007-cat-file-textconv.sh tests: use test_ln_s_add to remove SYMLINKS prerequisite (trivial cases) 2013-06-07 15:01:45 -07:00
t8008-blame-formats.sh
t9001-send-email.sh Merge branch 'mt/send-email-cc-match-fix' 2013-06-27 14:29:57 -07:00
t9002-column.sh
t9010-svn-fe.sh t: make PIPE a standard test prerequisite 2013-04-11 17:39:05 -07:00
t9011-svn-da.sh
t9020-remote-svn.sh t9020: do not use export X=Y 2013-04-26 09:52:11 -07:00
t9100-git-svn-basic.sh git-svn: Simplify calculation of GIT_DIR 2013-01-24 10:21:23 +00:00
t9101-git-svn-props.sh
t9102-git-svn-deep-rmdir.sh
t9103-git-svn-tracked-directory-removed.sh
t9104-git-svn-follow-parent.sh
t9105-git-svn-commit-diff.sh
t9106-git-svn-commit-diff-clobber.sh
t9107-git-svn-migrate.sh git-svn: attempt to mimic SVN 1.7 URL canonicalization 2012-08-02 21:46:00 +00:00
t9108-git-svn-glob.sh
t9109-git-svn-multi-glob.sh
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
t9114-git-svn-dcommit-merge.sh t9114.2: Don't use --track option against "svn-remote"-tracking branches 2013-04-21 15:14:41 -07:00
t9115-git-svn-dcommit-funky-renames.sh
t9116-git-svn-log.sh
t9117-git-svn-init-clone.sh
t9118-git-svn-funky-branch-names.sh svn test: escape peg revision separator using empty peg rev 2012-10-10 20:11:57 +00:00
t9119-git-svn-info.sh
t9120-git-svn-clone-with-percent-escapes.sh
t9121-git-svn-fetch-renamed-dir.sh
t9122-git-svn-author.sh
t9123-git-svn-rebuild-with-rewriteroot.sh
t9124-git-svn-dcommit-auto-props.sh
t9125-git-svn-multi-glob-branch-names.sh
t9126-git-svn-follow-deleted-readded-directory.sh
t9127-git-svn-partial-rebuild.sh
t9128-git-svn-cmd-branch.sh
t9129-git-svn-i18n-commitencoding.sh tests: enclose $PERL_PATH in double quotes 2012-06-24 21:56:13 -07:00
t9130-git-svn-authors-file.sh
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
t9133-git-svn-nested-git-repo.sh
t9134-git-svn-ignore-paths.sh
t9135-git-svn-moved-branch-empty-file.sh
t9136-git-svn-recreated-branch-empty-file.sh
t9137-git-svn-dcommit-clobber-series.sh tests: enclose $PERL_PATH in double quotes 2012-06-24 21:56:13 -07:00
t9138-git-svn-authors-prog.sh
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
t9141-git-svn-multiple-branches.sh
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
t9144-git-svn-old-rev_map.sh
t9145-git-svn-master-branch.sh
t9146-git-svn-empty-dirs.sh
t9147-git-svn-include-paths.sh git-svn: added an --include-path flag 2013-05-09 01:13:36 +00:00
t9150-svk-mergetickets.sh
t9151-svn-mergeinfo.sh
t9152-svn-empty-dirs-after-gc.sh
t9153-git-svn-rewrite-uuid.sh
t9154-git-svn-fancy-glob.sh Make git-svn branch patterns match complete URL 2012-10-05 22:48:12 +00:00
t9155-git-svn-fetch-deleted-tag.sh
t9156-git-svn-fetch-deleted-tag-2.sh
t9157-git-svn-fetch-merge.sh
t9158-git-svn-mergeinfo.sh
t9159-git-svn-no-parent-mergeinfo.sh
t9160-git-svn-preserve-empty-dirs.sh
t9161-git-svn-mergeinfo-push.sh git-svn: avoid self-referencing mergeinfo 2013-05-09 01:07:39 +00:00
t9162-git-svn-dcommit-interactive.sh
t9163-git-svn-reset-clears-caches.sh git svn: reset invalidates the memoized mergeinfo caches 2012-08-10 19:53:18 +00:00
t9164-git-svn-dcommit-concurrent.sh t9164: Add missing quotes in test 2012-10-05 22:48:12 +00:00
t9165-git-svn-fetch-merge-branch-of-branch.sh git-svn.perl: consider all ranges for a given merge, instead of only tip-by-tip 2012-10-05 22:48:12 +00:00
t9166-git-svn-fetch-merge-branch-of-branch2.sh git-svn.perl: keep processing all commits in parents_exclude 2012-10-05 22:48:12 +00:00
t9167-git-svn-cmd-branch-subproject.sh git-svn: introduce --parents parameter for commands branch and tag 2013-05-20 22:05:54 +00:00
t9200-git-cvsexportcommit.sh Merge branch 'jc/test-cvs-no-init-in-existing-dir' into maint 2013-01-08 11:16:56 -08:00
t9300-fast-import.sh t: make PIPE a standard test prerequisite 2013-04-11 17:39:05 -07:00
t9301-fast-import-notes.sh
t9350-fast-export.sh tests: use test_ln_s_add to remove SYMLINKS prerequisite (trivial cases) 2013-06-07 15:01:45 -07:00
t9400-git-cvsserver-server.sh t9400: do not assume the "matching" push is the default 2013-01-04 22:28:41 -08:00
t9401-git-cvsserver-crlf.sh t9401: do not assume the "matching" push is the default 2013-01-04 22:28:41 -08:00
t9402-git-cvsserver-refs.sh test: test_must_be_empty helper 2013-06-09 16:45:14 -07:00
t9500-gitweb-standalone-no-errors.sh tests: use test_ln_s_add to remove SYMLINKS prerequisite (trivial cases) 2013-06-07 15:01:45 -07:00
t9501-gitweb-standalone-http-status.sh t9501: do not use export X=Y 2013-04-26 09:52:41 -07:00
t9502-gitweb-standalone-parse-output.sh t9502: do not assume GNU tar 2012-12-19 07:44:29 -08:00
t9600-cvsimport.sh
t9601-cvsimport-vendor-branch.sh
t9602-cvsimport-branches-tags.sh
t9603-cvsimport-patchsets.sh
t9604-cvsimport-timestamps.sh git-cvsimport: allow author-specific timezones 2012-10-16 22:23:18 -07:00
t9700-perl-git.sh
t9800-git-p4-basic.sh git p4: generate better error message for bad depot path 2013-01-26 22:00:38 -08:00
t9801-git-p4-branch.sh t9801: git-p4: check ignore files with client spec 2013-07-21 15:34:10 -07:00
t9802-git-p4-filetype.sh t/t9802: explicitly name the upstream branch to use as a base 2013-06-18 09:16:58 -07:00
t9803-git-p4-shell-metachars.sh
t9804-git-p4-label.sh
t9805-git-p4-skip-submit-edit.sh git p4: standardize submit cancel due to unchanged template 2012-09-16 21:52:52 -07:00
t9806-git-p4-options.sh git p4 test: translate windows paths for cygwin 2013-01-26 22:00:39 -08:00
t9807-git-p4-submit.sh git p4: cygwin p4 client does not mark read-only 2013-01-26 22:00:39 -08:00
t9808-git-p4-chdir.sh git p4: avoid expanding client paths in chdir 2013-03-11 15:03:11 -07:00
t9809-git-p4-client-view.sh git p4: cygwin p4 client does not mark read-only 2013-01-26 22:00:39 -08:00
t9810-git-p4-rcs.sh t9810: Do not use sed -i 2013-01-01 16:40:34 -08:00
t9811-git-p4-label-import.sh git p4: add test for tag import/export enabled via config 2012-05-11 14:21:38 -07:00
t9812-git-p4-wildcards.sh git p4 test: avoid wildcard * in windows 2013-01-26 22:00:39 -08:00
t9813-git-p4-preserve-users.sh git p4 test: split up big t9800 test 2012-06-27 21:06:35 -07:00
t9814-git-p4-rename.sh git p4: handle servers without move support 2012-11-26 10:59:57 -08:00
t9815-git-p4-submit-fail.sh git p4 test: use test_chmod for cygwin 2013-01-26 22:00:39 -08:00
t9901-git-web--browse.sh
t9902-completion.sh Merge branch 'tr/test-lint-no-export-assignment-in-shell' 2013-07-12 12:04:16 -07:00
t9903-bash-prompt.sh Merge branch 'ed/color-prompt' 2013-07-01 12:41:55 -07:00
test-binary-1.png
test-binary-2.png
test-lib-functions.sh Merge branch 'tr/test-v-and-v-subtest-only' 2013-07-05 01:15:48 -07:00
test-lib.sh Merge branch 'ml/avoid-using-grep-on-crlf-files' 2013-07-24 19:21:18 -07:00
test-terminal.perl run-command: encode signal death as a positive integer 2013-01-06 11:09:18 -08:00

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

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

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


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

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

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

--verbose-only=<pattern>::
	Like --verbose, but the effect is limited to tests with
	numbers matching <pattern>.  The number matched against is
	simply the running count of the test within the file.

--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. Cleanup commands requested with
	test_when_finished are not executed if the test failed,
	in order to keep the state for inspection by the tester
	to diagnose the bug.

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

--valgrind=<tool>::
	Execute all Git binaries under valgrind tool <tool> and exit
	with status 126 on errors (just like regular tests, this will
	only stop the test script when running under -i).

	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.

	<tool> defaults to 'memcheck', just like valgrind itself.
	Other particularly useful choices include 'helgrind' and
	'drd', but you may use any tool recognized by your valgrind
	installation.

	As a special case, <tool> can be 'memcheck-fast', which uses
	memcheck but disables --track-origins.  Use this if you are
	running tests in bulk, to see if there are _any_ memory
	issues.

	Note that memcheck 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/'.

--valgrind-only=<pattern>::
	Like --valgrind, but the effect is limited to tests with
	numbers matching <pattern>.  The number matched against is
	simply the running count of the test within the file.

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

 - use '! git cmd' when you want to make sure the git command exits
   with failure in a controlled way by calling "die()".  Instead,
   use 'test_must_fail git cmd'.  This will signal a failure if git
   dies in an unexpected way (e.g. segfault).

   On the other hand, don't use test_must_fail for running regular
   platform commands; just use '! cmd'.

 - use perl without spelling it as "$PERL_PATH". This is to help our
   friends on Windows where the platform Perl often adds CR before
   the end of line, and they bundle Git with a version of Perl that
   does not do so, whose path is specified with $PERL_PATH.

 - use sh without spelling it as "$SHELL_PATH", when the script can
   be misinterpreted by broken platform shell (e.g. Solaris).

 - chdir around in tests.  It is not sufficient to chdir to
   somewhere and then chdir back to the original location later in
   the test, as any intermediate step can fail and abort the test,
   causing the next test to start in an unexpected directory.  Do so
   inside a subshell if necessary.

 - 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" &&
		...
	'

 - test_pause

	This command is useful for writing and debugging tests and must be
	removed before submitting. It halts the execution of the test and
	spawns a shell in the trash directory. Exit the shell to continue
	the test. Example:

	test_expect_success 'test' '
		git do-something >actual &&
		test_pause &&
		test_cmp expected actual
	'

 - test_ln_s_add <path1> <path2>

   This function helps systems whose filesystem does not support symbolic
   links. Use it to add a symbolic link entry to the index when it is not
   important that the file system entry is a symbolic link, i.e., instead
   of the sequence

	ln -s foo bar &&
	git add bar

   Sometimes it is possible to split a test in a part that does not need
   the symbolic link in the file system and a part that does; then only
   the latter part need be protected by a SYMLINKS prerequisite (see below).

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.

 - PIPE

   The filesystem we're on supports creation of FIFOs (named pipes)
   via mkfifo(1).

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

 - CASE_INSENSITIVE_FS

   Test is run on a case insensitive file system.

 - UTF8_NFD_TO_NFC

   Test is run on a filesystem which converts decomposed utf-8 (nfd)
   to precomposed utf-8 (nfc).

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.