summaryrefslogtreecommitdiffstats
path: root/t (follow)
Commit message (Expand)AuthorAgeFilesLines
* merge-recursive: fix check for skipability of working tree updatesElijah Newren2018-05-083-7/+7
* t6046: testcases checking whether updates can be skipped in a mergeElijah Newren2018-05-081-0/+761
* merge-recursive: avoid triggering add_cacheinfo error with dirty modElijah Newren2018-05-081-1/+1
* merge-recursive: improve add_cacheinfo error handlingElijah Newren2018-05-081-4/+3
* merge-recursive: avoid spurious rename/rename conflict from dir renamesElijah Newren2018-05-081-30/+25
* directory rename detection: new testcases showcasing a pair of bugsElijah Newren2018-05-081-0/+296
* merge-recursive: fix remaining directory rename + dirty overwrite casesElijah Newren2018-05-081-4/+4
* merge-recursive: fix overwriting dirty files involved in renamesElijah Newren2018-05-083-3/+3
* merge-recursive: avoid clobbering untracked files with directory renamesElijah Newren2018-05-081-3/+3
* merge-recursive: apply necessary modifications for directory renamesElijah Newren2018-05-081-25/+25
* merge-recursive: check for file level conflicts then get new nameElijah Newren2018-05-081-1/+1
* directory rename detection: tests for handling overwriting dirty filesElijah Newren2018-04-201-0/+458
* directory rename detection: tests for handling overwriting untracked filesElijah Newren2018-04-201-0/+367
* directory rename detection: miscellaneous testcases to complete coverageElijah Newren2018-04-201-1/+564
* directory rename detection: testcases exploring possibly suboptimal mergesElijah Newren2018-04-201-0/+404
* directory rename detection: more involved edge/corner testcasesElijah Newren2018-04-201-0/+396
* directory rename detection: testcases checking which side did the renameElijah Newren2018-04-201-0/+336
* directory rename detection: files/directories in the way of some renamesElijah Newren2018-04-201-0/+330
* directory rename detection: partially renamed directory testcase/discussionElijah Newren2018-04-201-0/+115
* directory rename detection: testcases to avoid taking detection too farElijah Newren2018-04-201-0/+153
* directory rename detection: directory splitting testcasesElijah Newren2018-04-201-0/+143
* directory rename detection: basic testcasesElijah Newren2018-04-201-0/+442
* Merge branch 'svn/authors-prog-2' of git://bogomips.org/git-svnJunio C Hamano2018-04-122-1/+39
|\
| * git-svn: allow empty email-address using authors-prog and authors-fileAndreas Heiduk2018-04-052-1/+39
* | Revert "Merge branch 'en/rename-directory-detection'"Junio C Hamano2018-04-113-4000/+2
* | Merge branch 'pk/test-avoid-pipe-hiding-exit-status'Junio C Hamano2018-04-1115-159/+179
|\ \
| * | test: avoid pipes in git related commands for testPratik Karki2018-03-2815-159/+179
* | | Merge branch 'rs/status-with-removed-submodule'Junio C Hamano2018-04-111-0/+15
|\ \ \
| * | | submodule: check for NULL return of get_submodule_ref_store()René Scharfe2018-03-291-0/+15
| |/ /
* | | Merge branch 'nd/combined-test-helper'Junio C Hamano2018-04-11119-504/+641
|\ \ \
| * | | t/helper: merge test-write-cache into test-toolNguyễn Thái Ngọc Duy2018-03-274-2/+5
| * | | t/helper: merge test-wildmatch into test-toolNguyễn Thái Ngọc Duy2018-03-274-8/+11
| * | | t/helper: merge test-urlmatch-normalization into test-toolNguyễn Thái Ngọc Duy2018-03-274-135/+138
| * | | t/helper: merge test-subprocess into test-toolNguyễn Thái Ngọc Duy2018-03-274-2/+5
| * | | t/helper: merge test-submodule-config into test-toolNguyễn Thái Ngọc Duy2018-03-274-10/+13
| * | | t/helper: merge test-string-list into test-toolNguyễn Thái Ngọc Duy2018-03-275-26/+29
| * | | t/helper: merge test-strcmp-offset into test-toolNguyễn Thái Ngọc Duy2018-03-274-2/+5
| * | | t/helper: merge test-sigchain into test-toolNguyễn Thái Ngọc Duy2018-03-274-3/+6
| * | | t/helper: merge test-sha1-array into test-toolNguyễn Thái Ngọc Duy2018-03-274-9/+12
| * | | t/helper: merge test-scrap-cache-tree into test-toolNguyễn Thái Ngọc Duy2018-03-274-5/+8
| * | | t/helper: merge test-run-command into test-toolNguyễn Thái Ngọc Duy2018-03-274-13/+16
| * | | t/helper: merge test-revision-walking into test-toolNguyễn Thái Ngọc Duy2018-03-274-2/+5
| * | | t/helper: merge test-regex into test-toolNguyễn Thái Ngọc Duy2018-03-275-5/+8
| * | | t/helper: merge test-ref-store into test-toolNguyễn Thái Ngọc Duy2018-03-276-5/+8
| * | | t/helper: merge test-read-cache into test-toolNguyễn Thái Ngọc Duy2018-03-274-2/+5
| * | | t/helper: merge test-prio-queue into test-toolNguyễn Thái Ngọc Duy2018-03-274-4/+7
| * | | t/helper: merge test-path-utils into test-toolNguyễn Thái Ngọc Duy2018-03-276-36/+39
| * | | t/helper: merge test-online-cpus into test-toolNguyễn Thái Ngọc Duy2018-03-274-2/+5
| * | | t/helper: merge test-mktemp into test-toolNguyễn Thái Ngọc Duy2018-03-274-3/+6
| * | | t/helper: merge (unused) test-mergesort into test-toolNguyễn Thái Ngọc Duy2018-03-273-1/+4