summaryrefslogtreecommitdiff
path: root/t
AgeCommit message (Expand)AuthorFilesLines
2010-10-06t7800 (difftool): add missing &&Libravatar Elijah Newren1-6/+6
2010-10-06t7601 (merge-pull-config): add missing &&Libravatar Elijah Newren1-6/+6
2010-10-06t7001 (mv): add missing &&Libravatar Elijah Newren1-1/+1
2010-10-06t6016 (rev-list-graph-simplify-history): add missing &&Libravatar Elijah Newren1-19/+10
2010-10-06t5602 (clone-remote-exec): add missing &&Libravatar Elijah Newren1-7/+15
2010-10-06t4026 (color): remove unneeded and unchained commandLibravatar Elijah Newren1-1/+0
2010-10-06t4019 (diff-wserror): add lots of missing &&Libravatar Elijah Newren1-26/+27
2010-10-06t4202 (log): Replace '<git-command> || :' with test_might_failLibravatar Elijah Newren1-1/+1
2010-10-06t4002 (diff-basic): use test_might_fail for commands that might failLibravatar Elijah Newren1-6/+6
2010-10-06t100[12] (read-tree-m-2way, read_tree_m_u_2way): add missing &&Libravatar Elijah Newren2-14/+14
2010-10-06t4017 (diff-retval): replace manual exit code check with test_expect_codeLibravatar Elijah Newren1-49/+20
2010-10-06test-lib: make test_expect_code a test commandLibravatar Ævar Arnfjörð Bjarmason5-38/+82
2010-10-06Make test script t9157 executableLibravatar Junio C Hamano1-0/+0
2010-10-06Merge branch 'bc/fix-cherry-pick-root'Libravatar Junio C Hamano1-0/+10
2010-10-06Merge branch 'maint'Libravatar Junio C Hamano2-1/+50
2010-10-05Merge early part of git-svn into maintLibravatar Junio C Hamano1-0/+50
2010-10-04send-email: Don't leak To: headers between patchesLibravatar Stephen Boyd1-0/+15
2010-10-03t3020 (ls-files-error-unmatch): remove stray '1' from end of fileLibravatar Elijah Newren1-1/+0
2010-10-03Side-step MSYS-specific path "corruption" leading to t5560 failure.Libravatar Eric Sunshine1-2/+1
2010-10-03Side-step sed line-ending "corruption" leading to t6038 failure.Libravatar Eric Sunshine1-1/+3
2010-10-01Skip 'git archive --remote' test on msysGitLibravatar Pat Thoyts1-1/+1
2010-10-01Do not strip CR when grepping HTTP headers.Libravatar Pat Thoyts2-0/+3
2010-10-01Skip t1300.70 and 71 on msysGit.Libravatar Pat Thoyts3-10/+6
2010-09-30Merge branch 'maint'Libravatar Junio C Hamano1-38/+14
2010-09-30send-email: use Perl idioms in while loopLibravatar Ævar Arnfjörð Bjarmason1-1/+1
2010-09-30gitweb/Makefile: Add 'test' and 'test-installed' targetsLibravatar Jakub Narebski1-0/+4
2010-09-30t/gitweb-lib.sh: Add support for GITWEB_TEST_INSTALLEDLibravatar Jakub Narebski1-2/+19
2010-09-30t0004 (unwritable files): simplify error handlingLibravatar Jonathan Nieder1-38/+14
2010-09-29merge-recursive: Make room for directories in D/F conflictsLibravatar Elijah Newren1-1/+1
2010-09-29handle_delete_modify(): Check whether D/F conflicts are still presentLibravatar Elijah Newren1-1/+1
2010-09-29merge_content(): Check whether D/F conflicts are still presentLibravatar Elijah Newren1-4/+4
2010-09-29conflict_rename_rename_1to2(): Fix checks for presence of D/F conflictsLibravatar Elijah Newren1-1/+1
2010-09-29conflict_rename_delete(): Check whether D/F conflicts are still presentLibravatar Elijah Newren1-2/+2
2010-09-29merge-recursive: Delay content merging for renamesLibravatar Elijah Newren1-1/+1
2010-09-29merge-recursive: Move handling of double rename of one file to twoLibravatar Elijah Newren1-1/+1
2010-09-29merge-recursive: Avoid doubly merging rename/add conflict contentsLibravatar Elijah Newren1-2/+2
2010-09-29t6036: Add testcase for undetected conflictLibravatar Elijah Newren1-0/+85
2010-09-29t6036: Add a second testcase similar to the first but with content changesLibravatar Elijah Newren1-0/+76
2010-09-29t6036: Test index and worktree state, not just that merge failsLibravatar Elijah Newren1-3/+21
2010-09-29t6020: Add a testcase for modify/delete + directory/file conflictLibravatar Elijah Newren1-0/+47
2010-09-29t6020: Modernize style a bitLibravatar Elijah Newren1-15/+20
2010-09-29t6022: Add tests for rename/rename combined with D/F conflictsLibravatar Elijah Newren1-0/+79
2010-09-29t6022: Add paired rename+D/F conflict: (two/file, one/file) -> (one, two)Libravatar Elijah Newren1-0/+63
2010-09-29t6022: Add tests with both rename source & dest involved in D/F conflictsLibravatar Elijah Newren1-0/+38
2010-09-29t6022: Add tests for reversing order of merges when D/F conflicts presentLibravatar Elijah Newren1-0/+58
2010-09-29t6022: Add test combinations of {content conflict?, D/F conflict remains?}Libravatar Elijah Newren1-0/+128
2010-09-29t6032: Add a test checking for excessive output from mergeLibravatar Elijah Newren1-0/+30
2010-09-29t3030: Add a testcase for resolvable rename/add conflict with symlinksLibravatar Schalk, Ken1-1/+36
2010-09-29Merge branch 'en/rename-d-f' into en/merge-recursiveLibravatar Junio C Hamano1-0/+66
2010-09-29blame,cat-file --textconv: Don't assume mode is ``S_IFREF | 0664''Libravatar Kirill Smelkov2-8/+4