summaryrefslogtreecommitdiff
path: root/tests
Commit message (Expand)AuthorAgeFilesLines
* commit: Fix memory leak in test suitevmg/commit-leakVicent Marti2015-12-171-1/+1
* Merge pull request #3521 from pks-t/blame-line-overflowEdward Thomson2015-12-1410-7/+17
|\
| * blame: use size_t for line counts in git_blame_hunkPatrick Steinhardt2015-12-0110-7/+17
* | Merge pull request #3522 from pks-t/email-format-commit-messageCarlos Martín Nieto2015-12-108-1/+83
|\ \
| * | diff: include commit message when formatting patchPatrick Steinhardt2015-12-017-1/+44
| * | commit: introduce `git_commit_body`Patrick Steinhardt2015-12-011-0/+39
| |/
* | reset: perform the checkout before moving HEAD or the indexcmn/reset-dir-fileCarlos Martín Nieto2015-12-091-0/+52
* | checkout test: Apply umask to file-mode test as wellMichał Górny2015-12-011-1/+1
|/
* tests: fix warning for nested struct initializationPatrick Steinhardt2015-11-301-1/+1
* Merge pull request #3513 from ethomson/merge_recursiveCarlos Martín Nieto2015-11-30169-54/+796
|\
| * recursive merge: add a recursion limitEdward Thomson2015-11-251-0/+31
| * merge: handle conflicts in recursive base buildingEdward Thomson2015-11-2527-1/+153
| * merge tests: add complex recursive exampleEdward Thomson2015-11-2512-6/+39
| * recursive: test conflict output during recursive mergeEdward Thomson2015-11-252-0/+81
| * merge tests: move expected data into own fileEdward Thomson2015-11-256-44/+47
| * merge: add recursive test with conflicting contentsEdward Thomson2015-11-259-0/+32
| * merge: add recursive test with three merge basesEdward Thomson2015-11-2528-0/+65
| * merge: improve test names in recursive merge testsEdward Thomson2015-11-251-8/+8
| * merge: add a third-level recursive mergeEdward Thomson2015-11-2513-0/+58
| * merge: add a second-level recursive mergeEdward Thomson2015-11-2512-2/+57
| * merge: add simple recursive testEdward Thomson2015-11-2570-1/+233
| * merge: rename `git_merge_tree_flags_t` -> `git_merge_flags_t`Edward Thomson2015-11-255-9/+9
* | tests: win32::longpath: free expected_msgPatrick Steinhardt2015-11-241-0/+2
* | tests: config::stress: free `git_config` structsPatrick Steinhardt2015-11-241-0/+3
* | tests: config::global: fix memleak in open_programdataPatrick Steinhardt2015-11-241-1/+1
|/
* Merge pull request #3517 from jacquesg/warnings-fixesEdward Thomson2015-11-204-3/+3
|\
| * Fix some warningsJacques Germishuys2015-11-204-3/+3
* | repository: distinguish sequencer cherry-pick and revertcmn/repository-state-sequencerCarlos Martín Nieto2015-11-201-0/+18
|/
* Merge pull request #3511 from ethomson/racy_fixes_2Carlos Martín Nieto2015-11-172-10/+192
|\
| * racy: make git_index_read_index handle racinessEdward Thomson2015-11-161-0/+48
| * racy: ensure git_index_read_tree clears uptodateEdward Thomson2015-11-161-0/+28
| * index: test for smudged entries on write onlyEdward Thomson2015-11-161-7/+35
| * checkout::crlf test: don't crash when no idx entryEdward Thomson2015-11-161-4/+5
| * index: don't detect raciness in uptodate entriesEdward Thomson2015-11-161-0/+77
* | tests: use out-of-the-way config dir in sandboxEdward Thomson2015-11-171-5/+12
* | tests: set PROGRAMDATA directory for running testsEdward Thomson2015-11-171-0/+2
* | config::global: use PROGRAMDATA configurationEdward Thomson2015-11-171-4/+6
|/
* pool: Never return unaligned buffersvmg/pool-alignVicent Marti2015-11-131-2/+2
* Merge pull request #3170 from CmdrMoozy/nsec_fixCarlos Martín Nieto2015-11-124-14/+25
|\
| * Merge branch 'master' into nsec_fix_nextAxel Rasmussen2015-10-0135-24/+222
| |\
| * | diff/index: respect USE_NSEC for racily clean file detectionAxel Rasmussen2015-09-182-13/+13
| * | cmake: Only provide USE_NSEC if struct stat members are avilable.Axel Rasmussen2015-09-181-2/+1
| * | caps: add test for GIT_FEATURES_NSECAxel Rasmussen2015-09-181-0/+6
| * | cmake: add USE_NSEC, and only check nanosec m/ctime if enabledAxel Rasmussen2015-09-181-1/+7
* | | Merge pull request #3499 from ethomson/ref_dir_errmsgsCarlos Martín Nieto2015-11-123-0/+97
|\ \ \
| * | | reflog: error when a directory is at reflog pathEdward Thomson2015-11-121-0/+53
| * | | refs: complain when a directory exists at refEdward Thomson2015-11-121-0/+17
| * | | filebuf: detect directories in our wayEdward Thomson2015-11-031-0/+9
| * | | reflog: test reflog is deleted when ref is deletedEdward Thomson2015-11-031-0/+18
* | | | Merge pull request #3448 from libgit2/cmn/custom-agentCarlos Martín Nieto2015-11-121-0/+11
|\ \ \ \
View Lorry Controller Status