summaryrefslogtreecommitdiff
path: root/tests
Commit message (Collapse)AuthorAgeFilesLines
...
| * | Collapse whitespace flags into git_merge_file_flags_tJacques Germishuys2015-03-162-4/+4
| | |
| * | Renamed git_merge_options 'flags' to 'tree_flags'Jacques Germishuys2015-03-164-8/+8
| | |
| * | Added tests to merge files and branches with whitespace problems and fixesJacques Germishuys2015-03-1649-0/+198
| | |
* | | Merge pull request #2993 from ethomson/clar_updateCarlos Martín Nieto2015-03-181-1/+1
|\ \ \ | | | | | | | | clar: update to 08f434d
| * | | clar: update to 08f434dEdward Thomson2015-03-171-1/+1
| | |/ | |/|
* | | Merge remote-tracking branch 'ethomson/submodule_8dot3'Carlos Martín Nieto2015-03-181-0/+108
|\ \ \
| * | | repository: Introduce "reserved names"Edward Thomson2015-02-271-0/+108
| | | | | | | | | | | | | | | | | | | | | | | | | | | | A repository can have multiple "reserved names" now, not just a single "short name" for the repository folder itself. Refactor to include a git_repository__reserved_names that returns all the reserved names for a repository.
* | | | Merge pull request #2985 from claudiuolteanu/patch-1Edward Thomson2015-03-171-1/+1
|\ \ \ \ | |_|/ / |/| | | Lower case the include directive of windows header
| * | | Lower case the include directive of windows headerClaudiu Olteanu2015-03-161-1/+1
| | |/ | |/| | | | Since the Linux platform has a case sensitive file system, the header name should be lower case for cross compiling purposes. (On Linux, the mingw header is called ```windows.h```).
* | | Merge pull request #2962 from libgit2/cmn/reflog-annotatedEdward Thomson2015-03-175-16/+66
|\ \ \ | | | | | | | | Add annotated versions of ref-modying functions
| * | | Add tests for the annotated versions of ref-modifying functionsCarlos Martín Nieto2015-03-165-16/+66
| |/ / | | | | | | | | | | | | This also brings the soft-reset tests back to life. The function name was missing an underscore, meaning they had not been running.
* | | Merge pull request #2982 from libgit2/cmn/stream-check-ecEdward Thomson2015-03-171-0/+7
|\ \ \ | | | | | | | | Don't ask for a stream's certificate unless it's encrypted
| * | | Add failing test for cert callback with non-ecrypted streamCarlos Martín Nieto2015-03-161-0/+7
| |/ / | | | | | | | | | | | | | | | When we have an HTTP stream and have set the certificatre check callback, we currently fail as we ask the unencrypted stream for its certificate.
* | | Merge pull request #2977 from pks-t/submodule-sync-url-fixEdward Thomson2015-03-171-3/+3
|\ \ \ | |/ / |/| | Fix git_submodule_sync writing URL to wrong key.
| * | Fix git_submodule_sync writing URL to wrong key.Patrick Steinhardt2015-03-121-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | Currently git_submodule_sync writes the submodule's URL to the key 'branch.<REMOTE_NAME>.remote' while the reference implementation of `git submodule sync` writes to 'remote.<REMOTE_NAME>.url', which is the intended behavior according to git-submodule(1).
* | | Put back the number of expected references to 6 from the test repoCarlos Martín Nieto2015-03-131-3/+3
|/ / | | | | | | | | | | | | This was but down to 5 when GitHub made a change to their server which made them stop honouring the include-tag request. This has recently been corrected, so we can bring it back up to six.
* | Merge commit 'refs/pull/2879/head' of ssh://github.com/libgit2/libgit2Carlos Martín Nieto2015-03-111-0/+122
|\ \
| * | Add API to add a memory buffer to an indexDamien PROFETA2015-02-251-0/+122
| |/ | | | | | | | | | | git_index_add_frombuffer enables now to store a memory buffer in the odb and to store an entry in the index directly if the index is attached to a repository.
* | Merge pull request #2970 from ethomson/inmemory_bareCarlos Martín Nieto2015-03-111-0/+27
|\ \ | | | | | | "In-memory" repos are bare by default
| * | repository_new: test its barenessEdward Thomson2015-03-101-0/+27
| | |
* | | Fixed build warningPierre-Olivier Latour2015-03-081-1/+1
| | |
* | | refdb: use the same id for old and new when renaming a referencecmn/rename-reflogCarlos Martín Nieto2015-03-081-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | When we rename a reference, we want the old and new ids to be the same one (as we did not change it). The normal code path looks up the old id from the current value of the brtanch, but by the time we look it up, it does not exist anymore and thus we write a zero id. Pass the old id explicitly instead.
* | | Merge pull request #2961 from ethomson/filter_relative_pathsEdward Thomson2015-03-061-0/+97
|\ \ \ | | | | | | | | Filter relative paths
| * | | filter::file tests: test filter_list_apply_to_fileEdward Thomson2015-03-061-0/+97
| |/ / | | | | | | | | | | | | Test that filter_list_apply_to_file works and can accept repo-relative paths.
* | | branch: fix generated reflog message upon renamingnulltoken2015-03-041-1/+1
| | |
* | | branch: fix generated reflog message upon creationnulltoken2015-03-041-1/+1
|/ /
* | Merge pull request #2932 from jeffhostetler/jeffhostetler/big_clone_crashCarlos Martín Nieto2015-03-041-0/+48
|\ \ | | | | | | Fix crash in git_clone on extremely large repos
| * | Fix p_ftruncate to handle big files for git_cloneJeff Hostetler2015-03-031-0/+48
| |/
* | libgit2_shutdown: clear err message on shutdownEdward Thomson2015-03-041-1/+0
| | | | | | | | | | | | Clear the error message on git_libgit2_shutdown for all versions of the library (no threads and Win32 threads). Drop the giterr_clear in clar, as that shouldn't be necessary.
* | Merge pull request #2886 from jeffhostetler/jeffhostetler/clar_traceCarlos Martín Nieto2015-03-046-0/+324
|\ \ | | | | | | Set up git_trace in clar test suite.
| * | Converted cl_perf_timer to use git__timer internally.Jeff Hostetler2015-03-032-76/+11
| | |
| * | Added cl_perf_timer. Updated global trace to include timers.Jeff Hostetler2015-03-023-1/+152
| | |
| * | Cleanup formatting of clar trace messages.Jeff Hostetler2015-03-021-7/+7
| | |
| * | Provide mechanism to let CLAR globally setup git_trace()Jeff Hostetler2015-03-024-0/+238
| | |
* | | Merge pull request #2945 from ethomson/empty_hashsig_heapCarlos Martín Nieto2015-03-041-0/+100
|\ \ \ | | | | | | | | diff_tform: don't compare empty hashsig_heaps
| * | | diff_tform: account for whitespace optionsEdward Thomson2015-03-041-6/+68
| | | | | | | | | | | | | | | | | | | | When comparing seemingly blank files, take whitespace options into account.
| * | | diff_tform: don't compare empty hashsig_heapsEdward Thomson2015-03-031-0/+38
| | | | | | | | | | | | | | | | Don't try to compare two empty hashsig_heaps.
* | | | Plug a few leaksCarlos Martín Nieto2015-03-043-0/+5
| | | |
* | | | config: borrow refcounted referencescmn/config-borrow-entryCarlos Martín Nieto2015-03-0320-240/+235
|/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This changes the get_entry() method to return a refcounted version of the config entry, which you have to free when you're done. This allows us to avoid freeing the memory in which the entry is stored on a refresh, which may happen at any time for a live config. For this reason, get_string() has been forbidden on live configs and a new function get_string_buf() has been added, which stores the string in a git_buf which the user then owns. The functions which parse the string value takea advantage of the borrowing to parse safely and then release the entry.
* | | Remove swp filesCarlos Martín Nieto2015-03-031-0/+0
| | |
* | | Merge pull request #2913 from ethomson/stash_fixupEdward Thomson2015-03-031-0/+19
|\ \ \ | | | | | | | | stash: correctly stash wd modified/index deleted
| * | | stash: correctly stash wd modified/index deletedEdward Thomson2015-02-181-0/+19
| | | |
* | | | repository: remove log message override for switching the active branchCarlos Martín Nieto2015-03-0316-81/+66
| | | | | | | | | | | | | | | | | | | | | | | | We want to use the "checkout: moving from ..." message in order to let git know when a change of branch has happened. Make the convenience functions for this goal write this message.
* | | | push: remove reflog message overrideCarlos Martín Nieto2015-03-032-4/+4
| | | | | | | | | | | | | | | | We always use "update by push".
* | | | branch: don't accept a reflog message overrideCarlos Martín Nieto2015-03-036-80/+40
| | | | | | | | | | | | | | | | | | | | | | | | | | | | This namespace is about behaving like git's branch command, so let's do exactly that instead of taking a reflog message. This override is still available via the reference namespace.
* | | | reset: remove reflog message overrideCarlos Martín Nieto2015-03-0311-85/+69
| | | | | | | | | | | | | | | | | | | | This function is meant to simulate what git does in the reset command, so we should include the reflog message in that.
* | | | Remove the signature from ref-modifying functionsCarlos Martín Nieto2015-03-0365-395/+343
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The signature for the reflog is not something which changes dynamically. Almost all uses will be NULL, since we want for the repository's default identity to be used, making it noise. In order to allow for changing the identity, we instead provide git_repository_set_ident() and git_repository_ident() which allow a user to override the choice of signature.
* | | | Merge pull request #2908 from ethomson/safe_createCarlos Martín Nieto2015-03-038-43/+92
|\ \ \ \ | |_|/ / |/| | | Allow checkout to handle newly cloned repositories, remove `GIT_CHECKOUT_SAFE_CREATE`
| * | | checkout tests: just use SAFE where appropriateEdward Thomson2015-02-272-9/+4
| | | |
| * | | checkout: remove `GIT_CHECKOUT_SAFE_CREATE` as a strategyEdward Thomson2015-02-275-40/+58
| | | |
View Lorry Controller Status