summaryrefslogtreecommitdiff
path: root/tests
Commit message (Collapse)AuthorAgeFilesLines
* iterator: adjust unreadable-dir test to new behaviourcmn/iterator-skip-diriterCarlos Martín Nieto2015-07-271-5/+1
| | | | | We don't want the iterator to make us stop whenever we hit an unreadable dir. We should instead move over to the next item.
* Merge pull request #3302 from libgit2/cmn/submodule-foreach-diff-pathCarlos Martín Nieto2015-07-131-0/+18
|\ | | | | List a submodule only once when the path matches a submodule in the index
| * submdule: reproduce double-reporting of a submodule in foreachCarlos Martín Nieto2015-07-111-0/+18
| | | | | | | | | | | | When we rename a submodule, we should be merging two sets of information based on whether their path is the same. We currently only deduplicate on equal name, which causes us to double-report.
* | Merge branch 'portable-zu'Carlos Martín Nieto2015-07-123-4/+4
|\ \
| * | Fix #3094 - improve use of portable size_t/ssize_t format specifiers.Matthew Plough2015-07-123-4/+4
| | | | | | | | | | | | The header src/cc-compat.h defines portable format specifiers PRIuZ, PRIdZ, and PRIxZ. The original report highlighted the need to use these specifiers in examples/network/fetch.c. For this commit, I checked all C source and header files not in deps/ and transitioned to the appropriate format specifier where appropriate.
* | | wildcard filters: move CHANGELOG message to 0.23+1Edward Thomson2015-07-101-2/+1
| | |
* | | wildcard filters: clean up some warnings in testsEdward Thomson2015-07-101-5/+9
| | |
* | | Merge pull request #3281 from ethomson/wildcard_filtersCarlos Martín Nieto2015-07-094-104/+310
|\ \ \ | | | | | | | | filters: custom filters with wildcard attributes
| * | | filters: custom filters with wildcard attributesEdward Thomson2015-07-014-104/+310
| | | | | | | | | | | | | | | | | | | | | | | | Allow custom filters with wildcard attributes, so that clients can support some random `filter=foo` in a .gitattributes and look up the corresponding smudge/clean commands in the configuration file.
* | | | revert: correct test that added trailing newlineEdward Thomson2015-07-071-10/+12
| | | |
* | | | merge_files: don't add trailing newlinesEdward Thomson2015-07-071-0/+39
| | | | | | | | | | | | | | | | | | | | When invoked with three files that each lack a trailing newline, the merge result should also lack a trailing newline.
* | | | Merge pull request #3277 from git-up/git_diff_index_to_indexCarlos Martín Nieto2015-07-071-0/+32
|\ \ \ \ | | | | | | | | | | Added git_diff_index_to_index()
| * | | | Added git_diff_index_to_index()Pierre-Olivier Latour2015-06-301-0/+32
| | | | |
* | | | | Merge pull request #3288 from ethomson/getenvCarlos Martín Nieto2015-07-078-92/+104
|\ \ \ \ \ | | | | | | | | | | | | git__getenv: utf-8 aware env reader
| * | | | | git__getenv: utf-8 aware env readerEdward Thomson2015-07-028-92/+104
| | |_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | Introduce `git__getenv` which is a UTF-8 aware `getenv` everywhere. Make `cl_getenv` use this to keep consistent memory handling around return values (free everywhere, as opposed to only some platforms).
* | | | | Merge pull request #3202 from jeffhostetler/windows_stack_traceCarlos Martín Nieto2015-07-063-19/+170
|\ \ \ \ \ | |_|_|_|/ |/| | | | Stacktraces with CRTDBG memory leaks on Windows
| * | | | Include stacktrace summary in memory leak output.Jeff Hostetler2015-06-293-19/+170
| | | | |
* | | | | Merge pull request #3287 from ethomson/filter_test_cleanupCarlos Martín Nieto2015-07-021-6/+1
|\ \ \ \ \ | | | | | | | | | | | | filter::stream: free the filter sanely
| * | | | | filter::stream: free the filter sanelyEdward Thomson2015-07-021-6/+1
| | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | Don't use the filter's free callback to free the actual data structure holding the filter, as we may not always actually initialize it (the test may be skipped).
* | | | | submodule: add failing test for loading the wrong submoduleCarlos Martín Nieto2015-07-011-0/+23
| | | | | | | | | | | | | | | | | | | | | | | | | When two submodules are fairly similar, we may end up loading the wrong one.
* | | | | submodule: completely remove reload_allCarlos Martín Nieto2015-07-011-2/+0
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | The function was removed, but its declaration and changelog entry about its removal were forgotten. The comment in the test doesn't make any sense as the function doesn't exist anymore, so get rid of it as well.
* | | | index tests: add eol to avoid compiler warningEdward Thomson2015-06-301-1/+1
| | | |
* | | | checkout test: mark unused varsEdward Thomson2015-06-301-1/+4
| |/ / |/| |
* | | Merge pull request #3270 from ethomson/warnings2Carlos Martín Nieto2015-06-305-5/+6
|\ \ \ | |/ / |/| | Remove some warnings
| * | checkout test: check getcwd return valueEdward Thomson2015-06-291-1/+1
| | |
| * | clar: test chdirEdward Thomson2015-06-291-1/+1
| | |
| * | filter test: pass base typeEdward Thomson2015-06-291-2/+2
| | |
| * | stash: const up conflict paramsEdward Thomson2015-06-291-1/+1
| | |
| * | index test: include repository.h for declEdward Thomson2015-06-291-0/+1
| | |
* | | submodule: remove trailing slashes from submodule pathsCarlos Martín Nieto2015-06-291-0/+3
|/ / | | | | | | | | We allow looking up a submodule by path, but we lost the path normalisation during the recent changes. Bring it back.
* | Merge pull request #3265 from libgit2/leaksCarlos Martín Nieto2015-06-274-7/+27
|\ \ | | | | | | Plug a bunch of leaks
| * | index, iterator, fetchhead: plug leaksleaksCarlos Martín Nieto2015-06-262-1/+7
| | |
| * | checkout: plug a few leaksCarlos Martín Nieto2015-06-261-5/+15
| | |
| * | diff: fix leaks in diff printingCarlos Martín Nieto2015-06-261-1/+5
| | |
* | | Merge pull request #3260 from ethomson/apply_with_reflog_indicesCarlos Martín Nieto2015-06-271-0/+34
|\ \ \ | | | | | | | | stash: test we apply using reflog-like indices
| * | | stash: test we apply using reflog-like indicesEdward Thomson2015-06-261-0/+34
| |/ /
* | | Merge pull request #3263 from git-up/fixesCarlos Martín Nieto2015-06-262-2/+0
|\ \ \ | |/ / |/| | Fixes
| * | Removed unused variablesPierre-Olivier Latour2015-06-262-2/+0
| |/
* | Merge pull request #3259 from ethomson/stash_apply_arghCarlos Martín Nieto2015-06-261-9/+85
|\ \ | | | | | | Stash apply: stage new files even when not updating the index
| * | stash: stage new files when unstashing themEdward Thomson2015-06-251-2/+50
| | | | | | | | | | | | | | | Files that were new (staged additions) in the stash tree should be staged when unstashing, even when not applying the index.
| * | stash: don't allow apply with staged changesEdward Thomson2015-06-251-1/+18
| | |
| * | stash apply: add a newly staged file to testsEdward Thomson2015-06-251-8/+19
| | |
* | | test-diff-blob: Pass proper nibble sizesvmg/prefix-lenVicent Marti2015-06-261-14/+14
| | |
* | | revparse: Add test to make sure this doesn't regressVicent Marti2015-06-261-0/+15
| |/ |/|
* | diff: test we don't update index unnecessarilyEdward Thomson2015-06-261-7/+69
| | | | | | | | | | Test that workdir diffs, when presented with UPDATE_INDEX, only write the index when they actually make a change.
* | Merge pull request #3255 from libgit2/cmn/rename-unspecifiedEdward Thomson2015-06-253-11/+11
|\ \ | |/ |/| Rename FALLBACK to UNSPECIFIED
| * Rename FALLBACK to UNSPECIFIEDcmn/rename-unspecifiedCarlos Martín Nieto2015-06-253-11/+11
| | | | | | | | | | Fallback describes the mechanism, while unspecified explains what the user is thinking.
* | Merge pull request #3256 from libgit2/cmn/fetch-spec-fetchheadEdward Thomson2015-06-251-0/+44
|\ \ | | | | | | remote: insert refspecs with no rhs in FETCH_HEAD
| * | remote: insert refspecs with no rhs in FETCH_HEADcmn/fetch-spec-fetchheadCarlos Martín Nieto2015-06-251-0/+44
| | | | | | | | | | | | | | | | | | | | | | | | | | | When a refspec contains no rhs and thus won't cause an explicit update, we skip all the logic, but that means that we don't update FETCH_HEAD with it, which is what the implicit rhs is. Add another bit of logic which puts those remote heads in the list of updates so we put them into FETCH_HEAD.
* | | Merge pull request #3246 from libgit2/cmn/dont-grow-borrowedEdward Thomson2015-06-251-0/+13
|\ \ \ | |_|/ |/| | Don't allow growing borrowed buffers
View Lorry Controller Status