Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Warnings that default to being errorsrb/warnings-for-commit-headers | Russell Belfer | 2014-03-11 | 1 | -32/+75 |
| | | | | | | | This is a try at extending the warning API to include warnings that would be errors unless the user callback decides to demote them to warnings. This allows for relaxed parsing logic that will default to strict behavior but can continue if possible. | ||||
* | Add warning base class and use that for warnings | Russell Belfer | 2014-03-07 | 1 | -3/+32 |
| | |||||
* | Simplify warning API pending further discussion | Russell Belfer | 2014-03-07 | 1 | -9/+11 |
| | |||||
* | Add a warning API and use it for bad signatures | Russell Belfer | 2014-03-07 | 1 | -21/+47 |
| | | | | | This is just the initial take. I expect that the API will need to change quite a bit before we accept it into libgit2. | ||||
* | Update clar to e1990d6 | Edward Thomson | 2014-03-07 | 2 | -4/+4 |
| | |||||
* | Merge pull request #2028 from libgit2/options-names | Vicent Marti | 2014-03-07 | 16 | -98/+123 |
|\ | | | | | Rename options structures | ||||
| * | git_revert_opts -> git_revert_optionsoptions-names | Ben Straub | 2014-03-06 | 2 | -8/+8 |
| | | |||||
| * | git_checkout_opts -> git_checkout_options | Ben Straub | 2014-03-06 | 15 | -90/+115 |
| | | |||||
* | | Plug a few leaks in the tests | Carlos Martín Nieto | 2014-03-07 | 4 | -0/+17 |
| | | |||||
* | | Update clar to a0b00f0 | Edward Thomson | 2014-03-07 | 2 | -0/+26 |
|/ | |||||
* | tests: MSVC compat | Carlos Martín Nieto | 2014-03-06 | 1 | -2/+4 |
| | | | | | MSVC doesn't like declaring variables in the middle of a block, so make sure we only declare variables at the beginning of a block. | ||||
* | Added function-based initializers for every options struct. | Matthew Bowen | 2014-03-05 | 1 | -0/+120 |
| | | | | The basic structure of each function is courtesy of arrbee. | ||||
* | Merge pull request #2159 from libgit2/rb/odb-exists-prefix | Vicent Marti | 2014-03-06 | 3 | -1/+66 |
|\ | | | | | Add ODB API to check for existence by prefix and object id shortener | ||||
| * | Add git_object_short_id API to get short id string | Russell Belfer | 2014-03-04 | 1 | -0/+44 |
| | | | | | | | | | | | | This finds a short id string that will unambiguously select the given object, starting with the core.abbrev length (usually 7) and growing until it is no longer ambiguous. | ||||
| * | Add exists_prefix to ODB backend and ODB API | Russell Belfer | 2014-03-04 | 2 | -1/+22 |
| | | |||||
* | | Merge pull request #2163 from ethomson/nobackend_odb_write | Vicent Marti | 2014-03-05 | 1 | -0/+41 |
|\ \ | |/ |/| | ODB writing fails gracefully when unsupported | ||||
| * | ODB writing fails gracefully when unsupported | Edward Thomson | 2014-03-05 | 1 | -0/+41 |
| | | | | | | | | If no ODB backends support writing, we should fail gracefully. | ||||
* | | 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 |
| | | | |