summaryrefslogtreecommitdiff
path: root/tests/resources
Commit message (Expand)AuthorAgeFilesLines
...
* merge: handle conflicts in recursive base buildingEdward Thomson2015-11-2524-0/+8
* merge tests: add complex recursive exampleEdward Thomson2015-11-2511-6/+11
* merge: add recursive test with conflicting contentsEdward Thomson2015-11-258-0/+9
* merge: add recursive test with three merge basesEdward Thomson2015-11-2527-0/+19
* merge: add a third-level recursive mergeEdward Thomson2015-11-2512-0/+12
* merge: add a second-level recursive mergeEdward Thomson2015-11-2511-0/+9
* merge: add simple recursive testEdward Thomson2015-11-2568-0/+121
* submodule: test updating a submodule w/ a pathEdward Thomson2015-11-0412-0/+13
* Add test caseVicent Marti2015-11-027-0/+11
* index: test that we round-trip nsecsEdward Thomson2015-10-2212-0/+15
* repo::reservedname: test a submodule updateEdward Thomson2015-09-1820-0/+28
* crlf tests: posix known-good dataEdward Thomson2015-06-22684-0/+3960
* crlf tests: windows known-good dataEdward Thomson2015-06-22685-0/+3961
* crlf: include utf8 resources in master branchEdward Thomson2015-06-2217-2/+4
* crlf: include additional test resourcesEdward Thomson2015-06-2216-1/+6
* remote: apply insteadOf configuration.Patrick Steinhardt2015-05-311-0/+12
* Illustrate bad checkout on WindowsJacques Germishuys2015-03-259-0/+2
* Added tests to merge files and branches with whitespace problems and fixesJacques Germishuys2015-03-1647-0/+40
* checkout test: ensure .gitattributes lifecycleEdward Thomson2015-02-024-0/+2
* checkout tests: nasty symlinksEdward Thomson2015-01-2017-2/+11
* Add files and tests with many UTF-8 chars and few UTF-8 charsLinquize2015-01-207-1/+1
* repo::init test: create hook symlinkEdward Thomson2015-01-081-1/+0
* submodule init should resolve relative url pathsJameson Miller2014-12-2213-0/+18
* checkout: disallow bad paths on HFSEdward Thomson2014-12-1649-0/+37
* checkout: disallow bad paths on win32Edward Thomson2014-12-1680-0/+64
* Merge pull request #2654 from linquize/missing-objEdward Thomson2014-11-188-3/+5
|\
| * Fix missing object in tests/resources/crlf by changing the tail commitLinquize2014-10-268-3/+5
* | revert tests: always use core.autocrlf=false in testsEdward Thomson2014-10-2712-4/+2
* | git_rebase_commit: drop already-picked commitsEdward Thomson2014-10-2610-0/+5
* | Introduce git_rebase to set up a rebase sessionEdward Thomson2014-10-26124-0/+167
|/
* Introduce failing test for conflict filtering in indexEdward Thomson2014-10-133-0/+0
* Merge pull request #2473 from arthurschreiber/arthur/new-javascript-test-filesEdward Thomson2014-10-1014-351/+325
|\
| * Update the javascript diff driver's function pattern.Arthur Schreiber2014-10-091-3/+3
| * New test files for the javascript diff driver.Arthur Schreiber2014-10-0914-351/+325
* | Merge pull request #2592 from libgit2/cmn/describeCarlos Martín Nieto2014-10-0953-0/+54
|\ \ | |/ |/|
| * tests: Add "describe" test repositorynulltoken2014-04-3053-0/+54
* | config: Add test cases that have trailing spaces before comment charsLinquize2014-10-041-0/+6
* | Revert "test: Remove symlinks from the source tree"Vicent Marti2014-08-181-0/+1
* | test: Remove symlinks from the source treeVicent Marti2014-08-181-1/+0
|/
* Merge pull request #2261 from jacquesg/format-patchVicent Marti2014-04-1689-0/+72
|\
| * Added git_diff_stats test filesJacques Germishuys2014-04-1589-0/+72
* | Added cherry pick testsJacques Germishuys2014-04-1490-0/+96
|/
* Merge pull request #2178 from libgit2/rb/fix-short-idEdward Thomson2014-03-311-0/+0
|\
| * Add failing test for git_object_short_idJiri Pospisil2014-03-101-0/+0
* | Add `git_merge_status` to provide info about an upcoming mergeEdward Thomson2014-03-201-0/+1
|/
* Add PHP tests and fix bug in PHP builtin driverRussell Belfer2014-01-2713-3/+204
* Update Javascript userdiff driver and testsRussell Belfer2014-01-2723-5/+410
* Move userdiff tests to be data drivenRussell Belfer2014-01-2421-0/+189
* Preserve tree filemode in index during checkoutEdward Thomson2014-01-223-0/+0
* Merge submodulesEdward Thomson2014-01-2045-0/+44
View Lorry Controller Status