Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Warnings that default to being errorsrb/warnings-for-commit-headers | Russell Belfer | 2014-03-11 | 3 | -16/+52 |
| | | | | | | | 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 | 3 | -20/+70 |
| | |||||
* | Simplify warning API pending further discussion | Russell Belfer | 2014-03-07 | 9 | -49/+38 |
| | |||||
* | Add a warning API and use it for bad signatures | Russell Belfer | 2014-03-07 | 9 | -14/+124 |
| | | | | | This is just the initial take. I expect that the API will need to change quite a bit before we accept it into libgit2. | ||||
* | Merge pull request #2028 from libgit2/options-names | Vicent Marti | 2014-03-07 | 6 | -31/+31 |
|\ | | | | | Rename options structures | ||||
| * | git_revert_opts -> git_revert_optionsoptions-names | Ben Straub | 2014-03-06 | 1 | -12/+12 |
| | | |||||
| * | git_checkout_opts -> git_checkout_options | Ben Straub | 2014-03-06 | 5 | -19/+19 |
| | | |||||
* | | Merge pull request #2167 from mekishizufu/memory_access_fixes | Vicent Marti | 2014-03-07 | 2 | -21/+18 |
|\ \ | | | | | | | Fun with memory access | ||||
| * | | blame: Fix compare function's data types | Jiri Pospisil | 2014-03-07 | 1 | -6/+9 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously the hunk_byfinalline_search_cmp function was called with different data types (size_t and uint32_t) for the key argument but expected only the former resulting in an invalid memory access when passed the latter on a 64 bit machine. The following patch makes sure that the function is called and works with the same type (size_t). | ||||
| * | | git_oid_fromstrn: Simplify the implementation and fix memory access issues | Jiri Pospisil | 2014-03-07 | 1 | -15/+9 |
| |/ | |||||
* | | Plug a few leaks in the tests | Carlos Martín Nieto | 2014-03-07 | 2 | -1/+5 |
| | | |||||
* | | branch: fix leak when checking against HEAD | Carlos Martín Nieto | 2014-03-07 | 1 | -5/+11 |
| | | | | | | | | | | | | | | | | We look up a reference in order to figure out if it's the current branch, which we need to free once we're done with the check. As a bonus, only perform the check when we're passed the force flag, as it's a useless check otherwise. | ||||
* | | commit: simplify and correct refcounting in nth_gen_ancestor | Carlos Martín Nieto | 2014-03-07 | 1 | -9/+8 |
| | | | | | | | | | | | | | | | | We can make use of git_object_dup to use refcounting instead of pointer comparison to make sure we don't free the caller's object. This also lets us simplify the case for '~0' which is now just an assignment instead of looking up the object we have at hand. | ||||
* | | local transport: catch double-opens | Carlos Martín Nieto | 2014-03-07 | 1 | -0/+3 |
|/ | | | | | Combinations of connect + fetch can call local_open multiple times. Detect this and skip the initialization stage. | ||||
* | Added function-based initializers for every options struct. | Matthew Bowen | 2014-03-05 | 14 | -0/+190 |
| | | | | 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 | 4 | -10/+140 |
|\ | | | | | Add ODB API to check for existence by prefix and object id shortener | ||||
| * | Check short OID len in odb, not in backends | Russell Belfer | 2014-03-05 | 2 | -10/+3 |
| | | |||||
| * | Add git_object_short_id API to get short id string | Russell Belfer | 2014-03-04 | 1 | -0/+43 |
| | | | | | | | | | | | | 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 | 3 | -4/+98 |
| | | |||||
* | | Merge pull request #2164 from libgit2/cmn/refs-delete-iteration | Vicent Marti | 2014-03-05 | 2 | -2/+13 |
|\ \ | | | | | | | refdb: catch a directory disappearing | ||||
| * | | refdb: catch a directory disappearing | Carlos Martín Nieto | 2014-03-05 | 2 | -2/+13 |
| | | | | | | | | | | | | | | | | | | | | | | | | If a directory disappears between the time we look up the entries of its parent and the time when we go to look at it, we should ignore the error and move forward. This fixes #2046. | ||||
* | | | Merge pull request #2163 from ethomson/nobackend_odb_write | Vicent Marti | 2014-03-05 | 1 | -6/+12 |
|\ \ \ | |/ / |/| | | ODB writing fails gracefully when unsupported | ||||
| * | | ODB writing fails gracefully when unsupported | Edward Thomson | 2014-03-05 | 1 | -6/+12 |
| | | | | | | | | | | | | If no ODB backends support writing, we should fail gracefully. | ||||
* | | | Fixed missing error check on call to git_remote_download in ↵ | Brian Lambert | 2014-03-05 | 1 | -2/+5 |
| | | | | | | | | | | | | git_remote_fetch. Moved error check to statement following git_remote_disconnect so that the disconnect happens regardless of the result of the download call. | ||||
* | | | Merge pull request #2157 from libgit2/cmn/write-object-mem | Vicent Marti | 2014-03-04 | 1 | -10/+17 |
|\ \ \ | |_|/ |/| | | pack-objects: free memory safely | ||||
| * | | pack-objects: free memory safely | Carlos Martín Nieto | 2014-03-04 | 1 | -10/+17 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | A few fixes have accumulated in this area which have made the freeing of data a bit muddy. Make sure to free the data only when needed and once. When we are going to write a delta to the packfile, we need to free the data, otherwise leave it. The current version of the code mixes up the checks for po->data and po->delta_data. | ||||
* | | | Remove ignored files from the working directory if they were stashed | Jacques Germishuys | 2014-03-04 | 1 | -2/+7 |
| | | | |||||
* | | | Merge pull request #2141 from ravselj/development | Vicent Marti | 2014-03-03 | 3 | -2/+9 |
|\ \ \ | |/ / |/| | | BUGFIX - Fetching twice from the same remote causes a segfault | ||||
| * | | Merge remote-tracking branch 'remotes/upstream/development' into development | Miha | 2014-03-03 | 5 | -163/+155 |
| |\ \ | |||||
| * | | | - need_pack was not set to 0 when local fetch was already present causing ↵ | Miha | 2014-02-25 | 1 | -1/+3 |
| | | | | | | | | | | | | | | | | negotiate_fetch access violation | ||||
| * | | | - BUGFIX #2133 (@fourplusone) in smart_protocol.c | Miha | 2014-02-25 | 2 | -1/+6 |
| | | | | | | | | | | | | | | | | | | | | | | | | - added MSVC cmake definitions to disable warnings - general.c is rewritten so it is ansi-c compatible and compiles ok on microsoft windows - some MSVC reported warning fixes | ||||
* | | | | features: Rename `_HAS_` to `_FEATURE_`vmg/features | Vicent Marti | 2014-03-03 | 1 | -3/+3 |
| | | | | |||||
* | | | | caps: Rename to features to avoid confusion | Vicent Marti | 2014-03-03 | 1 | -4/+4 |
| |/ / |/| | | |||||
* | | | Merge pull request #2144 from linquize/branch-f-current | Ben Straub | 2014-03-02 | 1 | -0/+13 |
|\ \ \ | | | | | | | | | Do not allow git_branch_create() to force update branch | ||||
| * | | | Do not allow git_branch_create() to force update branch | Linquize | 2014-02-27 | 1 | -0/+13 |
| | | | | |||||
* | | | | Add buffer to buffer diff and patch APIs | Russell Belfer | 2014-02-27 | 3 | -161/+138 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 | -2/+4 |
|\ \ \ \ | |_|/ / |/| | | | 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 option to limit blame to first parent | Juan Rubén | 2014-02-23 | 1 | -2/+4 |
| | | | | |||||
* | | | | Merge pull request #2138 from ethomson/sysdir | Vicent Marti | 2014-02-25 | 10 | -334/+372 |
|\ \ \ \ | | | | | | | | | | | Move system directory cache out of utils | ||||
| * | | | | Move system directory cache out of utils | Edward Thomson | 2014-02-24 | 10 | -334/+372 |
| | | | | | |||||
* | | | | | Remove now-duplicated stdarg.h include | Edward Thomson | 2014-02-24 | 10 | -16/+0 |
| | | | | | |||||
* | | | | | Include stdarg.h for the va_copy test | Edward Thomson | 2014-02-24 | 1 | -0/+2 |
|/ / / / | |||||
* | | | | Use a portable cast | Ben Straub | 2014-02-24 | 1 | -2/+2 |
| | | | | |||||
* | | | | Prevent icc warning | Ben Straub | 2014-02-24 | 1 | -1/+3 |
| | | | | |||||
* | | | | Avoid casting warning | Ben Straub | 2014-02-24 | 1 | -2/+2 |
| | | | | |||||
* | | | | Address PR comments | Russell Belfer | 2014-02-20 | 6 | -6/+13 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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 | ||||
* | | | | Make git_oid_equal a non-inline API | Russell Belfer | 2014-02-20 | 1 | -0/+5 |
| | | | | |||||
* | | | | Readability | Ben Straub | 2014-02-18 | 1 | -1/+3 |
| | | | | |||||
* | | | | Improve error propagation in shallow call | Ben Straub | 2014-02-18 | 1 | -4/+5 |
|/ / / |