Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | Remove ignored files from the working directory if they were stashed | Jacques Germishuys | 2014-03-04 | 1 | -0/+2 | |
| | | ||||||
* | | Added a test, that fails for #2133 | Matthias Bartelmeß | 2014-03-03 | 1 | -0/+15 | |
| | | ||||||
* | | features: Rename `_HAS_` to `_FEATURE_`vmg/features | Vicent Marti | 2014-03-03 | 1 | -6/+6 | |
| | | ||||||
* | | caps: Rename to features to avoid confusion | Vicent Marti | 2014-03-03 | 1 | -8/+8 | |
| | | ||||||
* | | Merge pull request #2144 from linquize/branch-f-current | Ben Straub | 2014-03-02 | 1 | -0/+19 | |
|\ \ | | | | | | | Do not allow git_branch_create() to force update branch | |||||
| * | | Add unit test to show git_branch_create() fails if attempt to force create ↵ | Linquize | 2014-03-02 | 1 | -0/+19 | |
| | | | | | | | | | | | | current branch | |||||
* | | | Add buffer to buffer diff and patch APIs | Russell Belfer | 2014-02-27 | 1 | -150/+90 | |
| | | | | | | | | | | | | | | | | | | | | | | | | This adds `git_diff_buffers` and `git_patch_from_buffers`. This also includes a bunch of internal refactoring to increase the shared code between these functions and the blob-to-blob and blob-to-buffer APIs, as well as some higher level assert helpers in the tests to also remove redundancy. | |||||
* | | | Merge pull request #2137 from jru/blame-first-parent | Ben Straub | 2014-02-26 | 1 | -0/+15 | |
|\ \ \ | | | | | | | | | Blame first-parent history | |||||
| * | | | Reset num_parents to 1 only for merge commits | Juan Rubén | 2014-02-26 | 1 | -1/+1 | |
| | | | | | | | | | | | | | | | | Also, correct test case to account for the boundary flag | |||||
| * | | | Add unit test | Juan Rubén | 2014-02-24 | 1 | -0/+15 | |
| | | | | ||||||
* | | | | Move system directory cache out of utils | Edward Thomson | 2014-02-24 | 3 | -21/+24 | |
| | | | | ||||||
* | | | | Staticize file-local variables | Ben Straub | 2014-02-24 | 2 | -3/+3 | |
| | | | | ||||||
* | | | | Address PR comments | Russell Belfer | 2014-02-20 | 1 | -1/+1 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Make GIT_INLINE an internal definition so it cannot be used in public headers * Fix language in CONTRIBUTING * Make index caps API use signed instead of unsigned values | |||||
* | | | | Improve error propagation in shallow call | Ben Straub | 2014-02-18 | 1 | -0/+6 | |
|/ / / | ||||||
* | | | Fix filter test for CRLF->LF issues | Edward Thomson | 2014-02-11 | 1 | -1/+2 | |
| | | | ||||||
* | | | Merge pull request #2110 from libgit2/ed/crlf_input | Russell Belfer | 2014-02-11 | 4 | -25/+241 | |
|\ \ \ | | | | | | | | | Handle `core.autocrlf=input` when checking out | |||||
| * | | | Tests for crlf filtering into the repository | Edward Thomson | 2014-02-09 | 1 | -0/+136 | |
| | | | | ||||||
| * | | | Tests for core.autocrlf and .gitattributes | Edward Thomson | 2014-02-09 | 3 | -25/+104 | |
| | | | | ||||||
| * | | | Close files on file diff failure | Edward Thomson | 2014-02-09 | 1 | -0/+1 | |
| | |/ | |/| | | | | | | | | | | Not closing the files on a diff failure ensures that clar cleanup will fail on win32 because we still have the file open. | |||||
* | | | refs: move current_id before the reflog parameters | Carlos Martín Nieto | 2014-02-10 | 1 | -4/+4 | |
|/ / | | | | | | | | | Keep the reflog parameters as the last two, as they're the optional parameters. | |||||
* | | Add git_commit_amend API | Russell Belfer | 2014-02-07 | 1 | -0/+76 | |
| | | | | | | | | | | | | | | | | | | This adds an API to amend an existing commit, basically a shorthand for creating a new commit filling in missing parameters from the values of an existing commit. As part of this, I also added a new "sys" API to create a commit using a callback to get the parents. This allowed me to rewrite all the other commit creation APIs so that temporary allocations are no longer needed. | |||||
* | | Merge pull request #2099 from libgit2/bs/more-reflog-stuff | Russell Belfer | 2014-02-07 | 27 | -106/+354 | |
|\ \ | | | | | | | More reflogness | |||||
| * | | Correct default reflog message for git_remote_fetch | Ben Straub | 2014-02-06 | 1 | -0/+28 | |
| | | | ||||||
| * | | Only run clone-failure test on private repo | Ben Straub | 2014-02-05 | 1 | -1/+7 | |
| | | | ||||||
| * | | More merge.conflictstyle fixes | Ben Straub | 2014-02-05 | 1 | -0/+7 | |
| | | | ||||||
| * | | Avoid crash when skipping remote test | Ben Straub | 2014-02-05 | 1 | -2/+4 | |
| | | | ||||||
| * | | Fix broken clone test | Ben Straub | 2014-02-05 | 1 | -12/+4 | |
| | | | ||||||
| * | | Prevent user's merge.conflictstyle from breaking tests | Ben Straub | 2014-02-05 | 3 | -0/+21 | |
| | | | ||||||
| * | | Fix a few references to changed function signatures | Ben Straub | 2014-02-05 | 1 | -3/+3 | |
| | | | ||||||
| * | | Merge remote-tracking branch 'libgit2/development' into bs/more-reflog-stuff | Ben Straub | 2014-02-05 | 3 | -9/+451 | |
| |\ \ | ||||||
| * | | | Add reflog params to git_repository_detach_head | Ben Straub | 2014-02-04 | 6 | -13/+34 | |
| | | | | ||||||
| * | | | Add reflog parameters to remote apis | Ben Straub | 2014-02-04 | 5 | -12/+67 | |
| | | | | | | | | | | | | Also added a test for git_remote_fetch. | |||||
| * | | | Add reflog parameters to git_push_update_tips | Ben Straub | 2014-02-04 | 1 | -1/+15 | |
| | | | | ||||||
| * | | | Fix reflog message when creating commits | Ben Straub | 2014-02-04 | 1 | -1/+14 | |
| | | | | ||||||
| * | | | Add reset tests for reflog | Ben Straub | 2014-02-03 | 5 | -0/+98 | |
| | | | | ||||||
| * | | | Fix warning | Ben Straub | 2014-02-03 | 1 | -1/+1 | |
| | | | | ||||||
| * | | | Add reflog parameters to git_reset | Ben Straub | 2014-02-03 | 9 | -39/+39 | |
| | | | | ||||||
| * | | | Reset helpers: use revparse instead | Ben Straub | 2014-02-03 | 8 | -32/+23 | |
| | | | | ||||||
* | | | | Merge pull request #2042 from libgit2/cmn/conditional-ref | Russell Belfer | 2014-02-07 | 2 | -0/+166 | |
|\ \ \ \ | | | | | | | | | | | refs: conditional ref updates | |||||
| * | | | | refs: add an unconditional delete | Carlos Martín Nieto | 2014-02-05 | 1 | -0/+14 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | Add it under the git_reference_remove() name, letting the user pass the repo and name, analogous to unconditional setting/creation. | |||||
| * | | | | refs: catch cases where the ref type has changed | Carlos Martín Nieto | 2014-02-05 | 1 | -0/+58 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | If the type of the on-disk reference has changed, the old value comparison should fail. | |||||
| * | | | | refs: check the ref's old value when deleting | Carlos Martín Nieto | 2014-02-05 | 1 | -0/+33 | |
| | | | | | | | | | | | | | | | | | | | | Recognize when the reference has changed since we loaded it. | |||||
| * | | | | refs: bring conditional symbolic updates to the frontend | Carlos Martín Nieto | 2014-02-05 | 1 | -1/+20 | |
| | | | | | | | | | | | | | | | | | | | | Bring the race detection goodness to symbolic references as well. | |||||
| * | | | | refs: add tests for conditional updates | Carlos Martín Nieto | 2014-02-05 | 1 | -0/+42 | |
| | | | | | ||||||
* | | | | | Fix some Windows warnings | Russell Belfer | 2014-02-07 | 2 | -16/+14 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This fixes a number of warnings with the Windows 64-bit build including a test failure in test_repo_message__message where an invalid pointer to a git_buf was being used. | |||||
* | | | | | Merge pull request #2100 from libgit2/rb/update-pqueue | Vicent Marti | 2014-02-07 | 2 | -4/+135 | |
|\ \ \ \ \ | |_|_|/ / |/| | | | | Replace priority queue code with implementation from hashsig | |||||
| * | | | | Fix typo setting sorted flag when reloading index | Russell Belfer | 2014-02-04 | 1 | -0/+34 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This fixes a typo I made for setting the sorted flag on the index after a reload. That typo didn't actually cause any test failures so I'm also adding a test that explicitly checks that the index is correctly sorted after a reload when ignoring case and when not. | |||||
| * | | | | Convert pqueue to just be a git_vector | Russell Belfer | 2014-02-04 | 1 | -4/+4 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This updates the git_pqueue to simply be a set of specialized init/insert/pop functions on a git_vector. To preserve the pqueue feature of having a fixed size heap, I converted the "sorted" field in git_vectors to a more general "flags" field so that pqueue could mix in it's own flag. This had a bunch of ramifications because a number of places were directly looking at the vector "sorted" field - I added a couple new git_vector helpers (is_sorted, set_sorted) so the specific representation of this information could be abstracted. | |||||
| * | | | | Add some priority queue tests | Russell Belfer | 2014-02-03 | 1 | -0/+97 | |
| | |_|/ | |/| | | | | | | | | | | I forgot that I wrote some tests for the new priority queue code. | |||||
* | | | | Merge pull request #2027 from libgit2/rb/only-windows-is-windows | Ben Straub | 2014-02-05 | 1 | -9/+91 | |
|\ \ \ \ | | | | | | | | | | | Some tests of paths that can't actually be written to disk |