1
0
mirror of https://github.com/git/git.git synced 2024-09-29 05:01:36 +02:00
git/t
Shawn O. Pearce 85682c1903 Correct handling of branch.$name.merge in builtin-fetch
My prior bug fix for git-push titled "Don't configure remote "." to
fetch everything to itself" actually broke t5520 as we were unable
to evaluate a branch configuration of:

  [branch "copy"]
    remote = .
    merge = refs/heads/master

as remote "." did not have a "remote...fetch" configuration entry to
offer up refs/heads/master as a possible candidate available to be
fetched and merged.  In shell script git-fetch and prior to the above
mentioned commit this was hardcoded for a url of "." to be the set of
local branches.

Chasing down this bug led me to the conclusion that our prior behavior
with regards to branch.$name.merge was incorrect.  In the shell script
based git-fetch implementation we only fetched and merged a branch if
it appeared both in branch.$name.merge *and* in remote.$r.fetch, where
$r = branch.$name.remote.  In other words in the following config file:

  [remote "origin"]
    url = git://git.kernel.org/pub/scm/git/git.git
    fetch = refs/heads/master:refs/remotes/origin/master
  [branch "master"]
    remote = origin
    merge = refs/heads/master
  [branch "pu"]
    remote = origin
    merge = refs/heads/pu

Attempting to run `git pull` while on branch "pu" would always give
the user "Already up-to-date" as git-fetch did not fetch pu and thus
did not mark it for merge in .git/FETCH_HEAD.  The configured merge
would always be ignored and the user would be left scratching her
confused head wondering why merge did not work on "pu" but worked
fine on "master".

If we are using the "default fetch" specification for the current
branch and the current branch has a branch.$name.merge configured
we now union it with the list of refs in remote.$r.fetch.  This
way the above configuration does what the user expects it to do,
which is to fetch only "master" by default but when on "pu" to
fetch both "master" and "pu".

This uncovered some breakage in the test suite where old-style Cogito
branches (.git/branches/$r) did not fetch the branches listed in
.git/config for merging and thus did not actually merge them if the
user tried to use `git pull` on that branch.  Junio and I discussed
it on list and felt that the union approach here makes more sense to
DWIM for the end-user than silently ignoring their configured request
so the test vectors for t5515 have been updated to include for-merge
lines in .git/FETCH_HEAD where they have been configured for-merge
in .git/config.

Since we are now performing a union of the fetch specification and
the merge specification and we cannot allow a branch to be listed
twice (otherwise it comes out twice in .git/FETCH_HEAD) we need to
perform a double loop here over all of the branch.$name.merge lines
and try to set their merge flag if we have already schedule that
branch for fetching by remote.$r.fetch.  If no match is found then
we must add new specifications to fetch the branch but not store it
as no local tracking branch has been designated.

Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
2007-09-19 03:22:31 -07:00
..
t3900
t4013 Merge branch 'maint' 2007-07-03 22:56:59 -07:00
t4100
t4101
t5100 git-mailinfo fixes for patch munging 2007-03-31 00:59:19 -07: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
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 Fix permissions on test scripts 2007-04-16 16:53:09 -07:00
lib-git-svn.sh git-svn: fix commiting renames over DAV with funky file names 2007-07-15 22:35:09 -07: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 Fix initialization of a bare repository 2007-08-27 22:36:43 -07:00
t0010-racy-git.sh
t0020-crlf.sh attr.c: read .gitattributes from index as well. 2007-08-14 23:19:10 -07:00
t0021-conversion.sh Add test case for $Id$ expanded in the repository 2007-05-28 23:54:35 -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
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 Add a test for git-config --file 2007-07-31 22:56:15 -07:00
t1301-shared-repo.sh t1301-shared-repo.sh: fix 'stat' portability issue 2007-08-16 15:32:46 -07:00
t1400-update-ref.sh Cleanup unnecessary file modifications in t1400-update-ref 2007-09-05 23:17:04 -07:00
t1410-reflog.sh
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 Clean up work-tree handling 2007-08-01 00:38:31 -07: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
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 Add test to check recent fix to "git add -u" 2007-09-14 14:30:05 -07: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 Rewrite "git-frotz" to "git frotz" 2007-07-02 22:52:14 -07: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
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
t3210-pack-refs.sh Rewrite "git-frotz" to "git frotz" 2007-07-02 22:52:14 -07:00
t3300-funny-names.sh Rewrite "git-frotz" to "git frotz" 2007-07-02 22:52:14 -07: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
t3403-rebase-skip.sh Rewrite "git-frotz" to "git frotz" 2007-07-02 22:52:14 -07:00
t3404-rebase-interactive.sh rebase -i: fix squashing corner case 2007-08-23 02:34:19 -07: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
t3500-cherry.sh Rewrite "git-frotz" to "git frotz" 2007-07-02 22:52:14 -07:00
t3501-revert-cherry-pick.sh
t3600-rm.sh More permissive "git-rm --cached" behavior without -f. 2007-07-13 23:52:46 -07:00
t3700-add.sh git-add: Add support for --refresh option. 2007-08-13 12:58:38 -07:00
t3800-mktag.sh Rewrite "git-frotz" to "git frotz" 2007-07-02 22:52:14 -07:00
t3900-i18n-commit.sh Rewrite "git-frotz" to "git frotz" 2007-07-02 22:52:14 -07:00
t3901-8859-1.txt
t3901-i18n-patch.sh Rewrite "git-frotz" to "git frotz" 2007-07-02 22:52:14 -07:00
t3901-utf8.txt
t3902-quoted.sh t3902 - skip test if file system doesn't support HT in names 2007-08-13 12:58:38 -07:00
t3903-stash.sh Make sure git-stash works from subdirectory. 2007-07-25 15:34:52 -07:00
t4000-diff-format.sh Rewrite "git-frotz" to "git frotz" 2007-07-02 22:52:14 -07:00
t4001-diff-rename.sh Rewrite "git-frotz" to "git frotz" 2007-07-02 22:52:14 -07: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 Rewrite "git-frotz" to "git frotz" 2007-07-02 22:52:14 -07: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 Rewrite "git-frotz" to "git frotz" 2007-07-02 22:52:14 -07:00
t4016-diff-quote.sh
t4017-diff-retval.sh Allow git-diff exit with codes similar to diff(1) 2007-03-14 16:21:19 -07:00
t4017-quiet.sh Add tests for --quiet option of diff programs 2007-03-16 02:13:27 -07:00
t4018-diff-funcname.sh Fix configuration syntax to specify customized hunk header patterns. 2007-07-07 01:49:58 -07:00
t4020-diff-external.sh diff: honor binariness specified in attributes 2007-07-07 12:25:11 -07: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 Rewrite "git-frotz" to "git frotz" 2007-07-02 22:52:14 -07: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 Merge branch 'maint' 2007-07-07 12:29:09 -07: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 Rewrite "git-frotz" to "git frotz" 2007-07-02 22:52:14 -07: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
t4200-rerere.sh rerere: record resolution even if file is not in merge base 2007-07-09 23:39:59 -07:00
t4201-shortlog.sh Rewrite "git-frotz" to "git frotz" 2007-07-02 22:52:14 -07:00
t5000-tar-tree.sh archive: rename attribute specfile to export-subst 2007-09-06 22:51:41 -07:00
t5100-mailinfo.sh Rewrite "git-frotz" to "git frotz" 2007-07-02 22:52:14 -07:00
t5300-pack-object.sh Rewrite "git-frotz" to "git frotz" 2007-07-02 22:52:14 -07:00
t5301-sliding-window.sh Rewrite "git-frotz" to "git frotz" 2007-07-02 22:52:14 -07:00
t5302-pack-index.sh Rewrite "git-frotz" to "git frotz" 2007-07-02 22:52:14 -07:00
t5400-send-pack.sh git-push: documentation and tests for pushing only branches 2007-09-18 14:00:20 -07:00
t5401-update-hooks.sh Rewrite "git-frotz" to "git frotz" 2007-07-02 22:52:14 -07:00
t5500-fetch-pack.sh git-clone: aggressively optimize local clone behaviour. 2007-08-01 23:42:36 -07:00
t5502-quickfetch.sh Make sure quickfetch is not fooled with a previous, incomplete fetch. 2007-04-17 00:14:59 -07:00
t5510-fetch.sh allow git-bundle to create bottomless bundle 2007-08-10 22:19:06 -07: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 Fix t5516 to create test repo without hooks 2007-07-04 12:41:42 -07:00
t5520-pull.sh War on whitespace 2007-06-07 00:04:01 -07:00
t5600-clone-fail-cleanup.sh
t5700-clone-reference.sh git-clone: aggressively optimize local clone behaviour. 2007-08-01 23:42:36 -07:00
t5701-clone-local.sh git-clone: allow --bare clone 2007-08-15 21:39:07 -07:00
t5710-info-alternate.sh War on whitespace 2007-06-07 00:04:01 -07: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 Rewrite "git-frotz" to "git frotz" 2007-07-02 22:52:14 -07:00
t6007-rev-list-cherry-pick-file.sh revision walker: --cherry-pick is a limited operation 2007-09-15 16:34:11 -07: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
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 War on whitespace 2007-06-07 00:04:01 -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
t7001-mv.sh Rewrite "git-frotz" to "git frotz" 2007-07-02 22:52:14 -07: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: introduce convenience function "skip_commit" 2007-08-31 23:22:51 -07:00
t7004-tag.sh git-tag -s must fail if gpg cannot sign the tag. 2007-09-09 21:30:54 -07:00
t7005-editor.sh Add GIT_EDITOR environment and core.editor configuration variables 2007-07-20 00:46:34 -07:00
t7101-reset.sh Rewrite "git-frotz" to "git frotz" 2007-07-02 22:52:14 -07:00
t7102-reset.sh An additional test for "git-reset -- path" 2007-09-13 20:54:14 -07:00
t7201-co.sh checkout: do not get confused with ambiguous tag/branch names 2007-06-08 01:19:13 -07:00
t7300-clean.sh Rewrite "git-frotz" to "git frotz" 2007-07-02 22:52:14 -07:00
t7400-submodule-basic.sh git-diff: don't squelch the new SHA1 in submodule diffs 2007-09-09 02:28:57 -07:00
t7500-commit.sh Teach git-commit about commit message templates. 2007-07-24 20:46:54 -07:00
t7501-commit.sh git-commit: partial commit of paths only removed from the index 2007-09-17 23:57:35 -07: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
t9001-send-email.sh
t9100-git-svn-basic.sh Rewrite "git-frotz" to "git frotz" 2007-07-02 22:52:14 -07:00
t9101-git-svn-props.sh
t9102-git-svn-deep-rmdir.sh
t9104-git-svn-follow-parent.sh Rewrite "git-frotz" to "git frotz" 2007-07-02 22:52:14 -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
t9107-git-svn-migrate.sh Rewrite "git-frotz" to "git frotz" 2007-07-02 22:52:14 -07:00
t9108-git-svn-glob.sh
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: allow dcommit to retain local merge information 2007-06-13 11:24:23 -07: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: fix log with single revision against a non-HEAD branch 2007-08-15 12:09:48 -07:00
t9200-git-cvsexportcommit.sh t9200: Be careful when checking CVS/Entries 2007-07-25 00:06:38 -07:00
t9300-fast-import.sh Allow frontends to bidirectionally communicate with fast-import 2007-08-19 03:38:36 -04:00
t9400-git-cvsserver-server.sh config: add support for --bool and --int while setting values 2007-06-26 23:16:17 -07:00
t9500-gitweb-standalone-no-errors.sh Fix a test failure (t9500-*.sh) on cygwin 2007-09-11 23:05:35 -07:00
test4012.png
test9200a.png
test9200b.png
test-lib.sh Unset GIT_EDITOR while running tests. 2007-07-30 22:16:40 -07:00

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

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

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


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

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

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