git/t
Jay Soffian da3efdb17b receive-pack: detect aliased updates which can occur with symrefs
When pushing to a remote repo the sending side filters out aliased
updates (e.g., foo:baz bar:baz). However, it is not possible for the
sender to know if two refs are aliased on the receiving side via
symrefs. Here is one such scenario:

  $ git init origin
  $ (cd origin && touch file && git add file && git commit -a -m intial)
  $ git clone --bare origin origin.git
  $ rm -rf origin

  $ git clone origin.git client

  $ git clone --mirror client backup.git &&
  $ (cd backup.git && git remote set-head origin --auto)

  $ (cd client &&
	git remote add --mirror backup ../backup.git &&
	echo change1 > file && git commit -a -m change1 &&
	git push origin &&
	git push backup
	)

The push to backup fails with:

  Counting objects: 5, done.
  Writing objects: 100% (3/3), 244 bytes, done.
  Total 3 (delta 0), reused 0 (delta 0)
  Unpacking objects: 100% (3/3), done.
  error: Ref refs/remotes/origin/master is at ef3... but expected 262...
  remote: error: failed to lock refs/remotes/origin/master
  To ../backup.git
     262cd57..ef307ff  master -> master
     262cd57..ef307ff  origin/HEAD -> origin/HEAD
   ! [remote rejected] origin/master -> origin/master (failed to lock)
  error: failed to push some refs to '../backup.git'

The reason is that refs/remotes/origin/HEAD is a symref to
refs/remotes/origin/master, but it is not possible for the sending side
to unambiguously know this.

This commit fixes the issue by having receive-pack ignore any update to
a symref whose target is being identically updated. If a symref and its
target are being updated inconsistently, then the update for both fails
with an error message ("refusing inconsistent update...") to help
diagnose the situation.

Signed-off-by: Jay Soffian <jaysoffian@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2010-04-19 22:19:07 -07:00
..
lib-httpd Smart-http: check if repository is OK to export before serving it 2010-01-06 01:16:50 -08:00
t3900
t4013 Let --decorate show HEAD position 2009-10-12 16:22:35 -07:00
t4020
t4100
t4101
t4109
t4110
t4252
t5100 mailinfo: do not strip leading spaces even for a header line 2010-02-19 21:55:33 -08:00
t5515
t7004
t7006 t7006-pager: if stdout is not a terminal, make a new one 2010-02-21 11:08:17 -08:00
t7500
t8005 Remove unused t/t8005/iso8859-5.txt 2009-08-29 00:50:31 -07:00
t9110
t9111
t9115
t9121
t9126
t9135
t9136
t9150 git-svn: add test data for SVK merge, with script. 2009-10-26 23:45:41 -07:00
t9151 git-svn: update svn mergeinfo test suite 2010-01-23 03:23:04 -08:00
t9153 git-svn: allow UUID to be manually remapped via rewriteUUID 2010-01-23 03:23:04 -08:00
t9154 git-svn: allow subset of branches/tags to be specified in glob spec 2010-01-23 03:23:04 -08:00
t9601/cvsroot
t9602
t9603/cvsroot
t9700 t9700-perl-git.sh: Fix a test failure on Cygwin 2009-11-19 23:01:09 -08:00
valgrind
.gitattributes
.gitignore
Makefile t/Makefile: remove test artifacts upon "make clean" 2010-03-13 12:41:20 -08:00
README run test suite without dashed git-commands in PATH 2009-12-03 11:38:00 -08:00
aggregate-results.sh
annotate-tests.sh
diff-lib.sh tests: move convenience regexp to match object names to test-lib.sh 2010-01-03 21:17:16 -08:00
gitweb-lib.sh gitweb: Load checking 2010-01-30 15:53:50 -08:00
lib-cvs.sh
lib-git-svn.sh git-svn: allow test setup script to support PERL env. var 2009-10-26 23:49:02 -07:00
lib-httpd.sh t/lib-http.sh: Restructure finding of default httpd location 2010-01-06 01:07:07 -08:00
lib-patch-mode.sh Merge branch 'jc/maint-fix-test-perm' into maint 2010-03-02 22:38:02 -08:00
lib-read-tree-m-3way.sh
lib-rebase.sh rebase -i: Enclose sed command substitution in quotes 2010-01-22 13:18:38 -08:00
t0000-basic.sh
t0001-init.sh
t0002-gitfile.sh
t0003-attributes.sh
t0004-unwritable.sh
t0005-signals.sh
t0006-date.sh Fix '--relative-date' 2009-10-03 06:04:38 -04:00
t0010-racy-git.sh
t0020-crlf.sh tests: consolidate CR removal/addition functions 2010-01-25 16:42:23 -08:00
t0021-conversion.sh t0021: use $SHELL_PATH for the filter script 2010-01-05 23:40:43 -08:00
t0022-crlf-rename.sh t0022: replace non-portable literal CR 2010-01-25 16:43:28 -08:00
t0023-crlf-am.sh
t0024-crlf-archive.sh
t0030-stripspace.sh
t0040-parse-options.sh parse-opt: ignore negation of OPT_NONEG for ambiguity checks 2009-09-29 07:28:47 -07:00
t0050-filesystem.sh t0050: mark non-working test as such 2010-03-13 23:22:50 -08:00
t0055-beyond-symlinks.sh
t0060-path-utils.sh
t0061-run-command.sh start_command: detect execvp failures early 2010-01-10 10:15:03 -08:00
t0070-fundamental.sh
t0100-previous.sh
t0101-at-syntax.sh t0101: use absolute date 2010-01-28 00:58:17 -08:00
t556x_common Smart-http tests: Test http-backend without curl or a webserver 2010-01-06 01:18:37 -08:00
t1000-read-tree-m-3way.sh tests: move convenience regexp to match object names to test-lib.sh 2010-01-03 21:17:16 -08:00
t1001-read-tree-m-2way.sh tests: move convenience regexp to match object names to test-lib.sh 2010-01-03 21:17:16 -08:00
t1002-read-tree-m-u-2way.sh tests: move convenience regexp to match object names to test-lib.sh 2010-01-03 21:17:16 -08:00
t1003-read-tree-prefix.sh
t1004-read-tree-m-u-wf.sh
t1005-read-tree-reset.sh
t1006-cat-file.sh
t1007-hash-object.sh
t1008-read-tree-overlay.sh
t1009-read-tree-new-index.sh read-tree: Fix regression with creation of a new index file. 2009-08-17 09:20:52 -07:00
t1010-mktree.sh
t1011-read-tree-sparse-checkout.sh tests: rename duplicate t1009 2009-11-25 16:08:22 -08:00
t1012-read-tree-df.sh unpack-trees.c: look ahead in the index 2010-01-07 15:00:14 -08:00
t1020-subdirectory.sh
t1100-commit-tree-options.sh
t1200-tutorial.sh t1200: work around a bug in some implementations of "find" 2009-12-26 13:59:31 -08:00
t1300-repo-config.sh Merge branch 'jh/maint-config-file-prefix' into maint 2010-02-10 13:02:05 -08:00
t1301-shared-repo.sh
t1302-repo-version.sh
t1303-wacky-config.sh
t1304-default-acl.sh Use git_mkstemp_mode instead of plain mkstemp to create object files 2010-02-22 15:24:46 -08:00
t1400-update-ref.sh
t1401-symbolic-ref.sh
t1402-check-ref-format.sh t1402: Make test executable 2009-11-02 10:46:23 -08:00
t1410-reflog.sh reflog: honor gc.reflogexpire=never 2010-02-28 10:28:26 -08:00
t1411-reflog-show.sh don't use default revision if a rev was specified 2010-03-13 21:23:43 -08:00
t1420-lost-found.sh
t1450-fsck.sh t1450: fix testcases that were wrongly expecting failure 2010-02-19 21:56:19 -08:00
t1500-rev-parse.sh
t1501-worktree.sh ignore duplicated slashes in make_relative_path() 2010-01-22 15:34:56 -08:00
t1502-rev-parse-parseopt.sh
t1503-rev-parse-verify.sh
t1504-ceiling-dirs.sh
t1505-rev-parse-last.sh
t1506-rev-parse-diagnosis.sh Detailed diagnosis when parsing an object name fails. 2009-12-07 13:35:06 -08:00
t1507-rev-parse-upstream.sh Fix log -g this@{upstream} 2010-01-26 13:49:50 -08:00
t1508-at-combinations.sh reject @{-1} not at beginning of object name 2010-01-28 12:12:50 -08:00
t2000-checkout-cache-clash.sh check_path(): allow symlinked directories to checkout-index --prefix 2009-08-18 03:32:45 -07:00
t2001-checkout-cache-clash.sh
t2002-checkout-cache-u.sh
t2003-checkout-cache-mkdir.sh
t2004-checkout-cache-temp.sh
t2005-checkout-index-symlinks.sh
t2007-checkout-symlink.sh
t2008-checkout-subdir.sh
t2009-checkout-statinfo.sh
t2010-checkout-ambiguous.sh
t2011-checkout-invalid-head.sh
t2012-checkout-last.sh "checkout A...B" switches to the merge base between A and B 2009-10-18 12:34:56 -07:00
t2013-checkout-submodule.sh
t2014-switch.sh
t2015-checkout-unborn.sh checkout: do not imply "-f" on unborn branches 2009-08-25 00:02:38 -07:00
t2016-checkout-patch.sh add-interactive: fix bogus diff header line ordering 2010-02-22 19:23:49 -08:00
t2030-unresolve-info.sh Make 'rerere forget' work from a subdirectory. 2010-01-21 00:42:20 -08:00
t2050-git-dir-relative.sh
t2100-update-cache-badpath.sh
t2101-update-index-reupdate.sh
t2102-update-index-symlinks.sh
t2103-update-index-ignore-missing.sh
t2104-update-index-skip-worktree.sh Introduce "skip-worktree" bit in index, teach Git to get/set this bit 2009-08-23 17:11:28 -07:00
t2105-update-index-gitfile.sh Make test case numbers unique 2010-01-21 00:01:00 -08:00
t2200-add-update.sh test for add with non-existent pathspec 2010-02-16 22:53:40 -08:00
t2201-add-update-typechange.sh
t2202-add-addremove.sh
t2203-add-intent.sh
t2204-add-ignored.sh tests for "git add ignored-dir/file" without -f 2010-03-13 23:23:22 -08:00
t2300-cd-to-toplevel.sh t2300: use documented technique to invoke git-sh-setup 2009-11-29 18:00:14 -08:00
t3000-ls-files-others.sh
t3001-ls-files-others-exclude.sh Merge branch 'jc/ls-files-ignored-pathspec' 2010-01-20 14:43:54 -08:00
t3002-ls-files-dashpath.sh
t3003-ls-files-exclude.sh ls-files: unbreak "ls-files -i" 2009-10-30 14:41:29 -07:00
t3010-ls-files-killed-modified.sh
t3020-ls-files-error-unmatch.sh
t3030-merge-recursive.sh Be more user-friendly when refusing to do something because of conflict. 2010-01-12 13:17:08 -08:00
t3031-merge-criscross.sh
t3040-subprojects-basic.sh
t3050-subprojects-fetch.sh
t3060-ls-files-with-tree.sh
t3100-ls-tree-restrict.sh tests: move convenience regexp to match object names to test-lib.sh 2010-01-03 21:17:16 -08:00
t3101-ls-tree-dirname.sh tests: move convenience regexp to match object names to test-lib.sh 2010-01-03 21:17:16 -08:00
t3200-branch.sh branch -d: base the "already-merged" safety on the branch it merges with 2009-12-30 01:24:56 -08:00
t3201-branch-contains.sh
t3202-show-branch-octopus.sh show-branch: fix segfault when showbranch.default exists 2009-10-04 14:44:34 -07:00
t3203-branch-output.sh
t3210-pack-refs.sh
t3300-funny-names.sh
t3301-notes.sh t3301-notes: insert a shbang line in ./fake_editor.sh 2010-02-25 12:20:16 -08:00
t3302-notes-index-expensive.sh t3302-notes-index-expensive: Speed up create_repo() 2009-10-19 19:00:24 -07:00
t3303-notes-subtrees.sh Add selftests verifying concatenation of multiple notes for the same commit 2009-10-19 19:00:24 -07:00
t3304-notes-mixed.sh Fix crasher on encountering SHA1-like non-note in notes tree 2009-12-03 10:10:35 -08:00
t3400-rebase.sh tests: consolidate CR removal/addition functions 2010-01-25 16:42:23 -08:00
t3401-rebase-partial.sh
t3402-rebase-merge.sh
t3403-rebase-skip.sh
t3404-rebase-interactive.sh rebase -i: Retain user-edited commit messages after squash/fixup conflicts 2010-01-14 00:27:57 -08:00
t3405-rebase-malformed.sh
t3406-rebase-message.sh
t3407-rebase-abort.sh
t3408-rebase-multi-line.sh fix portability issues with $ in double quotes 2010-01-26 15:16:54 -08:00
t3409-rebase-preserve-merges.sh t3409 t4107 t7406 t9150: use dashless commands 2009-11-29 23:09:47 -08:00
t3410-rebase-preserve-dropped-merges.sh
t3411-rebase-preserve-around-merges.sh
t3412-rebase-root.sh
t3413-rebase-hook.sh
t3414-rebase-preserve-onto.sh
t3415-rebase-autosquash.sh rebase -i --autosquash: auto-squash commits 2010-01-06 17:18:56 -08:00
t3416-rebase-onto-threedots.sh Make test case numbers unique 2010-01-21 00:01:00 -08:00
t3417-rebase-whitespace-fix.sh t3417: Add test cases for "rebase --whitespace=fix" 2010-03-06 23:53:00 -08:00
t3500-cherry.sh
t3501-revert-cherry-pick.sh Be more user-friendly when refusing to do something because of conflict. 2010-01-12 13:17:08 -08:00
t3502-cherry-pick-merge.sh
t3503-cherry-pick-root.sh
t3504-cherry-pick-rerere.sh
t3505-cherry-pick-empty.sh
t3600-rm.sh rm: fix bug in recursive subdirectory removal 2010-02-18 22:22:22 -08:00
t3700-add.sh test for add with non-existent pathspec 2010-02-16 22:53:40 -08:00
t3701-add-interactive.sh Merge branch 'jk/maint-add-p-delete-fix' into maint 2009-12-08 22:37:50 -08:00
t3702-add-edit.sh
t3800-mktag.sh
t3900-i18n-commit.sh
t3901-8859-1.txt
t3901-i18n-patch.sh
t3901-utf8.txt
t3902-quoted.sh t3902: Protect against OS X normalization 2010-02-08 23:06:08 -08:00
t3903-stash.sh stash pop: remove 'apply' options during 'drop' invocation 2010-02-15 21:46:27 -08:00
t3904-stash-patch.sh Implement 'git stash save --patch' 2009-08-15 15:19:31 -07:00
t4000-diff-format.sh
t4001-diff-rename.sh
t4002-diff-basic.sh
t4003-diff-rename-1.sh
t4004-diff-rename-symlink.sh
t4005-diff-rename-2.sh
t4006-diff-mode.sh tests: move convenience regexp to match object names to test-lib.sh 2010-01-03 21:17:16 -08:00
t4007-rename-3.sh
t4008-diff-break-rewrite.sh
t4009-diff-rename-4.sh
t4010-diff-pathspec.sh
t4011-diff-symlink.sh
t4012-diff-binary.sh tests: consolidate CR removal/addition functions 2010-01-25 16:42:23 -08:00
t4013-diff-various.sh git-log: allow --decorate[=short|full] 2009-08-26 12:05:58 -07:00
t4014-format-patch.sh format-patch: Squelch 'fatal: Not a range." error 2010-03-29 21:22:37 -07:00
t4015-diff-whitespace.sh No diff -b/-w output for all-whitespace changes 2009-11-20 22:00:36 -08:00
t4016-diff-quote.sh
t4017-diff-retval.sh Merge branch 'jc/conflict-marker-size' into maint 2010-04-09 22:38:34 -07:00
t4018-diff-funcname.sh
t4019-diff-wserror.sh t4019 "grep" portability fix 2009-12-26 13:59:34 -08:00
t4020-diff-external.sh
t4021-format-patch-numbered.sh
t4022-diff-rewrite.sh
t4023-diff-rename-typechange.sh
t4024-diff-optimize-common.sh
t4025-hunk-header.sh
t4026-color.sh Merge branch 'jc/color-attrs' into maint 2010-03-24 16:24:13 -07:00
t4027-diff-submodule.sh Teach diff that modified submodule directory is dirty 2010-01-16 16:40:56 -08:00
t4028-format-patch-mime-headers.sh
t4029-diff-trailing-space.sh
t4030-diff-textconv.sh t4030, t4031: work around bogus MSYS bash path conversion 2010-01-05 23:41:51 -08:00
t4031-diff-rewrite-binary.sh t4030, t4031: work around bogus MSYS bash path conversion 2010-01-05 23:41:51 -08:00
t4032-diff-inter-hunk-context.sh
t4033-diff-patience.sh
t4034-diff-words.sh Merge branch 'jk/1.7.0-status' 2009-12-27 23:01:32 -08:00
t4035-diff-quiet.sh
t4036-format-patch-signer-mime.sh
t4037-diff-r-t-dirs.sh
t4038-diff-combined.sh tests: update tests that used to fail 2010-01-28 00:41:52 -08:00
t4039-diff-assume-unchanged.sh Prevent diff machinery from examining assume-unchanged entries on worktree 2009-08-11 23:17:55 -07:00
t4040-whitespace-status.sh Make test case number unique 2009-08-27 16:45:12 -07:00
t4041-diff-submodule.sh Teach diff --submodule that modified submodule directory is dirty 2010-01-24 21:04:31 -08:00
t4100-apply-stat.sh
t4101-apply-nonl.sh
t4102-apply-rename.sh
t4103-apply-binary.sh
t4104-apply-boundary.sh apply: Remove the quick rejection test 2010-03-06 23:53:00 -08:00
t4105-apply-fuzz.sh
t4106-apply-stdin.sh
t4107-apply-ignore-whitespace.sh t3409 t4107 t7406 t9150: use dashless commands 2009-11-29 23:09:47 -08:00
t4109-apply-multifrag.sh
t4110-apply-scan.sh
t4112-apply-renames.sh
t4113-apply-ending.sh
t4114-apply-typechange.sh
t4115-apply-symlink.sh
t4116-apply-reverse.sh
t4117-apply-reject.sh
t4118-apply-empty-context.sh
t4119-apply-config.sh
t4120-apply-popt.sh builtin-apply.c: Skip filenames without enough components 2010-01-18 10:32:05 -08:00
t4121-apply-diffs.sh
t4122-apply-symlink-inside.sh
t4123-apply-shrink.sh
t4124-apply-ws-rule.sh t4124: Add additional tests of --whitespace=fix 2010-03-06 23:53:00 -08:00
t4125-apply-ws-fuzz.sh fix portability issues with $ in double quotes 2010-01-26 15:16:54 -08:00
t4126-apply-empty.sh
t4127-apply-same-fn.sh
t4128-apply-root.sh builtin-apply.c: pay attention to -p<n> when determining the name 2009-11-26 19:02:24 -08:00
t4129-apply-samemode.sh
t4130-apply-criss-cross-rename.sh
t4131-apply-fake-ancestor.sh
t4132-apply-removal.sh
t4133-apply-filenames.sh builtin-apply.c: fix the --- and +++ header filename consistency check 2010-01-18 17:08:59 -08:00
t4150-am.sh fix portability issues with $ in double quotes 2010-01-26 15:16:54 -08:00
t4151-am-abort.sh
t4200-rerere.sh Teach --[no-]rerere-autoupdate option to merge, revert and friends 2009-12-04 00:20:48 -08:00
t4201-shortlog.sh t4201: use ISO8859-1 rather than ISO-8859-1 2009-12-03 10:06:13 -08:00
t4202-log.sh fix portability issues with $ in double quotes 2010-01-26 15:16:54 -08:00
t4203-mailmap.sh
t4204-patch-id.sh
t4252-am-options.sh
t5000-tar-tree.sh archive: simplify archive format guessing 2010-02-07 15:40:27 -08:00
t5001-archive-attr.sh
t5100-mailinfo.sh git am/mailinfo: Don't look at in-body headers when rebasing 2009-11-20 23:14:02 -08:00
t5300-pack-object.sh Revert "pack-objects: fix pack generation when using pack_size_limit" 2010-02-08 10:56:21 -08:00
t5301-sliding-window.sh
t5302-pack-index.sh
t5303-pack-corruption-resilience.sh sha1_file: Fix infinite loop when pack is corrupted 2009-10-14 13:39:37 -07:00
t5304-prune.sh prune: honor --expire=never 2010-02-28 10:28:05 -08:00
t5305-include-tag.sh
t5306-pack-nobase.sh
t5307-pack-missing-commit.sh
t5400-send-pack.sh
t5401-update-hooks.sh receive-pack: Send internal errors over side-band #2 2010-02-10 09:51:07 -08:00
t5402-post-merge-hook.sh
t5403-post-checkout-hook.sh Merge branch 'maint-1.6.2' into maint-1.6.3 2010-01-18 21:29:47 -08:00
t5404-tracking-branches.sh
t5405-send-pack-rewind.sh
t5406-remote-rejects.sh
t5500-fetch-pack.sh Merge branch 'np/maint-1.6.3-deepen' 2009-08-28 19:38:56 -07:00
t5502-quickfetch.sh
t5503-tagfollow.sh
t5505-remote.sh Merge branch 'jc/maint-refs-dangling' into maint 2010-03-31 15:09:32 -07:00
t5506-remote-groups.sh Teach the --all option to 'git fetch' 2009-11-10 01:01:06 -08:00
t5510-fetch.sh remote: fix use-after-free error detected by glibc in ref_remove_duplicates 2009-11-14 16:03:06 -08:00
t5511-refspec.sh
t5512-ls-remote.sh
t5513-fetch-track.sh
t5514-fetch-multiple.sh Add the configuration option skipFetchAll 2009-11-10 01:01:07 -08:00
t5515-fetch-merge-logic.sh
t5516-fetch-push.sh receive-pack: detect aliased updates which can occur with symrefs 2010-04-19 22:19:07 -07:00
t5517-push-mirror.sh
t5518-fetch-exit-status.sh Use 'fast-forward' all over the place 2009-10-24 23:50:28 -07:00
t5519-push-alternates.sh
t5520-pull.sh allow pull --rebase on branch yet to be born 2009-08-12 15:50:09 -07:00
t5521-pull-options.sh fetch --all/--multiple: keep all the fetched branch information 2010-02-24 11:16:36 -08:00
t5522-pull-symlink.sh
t5523-push-upstream.sh Add push --set-upstream 2010-01-16 16:39:58 -08:00
t5524-pull-msg.sh pull: re-fix command line generation 2010-01-24 10:11:27 -08:00
t5530-upload-pack-error.sh Merge branch 'js/run-command-updates' 2009-08-10 22:14:57 -07:00
t5531-deep-submodule-push.sh tests: make all test files executable 2009-10-02 04:00:02 -04:00
t5540-http-push.sh test smart http fetch and push 2009-11-04 17:58:16 -08:00
t5541-http-push.sh t5541-http-push: make grep expression check for one line only 2010-01-25 09:53:02 -08:00
t5550-http-fetch.sh test smart http fetch and push 2009-11-04 17:58:16 -08:00
t5551-http-fetch.sh remote-curl: Fix Accept header for smart HTTP connections 2010-01-12 13:09:44 -08:00
t5560-http-backend-noserver.sh Test t5560: Fix test when run with dash 2010-01-15 21:05:35 -08:00
t5561-http-backend.sh Smart-http tests: Break test t5560-http-backend into pieces 2010-01-06 01:18:32 -08:00
t5600-clone-fail-cleanup.sh
t5601-clone.sh Merge branch 'maint-1.6.2' into maint-1.6.3 2009-09-03 09:42:38 -07:00
t5602-clone-remote-exec.sh
t5700-clone-reference.sh
t5701-clone-local.sh
t5702-clone-options.sh clone: use --progress to force progress reporting 2009-12-28 18:49:19 -08:00
t5704-bundle.sh
t5705-clone-2gb.sh fast-import: Stream very large blobs directly to pack 2010-02-01 12:09:47 -08:00
t5706-clone-branch.sh clone: add --branch option to select a different HEAD 2009-08-26 19:36:20 -07:00
t5710-info-alternate.sh
t6000lib.sh Merge commit 'b319ef7' into jc/maint-fix-test-perm 2010-01-30 16:03:10 -08:00
t6001-rev-list-graft.sh
t6002-rev-list-bisect.sh
t6003-rev-list-topo-order.sh
t6004-rev-list-path-optim.sh
t6005-rev-list-count.sh
t6006-rev-list-format.sh rev-list: fix --pretty=oneline with empty message 2010-03-21 11:44:27 -07:00
t6007-rev-list-cherry-pick-file.sh
t6008-rev-list-submodule.sh
t6009-rev-list-parent.sh
t6010-merge-base.sh
t6011-rev-list-with-bad-commit.sh
t6012-rev-list-simplify.sh tests: move convenience regexp to match object names to test-lib.sh 2010-01-03 21:17:16 -08:00
t6013-rev-list-reverse-parents.sh
t6014-rev-list-all.sh
t6015-rev-list-show-all-parents.sh graph API: fix bug in graph_is_interesting() 2009-08-21 12:41:25 -07:00
t6016-rev-list-graph-simplify-history.sh Add tests for rev-list --graph with options that simplify history 2009-08-24 14:39:29 -07:00
t6017-rev-list-stdin.sh Add trivial tests for --stdin option to log family 2009-11-23 00:49:47 -08:00
t6018-rev-list-glob.sh rev-parse --branches/--tags/--remotes=pattern 2010-01-20 12:30:25 -08:00
t6020-merge-df.sh
t6021-merge-criss-cross.sh
t6022-merge-rename.sh
t6023-merge-file.sh fix portability issues with $ in double quotes 2010-01-26 15:16:54 -08:00
t6024-recursive-merge.sh
t6025-merge-symlinks.sh
t6026-merge-attr.sh conflict-marker-size: add test and docs 2010-01-20 23:49:27 -08:00
t6027-merge-binary.sh
t6028-merge-up-to-date.sh Use 'fast-forward' all over the place 2009-10-24 23:50:28 -07:00
t6029-merge-subtree.sh Extend merge-subtree tests to test -Xsubtree=dir. 2010-01-17 22:46:28 -08:00
t6030-bisect-porcelain.sh Merge branch 'cc/maint-bisect-paths' into maint 2010-03-04 22:25:23 -08:00
t6031-merge-recursive.sh
t6032-merge-large-rename.sh
t6033-merge-crlf.sh tests: consolidate CR removal/addition functions 2010-01-25 16:42:23 -08:00
t6034-merge-rename-nocruft.sh
t6035-merge-dir-to-symlink.sh tests: update tests that used to fail 2010-01-28 00:41:52 -08:00
t6036-recursive-corner-cases.sh
t6037-merge-ours-theirs.sh Teach git-pull to pass -X<option> to git-merge 2010-01-17 22:45:17 -08:00
t6040-tracking-info.sh Add branch --set-upstream 2010-01-18 17:09:32 -08:00
t6050-replace.sh replace: use a GIT_NO_REPLACE_OBJECTS env variable 2009-11-20 22:08:10 -08:00
t6101-rev-parse-parents.sh
t6120-describe.sh describe: do not use unannotated tag even if exact match 2009-11-20 21:58:11 -08:00
t6200-fmt-merge-msg.sh
t6300-for-each-ref.sh
t7001-mv.sh git-mv: fix moving more than one source to a single destination 2010-01-22 14:31:30 -08:00
t7002-grep.sh Merge branch 'jc/grep-author-all-match-implicit' into maint 2010-03-08 00:35:59 -08:00
t7003-filter-branch.sh filter-branch: Add tests for submodules in tree-filter 2010-01-28 13:58:24 -08:00
t7004-tag.sh
t7005-editor.sh Provide a build time default-editor setting 2009-11-13 12:20:54 -08:00
t7006-pager.sh tests: Fix race condition in t7006-pager 2010-02-22 14:19:28 -08:00
t7007-show.sh
t7010-setup.sh
t7011-skip-worktree-reading.sh commit: correctly respect skip-worktree bit 2009-12-14 14:05:34 -08:00
t7012-skip-worktree-writing.sh Teach Git to respect skip-worktree bit (writing part) 2009-08-23 17:13:32 -07:00
t7060-wtstatus.sh status/commit: do not suggest "reset HEAD <path>" while merging 2009-12-12 01:22:10 -08:00
t7101-reset.sh
t7102-reset.sh Merge branch 'maint-1.6.4' into maint-1.6.5 2010-01-18 21:37:12 -08:00
t7103-reset-bare.sh reset: unbreak hard resets with GIT_WORK_TREE 2009-12-30 01:05:21 -08:00
t7104-reset.sh
t7105-reset-patch.sh Implement 'git reset --patch' 2009-08-15 15:17:47 -07:00
t7110-reset-merge.sh "reset --merge": fix unmerged case 2010-01-03 16:01:05 -08:00
t7111-reset-table.sh t7111: fix bad HEAD in tests with unmerged entries 2010-01-16 08:54:36 -08:00
t7201-co.sh Merge branch 'jc/maint-1.6.1-checkout-m-custom-merge' into maint 2010-02-10 12:54:15 -08:00
t7300-clean.sh Merge branch 'nd/sparse' 2010-01-13 11:58:34 -08:00
t7400-submodule-basic.sh Remove empty directories when checking out a commit with fewer submodules 2010-01-11 19:50:51 -08:00
t7401-submodule-summary.sh git status: Show uncommitted submodule changes too when enabled 2010-01-17 15:55:11 -08:00
t7402-submodule-rebase.sh
t7403-submodule-sync.sh
t7405-submodule-merge.sh
t7406-submodule-update.sh t7406: Fix submodule init config tests 2010-03-06 20:00:02 -08:00
t7407-submodule-foreach.sh git clone: Add --recursive to automatically checkout (nested) submodules 2009-08-20 16:59:50 -07:00
t7408-submodule-reference.sh Make test number t7406- unique 2009-08-21 09:56:31 -07:00
t7500-commit.sh fix portability issues with $ in double quotes 2010-01-26 15:16:54 -08:00
t7501-commit.sh Merge branch 'jk/warn-author-committer-after-commit' 2010-01-20 14:40:12 -08:00
t7502-commit.sh t7502: test commit.status, --status and --no-status 2010-01-13 01:13:56 -08:00
t7503-pre-commit-hook.sh
t7504-commit-msg-hook.sh
t7505-prepare-commit-msg-hook.sh
t7506-status-submodule.sh Show submodules as modified when they contain a dirty work tree 2010-01-16 16:40:50 -08:00
t7507-commit-verbose.sh
t7508-status.sh git status: Show uncommitted submodule changes too when enabled 2010-01-17 15:55:11 -08:00
t7509-commit.sh commit -c/-C/--amend: reset timestamp and authorship to committer with --reset-author 2009-11-04 16:59:15 -08:00
t7600-merge.sh Teach 'git merge' and 'git pull' the option --ff-only 2009-10-30 16:02:26 -07:00
t7601-merge-pull-config.sh
t7602-merge-octopus-many.sh octopus: reenable fast-forward merges 2009-12-13 23:40:24 -08:00
t7603-merge-reduce-heads.sh
t7604-merge-custom-message.sh merge: do not add standard message when message is given with -m option 2009-12-02 10:02:08 -08:00
t7605-merge-resolve.sh
t7606-merge-custom.sh
t7607-merge-overwrite.sh
t7608-merge-messages.sh merge: indicate remote tracking branches in merge message 2009-08-09 12:34:21 -07:00
t7610-mergetool.sh
t7700-repack.sh
t7701-repack-unpack-unreachable.sh
t7800-difftool.sh difftool: Fix '--gui' when diff.guitool is unconfigured 2010-03-28 09:29:12 -07:00
t8001-annotate.sh
t8002-blame.sh
t8003-blame.sh blame: fix indent of line numbers 2010-03-13 12:04:17 -08:00
t8004-blame.sh
t8005-blame-i18n.sh
t9001-send-email.sh fix portability issues with $ in double quotes 2010-01-26 15:16:54 -08:00
t9100-git-svn-basic.sh
t9101-git-svn-props.sh git-svn: ignore leading blank lines in svn:ignore 2009-08-10 02:35:55 -07:00
t9102-git-svn-deep-rmdir.sh
t9103-git-svn-tracked-directory-removed.sh
t9104-git-svn-follow-parent.sh svn: allow branches outside of refs/remotes 2009-08-12 22:17:56 -07:00
t9105-git-svn-commit-diff.sh
t9106-git-svn-commit-diff-clobber.sh
t9107-git-svn-migrate.sh svn: allow branches outside of refs/remotes 2009-08-12 22:17:56 -07: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
t9115-git-svn-dcommit-funky-renames.sh git svn: attempt to create empty dirs on clone+rebase 2009-11-15 19:30:06 -08:00
t9116-git-svn-log.sh
t9117-git-svn-init-clone.sh
t9118-git-svn-funky-branch-names.sh
t9119-git-svn-info.sh
t9120-git-svn-clone-with-percent-escapes.sh svn: assume URLs from the command-line are URI-encoded 2009-08-18 20:47:37 -07:00
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
t9130-git-svn-authors-file.sh git svn: add authorsfile test case for ~/.gitconfig 2009-11-14 14:43:59 -08:00
t9131-git-svn-empty-symlink.sh
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 svn: initial "master" points to trunk if possible 2009-08-12 21:41:09 -07:00
t9136-git-svn-recreated-branch-empty-file.sh
t9137-git-svn-dcommit-clobber-series.sh
t9138-git-svn-authors-prog.sh svn: properly escape arguments for authors-prog 2009-09-13 01:28:07 -07:00
t9139-git-svn-non-utf8-commitencoding.sh
t9140-git-svn-reset.sh
t9141-git-svn-multiple-branches.sh
t9142-git-svn-shallow-clone.sh
t9143-git-svn-gc.sh svn: allow branches outside of refs/remotes 2009-08-12 22:17:56 -07:00
t9144-git-svn-old-rev_map.sh svn: allow branches outside of refs/remotes 2009-08-12 22:17:56 -07:00
t9145-git-svn-master-branch.sh svn: initial "master" points to trunk if possible 2009-08-12 21:41:09 -07:00
t9146-git-svn-empty-dirs.sh t9146: use 'svn_cmd' wrapper 2009-12-19 23:06:20 -08:00
t9150-svk-mergetickets.sh t3409 t4107 t7406 t9150: use dashless commands 2009-11-29 23:09:47 -08:00
t9151-svn-mergeinfo.sh git-svn: update svn mergeinfo test suite 2010-01-23 03:23:04 -08:00
t9152-svn-empty-dirs-after-gc.sh git svn: add test for a git svn gc followed by a git svn mkdirs 2009-12-23 11:58:05 -08:00
t9153-git-svn-rewrite-uuid.sh git-svn: allow UUID to be manually remapped via rewriteUUID 2010-01-23 03:23:04 -08:00
t9154-git-svn-fancy-glob.sh git-svn: allow subset of branches/tags to be specified in glob spec 2010-01-23 03:23:04 -08:00
t9200-git-cvsexportcommit.sh
t9300-fast-import.sh Merge branch 'sp/maint-fast-import-large-blob' into sp/fast-import-large-blob 2010-02-01 12:42:00 -08:00
t9301-fast-import-notes.sh Add more testcases to test fast-import of notes 2009-12-07 13:52:52 -08:00
t9350-fast-export.sh t9350: fix careless use of "cd" 2010-03-28 17:42:11 -07:00
t9400-git-cvsserver-server.sh t9400: Use test_cmp when appropriate 2010-03-11 21:40:33 -08:00
t9401-git-cvsserver-crlf.sh tests: consolidate CR removal/addition functions 2010-01-25 16:42:23 -08:00
t9500-gitweb-standalone-no-errors.sh gitweb: Fix project-specific feature override behavior 2010-03-02 12:14:44 -08:00
t9501-gitweb-standalone-http-status.sh t9501: Re-fix max load test 2010-02-06 10:33:07 -08:00
t9502-gitweb-standalone-parse-output.sh gitweb: Smarter snapshot names 2009-11-08 19:22:45 -08:00
t9600-cvsimport.sh
t9601-cvsimport-vendor-branch.sh
t9602-cvsimport-branches-tags.sh
t9603-cvsimport-patchsets.sh
t9700-perl-git.sh Make sure $PERL_PATH is defined when the test suite is run. 2009-11-17 08:37:03 -08:00
test-lib.sh unset GREP_OPTIONS in test-lib.sh 2010-03-07 11:05:18 -08:00
test4012.png
test9200a.png
test9200b.png

README

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, or by setting GIT_TEST_OPTS
appropriately before running "make".

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

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

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

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

--valgrind::
	Execute all Git binaries with valgrind and exit with status
	126 on errors (just like regular tests, this will only stop
	the test script when running under -i).  Valgrind errors
	go to stderr, so you might want to pass the -v option, too.

	Since it makes no sense to run the tests with --valgrind and
	not see any output, this option implies --verbose.  For
	convenience, it also implies --tee.

--tee::
	In addition to printing the test output to the terminal,
	write it to files named 't/test-results/$TEST_NAME.out'.
	As the names depend on the tests' file names, it is safe to
	run the tests with this option in parallel.

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

You can also set the GIT_TEST_INSTALLED environment variable to
the bindir of an existing git installation to test that installation.
You still need to have built this git sandbox, from which various
test-* support programs, templates, and perl libraries are used.
If your installed git is incomplete, it will silently test parts of
your built version instead.

When using GIT_TEST_INSTALLED, you can also set GIT_TEST_EXEC_PATH to
override the location of the dashed-form subcommands (what
GIT_EXEC_PATH would be used for during normal operation).
GIT_TEST_EXEC_PATH defaults to `$GIT_TEST_INSTALLED/git --exec-path`.


Skipping Tests
--------------

In some environments, certain tests have no way of succeeding
due to platform limitation, such as lack of 'unzip' program, or
filesystem that do not allow arbitrary sequence of non-NUL bytes
as pathnames.

You should be able to say something like

    $ GIT_SKIP_TESTS=t9200.8 sh ./t9200-git-cvsexport-commit.sh

and even:

    $ GIT_SKIP_TESTS='t[0-4]??? t91?? t9200.8' make

to omit such tests.  The value of the environment variable is a
SP separated list of patterns that tells which tests to skip,
and either can match the "t[0-9]{4}" part to skip the whole
test, or t[0-9]{4} followed by ".$number" to say which
particular test to skip.

Note that some tests in the existing test suite rely on previous
test item, so you cannot arbitrarily disable one and expect the
remainder of test to check what the test originally was intended
to check.


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

The test files are named as:

	tNNNN-commandname-details.sh

where N is a decimal digit.

First digit tells the family:

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

Second digit tells the particular command we are testing.

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

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


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

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

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

	test_description='xxx test (option --frotz)

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


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

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

	. ./test-lib.sh

This test harness library does the following things:

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

 - Creates an empty test directory with an empty .git/objects
   database and chdir(2) into it.  This directory is 't/trash directory'
   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 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.

 - test_debug <script>

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

 - test_done

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

 - test_tick

   Make commit and tag names consistent by setting the author and
   committer times to defined stated.  Subsequent calls will
   advance the times by a fixed amount.

 - test_commit <message> [<filename> [<contents>]]

   Creates a commit with the given message, committing the given
   file with the given contents (default for both is to reuse the
   message string), and adds a tag (again reusing the message
   string as name).  Calls test_tick to make the SHA-1s
   reproducible.

 - test_merge <message> <commit-or-tag>

   Merges the given rev using the given message.  Like test_commit,
   creates a tag and calls test_tick before committing.

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.