git-commit-vandalism/t
Clemens Buchacher 1affea4f62 merge-recursive: handle file mode changes
File mode changes should be handled similarly to changes of content.
That is, if the file mode changed in only one branch, keep the changed
version, and if both branch changed to different mode, mark it as a
conflict.

Signed-off-by: Clemens Buchacher <drizzd@aon.at>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2008-03-13 23:41:16 -07:00
..
t3900
t4013 Clean up "git log" format with DIFF_FORMAT_NO_OUTPUT 2007-10-15 20:24:27 -04:00
t4100 Replace the word 'update-cache' by 'update-index' everywhere 2007-11-30 15:09:40 -08:00
t4101
t5100 mailinfo: feed only one line to handle_filter() for QP input 2008-02-15 22:16:34 -08:00
t5515 Correct handling of branch.$name.merge in builtin-fetch 2007-09-19 03:22:31 -07:00
t7004 t7004: ship trustdb to avoid gpg warnings 2007-07-01 13:25:55 -07:00
t7500 Teach git-commit about commit message templates. 2007-07-24 20:46:54 -07:00
t9110 git-svn: fix useSvmProps, hopefully for the last time 2007-02-23 00:57:13 -08:00
t9111 War on whitespace 2007-06-07 00:04:01 -07:00
t9115 git-svn: fix commiting renames over DAV with funky file names 2007-07-15 22:35:09 -07:00
.gitignore
annotate-tests.sh make t8001 work on Mac OS X again 2007-03-06 17:09:53 -08:00
diff-lib.sh the use of 'tr' in the test suite isn't really portable 2007-12-17 20:49:18 -08:00
lib-git-svn.sh git-svn: replace .rev_db with a more space-efficient .rev_map format 2007-12-10 21:28:25 -08:00
lib-read-tree-m-3way.sh Rewrite "git-frotz" to "git frotz" 2007-07-02 22:52:14 -07:00
Makefile Use $(RM) in Makefiles instead of 'rm -f' 2007-07-14 23:31:01 -07:00
README
t0000-basic.sh Add is_absolute_path() and make_absolute_path() 2007-08-01 00:38:30 -07:00
t0001-init.sh Do not rely on the exit status of "unset" for unset variables 2007-12-04 14:48:45 -08:00
t0003-attributes.sh gitattributes: fix relative path matching 2008-02-07 00:04:50 -08:00
t0010-racy-git.sh
t0020-crlf.sh Officially deprecate repo-config. 2008-01-17 22:52:40 -08:00
t0021-conversion.sh t0021: tr portability fix for Solaris 2008-03-11 21:14:59 -07:00
t0022-crlf-rename.sh diffcore-delta.c: Ignore CR in CRLF for text files 2007-06-30 20:51:31 -07:00
t0023-crlf-am.sh Fix racy-git handling in git-write-tree. 2007-08-24 18:53:02 -07:00
t0030-stripspace.sh Teach "git stripspace" the --strip-comments option 2007-07-26 22:51:44 -07:00
t0040-parse-options.sh parse-options: catch likely typo in presense of aggregated options. 2008-01-26 10:53:31 -08:00
t1000-read-tree-m-3way.sh Rewrite "git-frotz" to "git frotz" 2007-07-02 22:52:14 -07:00
t1001-read-tree-m-2way.sh Rewrite "git-frotz" to "git frotz" 2007-07-02 22:52:14 -07:00
t1002-read-tree-m-u-2way.sh Rewrite "git-frotz" to "git frotz" 2007-07-02 22:52:14 -07:00
t1003-read-tree-prefix.sh Rewrite "git-frotz" to "git frotz" 2007-07-02 22:52:14 -07:00
t1004-read-tree-m-u-wf.sh Rewrite "git-frotz" to "git frotz" 2007-07-02 22:52:14 -07:00
t1020-subdirectory.sh Rewrite "git-frotz" to "git frotz" 2007-07-02 22:52:14 -07:00
t1100-commit-tree-options.sh Rewrite "git-frotz" to "git frotz" 2007-07-02 22:52:14 -07:00
t1200-tutorial.sh Rewrite "git-frotz" to "git frotz" 2007-07-02 22:52:14 -07:00
t1300-repo-config.sh config: add test cases for empty value and no value config variables. 2008-02-13 14:23:32 -08:00
t1301-shared-repo.sh t1301-shared-repo.sh: fix 'stat' portability issue 2007-08-16 15:32:46 -07:00
t1302-repo-version.sh Do check_repository_format() early (re-fix) 2007-12-05 15:06:37 -08:00
t1303-wacky-config.sh config: handle lack of newline at end of file better 2008-01-02 02:28:54 -08:00
t1400-update-ref.sh Be more careful about updating refs 2008-01-16 11:53:35 -08:00
t1410-reflog.sh Add "--expire <time>" option to 'git prune' 2007-11-30 15:47:01 -08:00
t1420-lost-found.sh git-fsck: add --lost-found option 2007-07-02 21:34:12 -07:00
t1500-rev-parse.sh Reinstate the old behaviour when GIT_DIR is set and GIT_WORK_TREE is unset 2007-08-10 01:12:07 -07:00
t1501-worktree.sh Fix setup_git_directory_gently() with relative GIT_DIR & GIT_WORK_TREE 2007-10-16 20:18:04 -04:00
t1502-rev-parse-parseopt.sh rev-parse: fix potential bus error with --parseopt option spec handling 2008-02-25 21:40:12 -08:00
t2000-checkout-cache-clash.sh Rewrite "git-frotz" to "git frotz" 2007-07-02 22:52:14 -07:00
t2001-checkout-cache-clash.sh Rewrite "git-frotz" to "git frotz" 2007-07-02 22:52:14 -07:00
t2002-checkout-cache-u.sh Rewrite "git-frotz" to "git frotz" 2007-07-02 22:52:14 -07:00
t2003-checkout-cache-mkdir.sh Rewrite "git-frotz" to "git frotz" 2007-07-02 22:52:14 -07:00
t2004-checkout-cache-temp.sh Rewrite "git-frotz" to "git frotz" 2007-07-02 22:52:14 -07:00
t2005-checkout-index-symlinks.sh Rewrite "git-frotz" to "git frotz" 2007-07-02 22:52:14 -07:00
t2007-checkout-symlink.sh Teach read-tree 2-way merge to ignore intermediate symlinks 2007-07-12 02:22:53 -07:00
t2008-checkout-subdir.sh tests: introduce test_must_fail 2008-03-02 23:15:06 -08:00
t2050-git-dir-relative.sh Add a test for git-commit being confused by relative GIT_DIR 2007-08-13 21:19:48 -07:00
t2100-update-cache-badpath.sh Rewrite "git-frotz" to "git frotz" 2007-07-02 22:52:14 -07:00
t2101-update-index-reupdate.sh Rewrite "git-frotz" to "git frotz" 2007-07-02 22:52:14 -07:00
t2102-update-index-symlinks.sh Rewrite "git-frotz" to "git frotz" 2007-07-02 22:52:14 -07:00
t2200-add-update.sh t2200: test more cases of "add -u" 2007-11-11 18:44:16 -08:00
t3000-ls-files-others.sh Rewrite "git-frotz" to "git frotz" 2007-07-02 22:52:14 -07:00
t3001-ls-files-others-exclude.sh Replace "runstatus" with "status" in the tests 2007-11-22 17:05:04 -08:00
t3002-ls-files-dashpath.sh Rewrite "git-frotz" to "git frotz" 2007-07-02 22:52:14 -07:00
t3010-ls-files-killed-modified.sh Rewrite "git-frotz" to "git frotz" 2007-07-02 22:52:14 -07:00
t3020-ls-files-error-unmatch.sh Rewrite "git-frotz" to "git frotz" 2007-07-02 22:52:14 -07:00
t3030-merge-recursive.sh War on whitespace 2007-06-07 00:04:01 -07:00
t3040-subprojects-basic.sh Tests for core subproject support 2007-04-18 17:08:42 -07:00
t3050-subprojects-fetch.sh Make thin-pack generation subproject aware. 2007-08-19 11:44:47 -07:00
t3060-ls-files-with-tree.sh Add test case for ls-files --with-tree 2007-10-03 00:53:24 -07:00
t3100-ls-tree-restrict.sh Rewrite "git-frotz" to "git frotz" 2007-07-02 22:52:14 -07:00
t3101-ls-tree-dirname.sh Rewrite "git-frotz" to "git frotz" 2007-07-02 22:52:14 -07:00
t3200-branch.sh branch --track: code cleanup and saner handling of local branches 2007-07-11 16:03:58 -07:00
t3201-branch-contains.sh git-branch --contains: doc and test 2007-11-22 22:11:28 -08:00
t3210-pack-refs.sh Rewrite "git-frotz" to "git frotz" 2007-07-02 22:52:14 -07:00
t3300-funny-names.sh the use of 'tr' in the test suite isn't really portable 2007-12-17 20:49:18 -08:00
t3400-rebase.sh apply --index-info: fall back to current index for mode changes 2007-09-16 18:20:10 -07:00
t3401-rebase-partial.sh Rewrite "git-frotz" to "git frotz" 2007-07-02 22:52:14 -07:00
t3402-rebase-merge.sh rebase: operate on a detached HEAD 2007-11-09 01:30:31 -08:00
t3403-rebase-skip.sh Merge branch 'mh/rebase-skip-hard' 2007-11-24 16:31:08 -08:00
t3404-rebase-interactive.sh Protect get_author_ident_from_commit() from filenames in work tree 2008-02-13 13:43:02 -08:00
t3405-rebase-malformed.sh rebase: try not to munge commit log message 2007-07-29 23:29:04 -07:00
t3406-rebase-message.sh rebase -m: Fix incorrect short-logs of already applied commits. 2007-09-01 02:23:05 -07:00
t3407-rebase-abort.sh git rebase --abort: always restore the right commit 2008-03-11 19:30:33 -07:00
t3500-cherry.sh Rewrite "git-frotz" to "git frotz" 2007-07-02 22:52:14 -07:00
t3501-revert-cherry-pick.sh revert: actually check for a dirty index 2008-03-02 23:33:59 -08:00
t3502-cherry-pick-merge.sh t3502: Disambiguate between file and rev by adding -- 2007-11-05 15:04:57 -08:00
t3600-rm.sh t/t{3600,3800,5401}: do not use egrep when grep would do 2008-01-05 00:07:57 -08:00
t3700-add.sh Fix per-directory exclude handing for "git add" 2007-11-16 17:05:13 -08:00
t3800-mktag.sh t/t3800: do not use a temporary file to hold expected result. 2008-01-05 00:07:57 -08:00
t3900-i18n-commit.sh Clean up "git log" format with DIFF_FORMAT_NO_OUTPUT 2007-10-15 20:24:27 -04:00
t3901-8859-1.txt
t3901-i18n-patch.sh Remove unecessary hard-coding of EDITOR=':' VISUAL=':' in some test suites. 2007-11-02 15:40:20 -07:00
t3901-utf8.txt
t3902-quoted.sh Skip t3902-quoted.sh if the file system does not support funny names. 2007-11-14 15:18:39 -08:00
t3903-stash.sh Make sure git-stash works from subdirectory. 2007-07-25 15:34:52 -07:00
t4000-diff-format.sh Replace the word 'update-cache' by 'update-index' everywhere 2007-11-30 15:09:40 -08:00
t4001-diff-rename.sh Merge branch 'kh/commit' 2007-12-04 17:16:33 -08:00
t4002-diff-basic.sh Rewrite "git-frotz" to "git frotz" 2007-07-02 22:52:14 -07:00
t4003-diff-rename-1.sh Rewrite "git-frotz" to "git frotz" 2007-07-02 22:52:14 -07:00
t4004-diff-rename-symlink.sh Rewrite "git-frotz" to "git frotz" 2007-07-02 22:52:14 -07:00
t4005-diff-rename-2.sh Rewrite "git-frotz" to "git frotz" 2007-07-02 22:52:14 -07:00
t4006-diff-mode.sh Rewrite "git-frotz" to "git frotz" 2007-07-02 22:52:14 -07:00
t4007-rename-3.sh Rewrite "git-frotz" to "git frotz" 2007-07-02 22:52:14 -07:00
t4008-diff-break-rewrite.sh rename: Break filepairs with different types. 2007-12-02 02:24:46 -08:00
t4009-diff-rename-4.sh Rewrite "git-frotz" to "git frotz" 2007-07-02 22:52:14 -07:00
t4010-diff-pathspec.sh Rewrite "git-frotz" to "git frotz" 2007-07-02 22:52:14 -07:00
t4011-diff-symlink.sh Rewrite "git-frotz" to "git frotz" 2007-07-02 22:52:14 -07:00
t4012-diff-binary.sh Rewrite "git-frotz" to "git frotz" 2007-07-02 22:52:14 -07:00
t4013-diff-various.sh Merge branch 'maint' 2007-07-03 22:56:59 -07:00
t4014-format-patch.sh t/t4014: test "am -3" with mode-only change. 2007-09-18 15:19:47 -07:00
t4015-diff-whitespace.sh diff: Fix miscounting of --check output 2008-02-15 23:06:57 -08:00
t4016-diff-quote.sh Get rid of the dependency to GNU diff in the tests 2007-03-04 00:24:15 -08:00
t4017-diff-retval.sh Test interaction between diff --check and --exit-code 2007-12-14 20:52:26 -08:00
t4017-quiet.sh Add tests for --quiet option of diff programs 2007-03-16 02:13:27 -07:00
t4018-diff-funcname.sh Make test scripts executable. 2007-11-22 16:48:55 -08:00
t4019-diff-wserror.sh Use gitattributes to define per-path whitespace rule 2007-12-06 00:45:30 -08:00
t4020-diff-external.sh the use of 'tr' in the test suite isn't really portable 2007-12-17 20:49:18 -08:00
t4021-format-patch-numbered.sh format-patch: Test --[no-]numbered and format.numbered 2007-11-04 01:26:30 -08:00
t4021-format-patch-signer-mime.sh test format-patch -s: make sure MIME content type is shown as needed 2007-11-07 18:37:28 -08:00
t4022-diff-rewrite.sh Fix "quote" misconversion for rewrite diff output. 2007-11-21 23:06:44 -08:00
t4023-diff-rename-typechange.sh rename: Break filepairs with different types. 2007-12-02 02:24:46 -08:00
t4024-diff-optimize-common.sh t4024: fix test script to use simpler sed pattern 2007-12-20 01:11:37 -08:00
t4025-hunk-header.sh diff: do not chomp hunk-header in the middle of a character 2008-01-06 22:44:44 -08:00
t4026-color.sh Fix parsing numeric color values 2008-02-06 14:02:41 -08:00
t4100-apply-stat.sh Rewrite "git-frotz" to "git frotz" 2007-07-02 22:52:14 -07:00
t4101-apply-nonl.sh Rewrite "git-frotz" to "git frotz" 2007-07-02 22:52:14 -07:00
t4102-apply-rename.sh Rewrite "git-frotz" to "git frotz" 2007-07-02 22:52:14 -07:00
t4103-apply-binary.sh the use of 'tr' in the test suite isn't really portable 2007-12-17 20:49:18 -08:00
t4104-apply-boundary.sh Rewrite "git-frotz" to "git frotz" 2007-07-02 22:52:14 -07:00
t4109-apply-multifrag.sh Rewrite "git-frotz" to "git frotz" 2007-07-02 22:52:14 -07:00
t4110-apply-scan.sh Rewrite "git-frotz" to "git frotz" 2007-07-02 22:52:14 -07:00
t4112-apply-renames.sh Rewrite "git-frotz" to "git frotz" 2007-07-02 22:52:14 -07:00
t4113-apply-ending.sh Rewrite "git-frotz" to "git frotz" 2007-07-02 22:52:14 -07:00
t4114-apply-typechange.sh Rewrite "git-frotz" to "git frotz" 2007-07-02 22:52:14 -07:00
t4115-apply-symlink.sh Rewrite "git-frotz" to "git frotz" 2007-07-02 22:52:14 -07:00
t4116-apply-reverse.sh the use of 'tr' in the test suite isn't really portable 2007-12-17 20:49:18 -08:00
t4117-apply-reject.sh Rewrite "git-frotz" to "git frotz" 2007-07-02 22:52:14 -07:00
t4118-apply-empty-context.sh Rewrite "git-frotz" to "git frotz" 2007-07-02 22:52:14 -07:00
t4119-apply-config.sh t4119: correct overeager war-on-whitespace 2007-11-24 16:46:42 -08:00
t4120-apply-popt.sh Rewrite "git-frotz" to "git frotz" 2007-07-02 22:52:14 -07:00
t4121-apply-diffs.sh Rewrite "git-frotz" to "git frotz" 2007-07-02 22:52:14 -07:00
t4122-apply-symlink-inside.sh War on whitespace 2007-06-07 00:04:01 -07:00
t4123-apply-shrink.sh git-apply: do not read past the end of buffer 2007-09-05 21:58:40 -07:00
t4124-apply-ws-rule.sh Use gitattributes to define per-path whitespace rule 2007-12-06 00:45:30 -08:00
t4200-rerere.sh the use of 'tr' in the test suite isn't really portable 2007-12-17 20:49:18 -08:00
t4201-shortlog.sh Officially deprecate repo-config. 2008-01-17 22:52:40 -08:00
t4202-log.sh Fix "git log --diff-filter" bug 2007-12-26 11:57:36 -08:00
t5000-tar-tree.sh archive: fix subst file generation 2007-09-13 23:20:47 -07:00
t5100-mailinfo.sh mailinfo: feed only one line to handle_filter() for QP input 2008-02-15 22:16:34 -08:00
t5300-pack-object.sh the use of 'tr' in the test suite isn't really portable 2007-12-17 20:49:18 -08:00
t5301-sliding-window.sh Rewrite "git-frotz" to "git frotz" 2007-07-02 22:52:14 -07:00
t5302-pack-index.sh rehabilitate some t5302 tests on 32-bit off_t machines 2007-11-15 21:18:07 -08:00
t5304-prune.sh Make git prune remove temporary packs that look like write failures 2008-02-11 12:22:58 -08:00
t5400-send-pack.sh send-pack: respect '+' on wildcard refspecs 2007-10-19 22:59:10 -04:00
t5401-update-hooks.sh Use 'printf %s $x' notation in t5401 2008-01-30 17:17:39 -08:00
t5402-post-merge-hook.sh Add post-merge hook, related documentation, and tests. 2007-09-18 17:40:24 -07:00
t5403-post-checkout-hook.sh fix t5403-post-checkout-hook.sh: built-in test in dash does not have "==" 2007-10-15 20:26:01 -04:00
t5404-tracking-branches.sh send-pack: check ref->status before updating tracking refs 2007-11-17 12:10:50 -08:00
t5405-send-pack-rewind.sh send-pack: segfault fix on forced push 2007-11-08 01:43:34 -08:00
t5406-remote-rejects.sh send-pack: assign remote errors to each ref 2007-11-17 12:10:50 -08:00
t5500-fetch-pack.sh git-clone: aggressively optimize local clone behaviour. 2007-08-01 23:42:36 -07:00
t5502-quickfetch.sh git-fetch: avoid local fetching from alternate (again) 2007-11-11 17:09:55 -08:00
t5505-remote.sh Don't use GIT_CONFIG in t5505-remote 2008-02-27 00:22:39 -08:00
t5510-fetch.sh t5510: add a bit more tests for fetch 2007-12-04 21:58:42 -08:00
t5512-ls-remote.sh Reteach builtin-ls-remote to understand remotes 2007-11-06 22:51:04 -08:00
t5515-fetch-merge-logic.sh Don't attempt to merge non-existant remotes in t5515 2007-09-19 03:22:31 -07:00
t5516-fetch-push.sh Merge branch 'sp/refspec-match' 2007-12-04 17:07:10 -08:00
t5517-push-mirror.sh Add tests for git push'es mirror mode 2007-11-12 18:22:09 -08:00
t5520-pull.sh pull --rebase: be cleverer with rebased upstream branches 2008-01-26 18:24:24 -08:00
t5530-upload-pack-error.sh upload-pack: Use finish_{command,async}() instead of waitpid(). 2007-11-05 22:47:28 -08:00
t5600-clone-fail-cleanup.sh Assorted typo fixes 2007-02-03 21:49:54 -08:00
t5700-clone-reference.sh fetch: if not fetching from default remote, ignore default merge 2007-10-16 01:24:18 -04:00
t5701-clone-local.sh git-clone.sh: properly configure remote even if remote's head is dangling 2008-02-20 11:31:17 -08:00
t5702-clone-options.sh test "git clone -o" 2007-12-19 14:59:18 -08:00
t5710-info-alternate.sh Make t5710 more strict when creating nested repos 2008-01-21 17:24:12 -08:00
t6000lib.sh Rewrite "git-frotz" to "git frotz" 2007-07-02 22:52:14 -07:00
t6001-rev-list-graft.sh
t6002-rev-list-bisect.sh Rewrite "git-frotz" to "git frotz" 2007-07-02 22:52:14 -07:00
t6003-rev-list-topo-order.sh Rewrite "git-frotz" to "git frotz" 2007-07-02 22:52:14 -07:00
t6004-rev-list-path-optim.sh Rewrite "git-frotz" to "git frotz" 2007-07-02 22:52:14 -07:00
t6005-rev-list-count.sh Rewrite "git-frotz" to "git frotz" 2007-07-02 22:52:14 -07:00
t6006-rev-list-format.sh custom pretty format: tolerate empty e-mail address 2008-01-06 18:41:43 -08:00
t6007-rev-list-cherry-pick-file.sh revision walker: --cherry-pick is a limited operation 2007-09-15 16:34:11 -07:00
t6008-rev-list-submodule.sh Fix rev-list when showing objects involving submodules 2007-11-16 22:05:33 -08:00
t6010-merge-base.sh Rewrite "git-frotz" to "git frotz" 2007-07-02 22:52:14 -07:00
t6020-merge-df.sh
t6021-merge-criss-cross.sh War on whitespace 2007-06-07 00:04:01 -07:00
t6022-merge-rename.sh Add a test for merging changed and rename-changed branches 2007-04-25 23:43:16 -07:00
t6023-merge-file.sh Rewrite "git-frotz" to "git frotz" 2007-07-02 22:52:14 -07:00
t6023-merge-rename-nocruft.sh Keep untracked files not involved in a merge. 2007-02-03 22:04:28 -08:00
t6024-recursive-merge.sh Rewrite "git-frotz" to "git frotz" 2007-07-02 22:52:14 -07:00
t6025-merge-symlinks.sh Rewrite "git-frotz" to "git frotz" 2007-07-02 22:52:14 -07:00
t6026-merge-attr.sh Custom low-level merge driver: change the configuration scheme. 2007-04-18 12:30:26 -07:00
t6027-merge-binary.sh merge-recursive: do not rudely die on binary merge 2007-08-14 22:20:01 -07:00
t6028-merge-up-to-date.sh git-merge: do up-to-date check also for all strategies 2007-08-27 23:48:28 -07:00
t6030-bisect-porcelain.sh Eliminate confusing "won't bisect on seeked tree" failure 2008-02-27 13:26:30 -08:00
t6031-merge-recursive.sh merge-recursive: handle file mode changes 2008-03-13 23:41:16 -07:00
t6101-rev-parse-parents.sh Rewrite "git-frotz" to "git frotz" 2007-07-02 22:52:14 -07:00
t6120-describe.sh Rewrite "git-frotz" to "git frotz" 2007-07-02 22:52:14 -07:00
t6200-fmt-merge-msg.sh Get rid of the dependency to GNU diff in the tests 2007-03-04 00:24:15 -08:00
t6300-for-each-ref.sh for-each-ref: Fix quoting style constants. 2007-12-06 07:53:20 -08:00
t7001-mv.sh t/t7001: avoid unnecessary ERE when using grep 2008-01-05 00:07:57 -08:00
t7002-grep.sh Split grep arguments in a way that does not requires to add /dev/null. 2007-09-14 15:16:43 -07:00
t7003-filter-branch.sh filter-branch: handle "disappearing tree" case correctly in subdir filter 2008-03-08 13:25:57 -08:00
t7004-tag.sh Force the sticked form for options with optional arguments. 2007-12-22 10:26:08 -08:00
t7005-editor.sh launch_editor(): allow spaces in the filename 2008-03-11 19:57:56 -07:00
t7101-reset.sh Rewrite "git-frotz" to "git frotz" 2007-07-02 22:52:14 -07:00
t7102-reset.sh builtin-reset: avoid forking "update-index --refresh" 2007-11-05 22:47:22 -08:00
t7103-reset-bare.sh git-reset: refuse to do hard reset in a bare repository 2008-01-02 02:28:54 -08:00
t7201-co.sh Add more checkout tests 2007-12-10 11:24:56 -08:00
t7300-clean.sh t7300: add test for clean with wildcard pathspec 2007-12-05 22:47:45 -08:00
t7400-submodule-basic.sh git-submodule: add test for the subcommand parser fix 2008-01-20 20:57:42 -08:00
t7500-commit.sh builtin-commit --s: add a newline if the last line was not a S-o-b 2007-11-22 17:05:03 -08:00
t7501-commit.sh Fix "git-commit -C $tag" 2008-02-03 00:56:35 -08:00
t7502-commit.sh Allow selection of different cleanup modes for commit messages 2007-12-22 19:55:07 -08:00
t7502-status.sh commit: discard index after setting up partial commit 2008-02-16 00:12:56 -08:00
t7503-pre-commit-hook.sh Style fixes for pre-commit hook tests 2007-12-10 00:05:52 -08:00
t7504-commit-msg-hook.sh Interactive editor tests for commit-msg hook 2007-12-10 00:05:52 -08:00
t7600-merge.sh git-merge.sh: better handling of combined --squash,--no-ff,--no-commit options 2008-03-03 13:38:30 -08:00
t8001-annotate.sh Rewrite "git-frotz" to "git frotz" 2007-07-02 22:52:14 -07:00
t8002-blame.sh Rewrite "git-frotz" to "git frotz" 2007-07-02 22:52:14 -07:00
t8003-blame.sh Add test for blame corner cases. 2007-05-05 22:40:39 -07:00
t8004-blame.sh git-blame shouldn't crash if run in an unmerged tree 2007-10-18 02:31:30 -04:00
t9001-send-email.sh send-email: fix In-Reply-To regression 2008-02-27 13:26:14 -08:00
t9100-git-svn-basic.sh Rewrite "git-frotz" to "git frotz" 2007-07-02 22:52:14 -07:00
t9101-git-svn-props.sh Merge branch 'maint' 2007-11-16 21:30:06 -08:00
t9102-git-svn-deep-rmdir.sh Start all test scripts with /bin/sh. 2007-01-15 18:57:48 -08:00
t9103-git-svn-tracked-directory-removed.sh git-svn: handle our top-level path being deleted and later re-added 2007-12-14 12:06:23 -08:00
t9104-git-svn-follow-parent.sh git-svn: handle changed svn command-line syntax 2007-09-21 02:42:16 -07:00
t9105-git-svn-commit-diff.sh git-svn: don't attempt to minimize URLs by default 2007-05-13 12:10:43 -07:00
t9106-git-svn-commit-diff-clobber.sh git-svn: fix dcommit clobbering upstream when committing multiple changes 2007-08-31 23:22:51 -07:00
t9106-git-svn-dcommit-clobber-series.sh t9106: fix a race condition that caused svn to miss modifications 2007-11-21 20:11:11 -08:00
t9107-git-svn-migrate.sh git-svn: replace .rev_db with a more space-efficient .rev_map format 2007-12-10 21:28:25 -08:00
t9108-git-svn-glob.sh git-svn: brown paper bag fixes 2007-02-23 00:57:12 -08:00
t9110-git-svn-use-svm-props.sh Rewrite "git-frotz" to "git frotz" 2007-07-02 22:52:14 -07:00
t9111-git-svn-use-svnsync-props.sh Rewrite "git-frotz" to "git frotz" 2007-07-02 22:52:14 -07:00
t9112-git-svn-md5less-file.sh Fix git-svn to handle svn not reporting the md5sum of a file, and test. 2007-05-26 01:17:58 -07:00
t9113-git-svn-dcommit-new-file.sh git-svn: test for creating new directories over svn:// 2007-06-13 11:01:49 -07:00
t9114-git-svn-dcommit-merge.sh git-svn: t9114: verify merge commit message in test 2007-11-05 12:58:39 -08:00
t9115-git-svn-dcommit-funky-renames.sh git-svn: fix commiting renames over DAV with funky file names 2007-07-15 22:35:09 -07:00
t9116-git-svn-log.sh git-svn log: handle unreachable revisions like "svn log" 2007-11-17 13:28:21 -08:00
t9117-git-svn-init-clone.sh git-svn: add tests for command-line usage of init and clone commands 2007-11-17 13:28:21 -08:00
t9118-git-svn-funky-branch-names.sh git-svn: support for funky branch and project names over HTTP(S) 2007-11-12 00:22:49 -08:00
t9119-git-svn-info.sh disable t9119 for now. 2007-12-12 11:53:29 -08:00
t9200-git-cvsexportcommit.sh Merge branch 'js/maint-cvsexport' into maint 2008-03-08 02:13:52 -08:00
t9300-fast-import.sh Really make the LF after reset in fast-import optional 2008-03-08 10:46:10 -08:00
t9301-fast-export.sh fast-export: rename the signed tag mode 'ignore' to 'verbatim' 2007-12-03 23:43:07 -08:00
t9400-git-cvsserver-server.sh cvsserver: Fix for histories with multiple roots 2008-01-26 17:58:18 -08:00
t9500-gitweb-standalone-no-errors.sh gitweb: Make config_to_multi return [] instead of [undef] 2007-12-16 11:56:27 -08:00
t9600-cvsimport.sh t9600: require cvsps 2.1 to perform tests 2007-12-04 14:43:05 -08:00
test4012.png
test9200a.png
test9200b.png
test-lib.sh test-lib: fix TERM to dumb for test repeatability 2008-03-07 13:29:07 -08:00

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

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

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


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

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

    *** t0000-basic.sh ***
    *   ok 1: .git/objects should be empty after git-init in an empty repo.
    *   ok 2: .git/objects should have 256 subdirectories.
    *   ok 3: git-update-index without --add should fail adding.
    ...
    *   ok 23: no diff after checkout and git-update-index --refresh.
    * passed all 23 test(s)
    *** t0100-environment-names.sh ***
    *   ok 1: using old names should issue warnings.
    *   ok 2: using old names but having new names should not issue warnings.
    ...

Or you can run each test individually from command line, like
this:

    $ sh ./t3001-ls-files-killed.sh
    *   ok 1: git-update-index --add to add various paths.
    *   ok 2: git-ls-files -k to show killed files.
    *   ok 3: validate git-ls-files -k output.
    * passed all 3 test(s)

You can pass --verbose (or -v), --debug (or -d), and --immediate
(or -i) command line argument to the test.

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

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

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


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

The test files are named as:

	tNNNN-commandname-details.sh

where N is a decimal digit.

First digit tells the family:

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

Second digit tells the particular command we are testing.

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

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


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

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

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

	test_description='xxx test (option --frotz)

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


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

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

	. ./test-lib.sh

This test harness library does the following things:

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

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

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


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

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


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

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

 - test_expect_success <message> <script>

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

   Example:

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

 - test_expect_failure <message> <script>

   This is the opposite of test_expect_success.  If <script>
   yields success, test is considered a failure.

   Example:

	test_expect_failure \
	    'git-update-index without --add should fail adding.' \
	    'git-update-index should-be-empty'

 - test_debug <script>

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

 - test_done

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


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

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

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