summaryrefslogtreecommitdiff
path: root/t
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2009-05-25 00:59:07 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2009-05-25 00:59:07 -0700
commitee969693c5e77e1b5ebda45bead569806d31b379 (patch)
tree25d803cd17cbe891a9937f3e3442a1d7863ae773 /t
parentapply, fmt-merge-msg: use relative filenames (diff)
parentMerge branch 'maint' (diff)
downloadtgif-ee969693c5e77e1b5ebda45bead569806d31b379.tar.xz
Merge branch 'master' into sb/opt-filename
* master: (654 commits) http-push.c::remove_locks(): fix use after free t/t3400-rebase.sh: add more tests to help migrating git-rebase.sh to C post-receive-email: hooks.showrev: show how to include both web link and patch MinGW: Fix compiler warning in merge-recursive MinGW: Add a simple getpass() MinGW: use POSIX signature of waitpid() MinGW: the path separator to split GITPERLLIB is ';' on Win32 MinGW: Scan for \r in addition to \n when reading shbang lines gitweb: Sanitize title attribute in format_subject_html Terminate argv with NULL before calling setup_revisions() doc/git-rebase.txt: remove mention of multiple strategies git-send-email: Handle quotes when parsing .mailrc files git-svn: add --authors-prog option git-svn: Set svn.authorsfile if it is passed to git svn clone git-svn: Correctly report max revision when following deleted paths git-svn: Fix for svn paths removed > log-window-size revisions ago git-svn testsuite: use standard configuration for Subversion tools grep: fix word-regexp colouring completion: use git rev-parse to detect bare repos Cope better with a _lot_ of packs ...
Diffstat (limited to 't')
-rw-r--r--t/Makefile5
-rw-r--r--t/README18
-rw-r--r--t/annotate-tests.sh5
-rw-r--r--t/lib-git-svn.sh29
-rw-r--r--t/lib-httpd.sh12
-rw-r--r--t/lib-httpd/apache.conf8
-rwxr-xr-xt/t0000-basic.sh66
-rwxr-xr-xt/t0004-unwritable.sh8
-rwxr-xr-xt/t0020-crlf.sh31
-rwxr-xr-xt/t0024-crlf-archive.sh8
-rwxr-xr-xt/t0040-parse-options.sh56
-rwxr-xr-xt/t0050-filesystem.sh37
-rwxr-xr-xt/t0055-beyond-symlinks.sh6
-rwxr-xr-xt/t0060-path-utils.sh116
-rwxr-xr-xt/t1004-read-tree-m-u-wf.sh6
-rwxr-xr-xt/t1020-subdirectory.sh2
-rwxr-xr-xt/t1100-commit-tree-options.sh2
-rwxr-xr-xt/t1300-repo-config.sh11
-rwxr-xr-xt/t1301-shared-repo.sh12
-rwxr-xr-xt/t1400-update-ref.sh6
-rwxr-xr-xt/t1410-reflog.sh4
-rwxr-xr-xt/t1411-reflog-show.sh67
-rwxr-xr-xt/t1450-fsck.sh67
-rwxr-xr-xt/t1504-ceiling-dirs.sh2
-rwxr-xr-xt/t2001-checkout-cache-clash.sh6
-rwxr-xr-xt/t2003-checkout-cache-mkdir.sh8
-rwxr-xr-xt/t2004-checkout-cache-temp.sh2
-rwxr-xr-xt/t2007-checkout-symlink.sh6
-rwxr-xr-xt/t2100-update-cache-badpath.sh14
-rwxr-xr-xt/t2200-add-update.sh4
-rwxr-xr-xt/t2201-add-update-typechange.sh16
-rwxr-xr-xt/t2300-cd-to-toplevel.sh14
-rwxr-xr-xt/t3000-ls-files-others.sh25
-rwxr-xr-xt/t3010-ls-files-killed-modified.sh21
-rwxr-xr-xt/t3031-merge-criscross.sh95
-rwxr-xr-xt/t3100-ls-tree-restrict.sh40
-rwxr-xr-xt/t3200-branch.sh2
-rwxr-xr-xt/t3203-branch-output.sh81
-rwxr-xr-xt/t3400-rebase.sh35
-rwxr-xr-xt/t3404-rebase-interactive.sh11
-rwxr-xr-xt/t3406-rebase-message.sh23
-rwxr-xr-xt/t3413-rebase-hook.sh (renamed from t/t3409-rebase-hook.sh)0
-rwxr-xr-xt/t3600-rm.sh57
-rwxr-xr-xt/t3700-add.sh16
-rwxr-xr-xt/t3701-add-interactive.sh14
-rwxr-xr-xt/t3702-add-edit.sh121
-rwxr-xr-xt/t3900-i18n-commit.sh18
-rwxr-xr-xt/t4002-diff-basic.sh8
-rwxr-xr-xt/t4004-diff-rename-symlink.sh6
-rwxr-xr-xt/t4006-diff-mode.sh19
-rwxr-xr-xt/t4008-diff-break-rewrite.sh8
-rwxr-xr-xt/t4011-diff-symlink.sh6
-rwxr-xr-xt/t4012-diff-binary.sh2
-rwxr-xr-xt/t4013-diff-various.sh11
-rw-r--r--t/t4013/diff.diff_--dirstat_master~1_master~23
-rw-r--r--t/t4013/diff.format-patch_--attach_--stdout_--suffix=.diff_initial..side61
-rw-r--r--t/t4013/diff.format-patch_--attach_--stdout_initial..master12
-rw-r--r--t/t4013/diff.format-patch_--attach_--stdout_initial..master^8
-rw-r--r--t/t4013/diff.format-patch_--attach_--stdout_initial..side4
-rw-r--r--t/t4013/diff.format-patch_--inline_--stdout_--numbered-files_initial..master170
-rw-r--r--t/t4013/diff.format-patch_--inline_--stdout_--subject-prefix=TESTCASE_initial..master12
-rw-r--r--t/t4013/diff.format-patch_--inline_--stdout_initial..master12
-rw-r--r--t/t4013/diff.format-patch_--inline_--stdout_initial..master^8
-rw-r--r--t/t4013/diff.format-patch_--inline_--stdout_initial..master^^4
-rw-r--r--t/t4013/diff.format-patch_--inline_--stdout_initial..side4
-rw-r--r--t/t4013/diff.log_--decorate_--all34
-rw-r--r--t/t4013/diff.rev-list_--children_HEAD7
-rw-r--r--t/t4013/diff.rev-list_--parents_HEAD7
-rwxr-xr-xt/t4014-format-patch.sh293
-rwxr-xr-xt/t4021-format-patch-numbered.sh13
-rwxr-xr-xt/t4023-diff-rename-typechange.sh6
-rwxr-xr-xt/t4029-diff-trailing-space.sh2
-rwxr-xr-xt/t4035-diff-quiet.sh (renamed from t/t4017-quiet.sh)0
-rwxr-xr-xt/t4036-format-patch-signer-mime.sh (renamed from t/t4021-format-patch-signer-mime.sh)0
-rwxr-xr-xt/t4102-apply-rename.sh8
-rwxr-xr-xt/t4114-apply-typechange.sh6
-rwxr-xr-xt/t4115-apply-symlink.sh6
-rwxr-xr-xt/t4118-apply-empty-context.sh4
-rwxr-xr-xt/t4122-apply-symlink-inside.sh6
-rwxr-xr-xt/t4129-apply-samemode.sh19
-rwxr-xr-xt/t4150-am.sh15
-rwxr-xr-xt/t4200-rerere.sh4
-rwxr-xr-xt/t4202-log.sh212
-rwxr-xr-xt/t4204-patch-id.sh38
-rwxr-xr-xt/t5000-tar-tree.sh63
-rwxr-xr-xt/t5001-archive-attr.sh91
-rwxr-xr-xt/t5300-pack-object.sh17
-rwxr-xr-xt/t5302-pack-index.sh17
-rwxr-xr-xt/t5303-pack-corruption-resilience.sh12
-rwxr-xr-xt/t5403-post-checkout-hook.sh14
-rwxr-xr-xt/t5503-tagfollow.sh6
-rwxr-xr-xt/t5505-remote.sh114
-rwxr-xr-xt/t5506-remote-groups.sh81
-rwxr-xr-xt/t5511-refspec.sh12
-rwxr-xr-xt/t5515-fetch-merge-logic.sh3
-rwxr-xr-xt/t5522-pull-symlink.sh (renamed from t/t5521-pull-symlink.sh)6
-rwxr-xr-xt/t5540-http-push.sh10
-rwxr-xr-xt/t5550-http-fetch.sh57
-rwxr-xr-xt/t5601-clone.sh15
-rwxr-xr-xt/t5602-clone-remote-exec.sh4
-rwxr-xr-xt/t5701-clone-local.sh10
-rwxr-xr-xt/t5705-clone-2gb.sh45
-rwxr-xr-xt/t6030-bisect-porcelain.sh60
-rwxr-xr-xt/t6031-merge-recursive.sh20
-rwxr-xr-xt/t6034-merge-rename-nocruft.sh (renamed from t/t6023-merge-rename-nocruft.sh)0
-rwxr-xr-xt/t6040-tracking-info.sh24
-rwxr-xr-xt/t6200-fmt-merge-msg.sh4
-rwxr-xr-xt/t6300-for-each-ref.sh40
-rwxr-xr-xt/t7001-mv.sh4
-rwxr-xr-xt/t7004-tag.sh104
-rwxr-xr-xt/t7005-editor.sh29
-rwxr-xr-xt/t7201-co.sh8
-rwxr-xr-xt/t7300-clean.sh6
-rwxr-xr-xt/t7400-submodule-basic.sh10
-rwxr-xr-xt/t7405-submodule-merge.sh6
-rwxr-xr-xt/t7406-submodule-reference.sh81
-rwxr-xr-xt/t7501-commit.sh4
-rwxr-xr-xt/t7502-commit.sh2
-rwxr-xr-xt/t7503-pre-commit-hook.sh4
-rwxr-xr-xt/t7504-commit-msg-hook.sh8
-rwxr-xr-xt/t7508-status.sh (renamed from t/t7502-status.sh)0
-rwxr-xr-xt/t7700-repack.sh2
-rwxr-xr-xt/t7800-difftool.sh216
-rwxr-xr-xt/t8005-blame-i18n.sh8
-rwxr-xr-xt/t9001-send-email.sh191
-rwxr-xr-xt/t9100-git-svn-basic.sh51
-rwxr-xr-xt/t9101-git-svn-props.sh38
-rwxr-xr-xt/t9102-git-svn-deep-rmdir.sh4
-rwxr-xr-xt/t9103-git-svn-tracked-directory-removed.sh8
-rwxr-xr-xt/t9104-git-svn-follow-parent.sh40
-rwxr-xr-xt/t9105-git-svn-commit-diff.sh8
-rwxr-xr-xt/t9106-git-svn-commit-diff-clobber.sh14
-rwxr-xr-xt/t9107-git-svn-migrate.sh2
-rwxr-xr-xt/t9108-git-svn-glob.sh26
-rwxr-xr-xt/t9109-git-svn-multi-glob.sh (renamed from t/t9108-git-svn-multi-glob.sh)44
-rwxr-xr-xt/t9113-git-