summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Warnings that default to being errorsrb/warnings-for-commit-headersRussell Belfer2014-03-115-51/+135
| | | | | | | 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 warningsRussell Belfer2014-03-075-32/+125
|
* Simplify warning API pending further discussionRussell Belfer2014-03-0712-81/+75
|
* Add a warning API and use it for bad signaturesRussell Belfer2014-03-0712-36/+218
| | | | | 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 #2170 from ethomson/clarVicent Marti2014-03-072-4/+4
|\ | | | | Update clar to e1990d6
| * Update clar to e1990d6Edward Thomson2014-03-072-4/+4
|/
* Merge pull request #2028 from libgit2/options-namesVicent Marti2014-03-0727-159/+184
|\ | | | | Rename options structures
| * git_revert_opts -> git_revert_optionsoptions-namesBen Straub2014-03-064-29/+29
| |
| * git_checkout_opts -> git_checkout_optionsBen Straub2014-03-0625-131/+156
| |
* | Merge pull request #2153 from mekishizufu/tag_exampleRussell Belfer2014-03-074-2/+320
|\ \ | | | | | | Add a tag example
| * | Move all variable declarations to the top of the blockJiri Pospisil2014-03-051-4/+7
| | |
| * | Add tag exampleJiri Pospisil2014-03-053-1/+316
| | |
| * | Fix typoJiri Pospisil2014-03-051-1/+1
| | |
* | | Merge pull request #2167 from mekishizufu/memory_access_fixesVicent Marti2014-03-072-21/+18
|\ \ \ | | | | | | | | Fun with memory access
| * | | blame: Fix compare function's data typesJiri Pospisil2014-03-071-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 issuesJiri Pospisil2014-03-071-15/+9
| | | |
* | | | Merge pull request #2169 from libgit2/valgrindVicent Marti2014-03-079-15/+44
|\ \ \ \ | |/ / / |/| | | Plug leaks
| * | | Plug a few leaks in the testsCarlos Martín Nieto2014-03-076-1/+22
| | | |
| * | | branch: fix leak when checking against HEADCarlos Martín Nieto2014-03-071-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_ancestorCarlos Martín Nieto2014-03-071-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-opensCarlos Martín Nieto2014-03-071-0/+3
|/ / / | | | | | | | | | | | | Combinations of connect + fetch can call local_open multiple times. Detect this and skip the initialization stage.
* | | Merge pull request #2168 from ethomson/clarVicent Marti2014-03-072-0/+26
|\ \ \ | |_|/ |/| | Update clar to a0b00f0
| * | Update clar to a0b00f0Edward Thomson2014-03-072-0/+26
|/ /
* | tests: MSVC compatCarlos Martín Nieto2014-03-061-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.
* | Merge pull request #2165 from libgit2/revert-1997Vicent Marti2014-03-061-1/+1
|\ \ | | | | | | Revert pull request #1997
| * | Revert pull request #1997revert-1997Vicent Marti2014-03-061-1/+1
|/ /
* | Merge pull request #1997 from mgbowen/merge-options-init-fixVicent Marti2014-03-061-1/+1
|\ \ | | | | | | Fix GIT_MERGE_OPTS_INIT on MSVC.
| * | Fix GIT_MERGE_OPTS_INIT on MSVC.Matthew Bowen2013-12-091-1/+1
| | |
* | | Merge pull request #2014 from mgbowen/cpp-options-initVicent Marti2014-03-0629-0/+516
|\ \ \ | | | | | | | | Function-based options initializers
| * | | Added function-based initializers for every options struct.Matthew Bowen2014-03-0529-0/+516
| | | | | | | | | | | | | | | | The basic structure of each function is courtesy of arrbee.
* | | | Merge pull request #2162 from sunheehnus/devBen Straub2014-03-052-3/+51
|\ \ \ \ | |/ / / |/| | | examples/diff:Add the shortstat flag to examples/diff.c
| * | | Merge completed: resolve the conflict with the upstreamSun He2014-03-0616-30/+309
| |\ \ \ | |/ / / |/| | |
* | | | Merge pull request #2159 from libgit2/rb/odb-exists-prefixVicent Marti2014-03-0610-16/+234
|\ \ \ \ | | | | | | | | | | Add ODB API to check for existence by prefix and object id shortener
| * | | | Check short OID len in odb, not in backendsRussell Belfer2014-03-052-10/+3
| | | | |
| * | | | Add git_object_short_id API to get short id stringRussell Belfer2014-03-043-0/+97
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 APIRussell Belfer2014-03-047-10/+138
| | | | |
* | | | | Merge pull request #2164 from libgit2/cmn/refs-delete-iterationVicent Marti2014-03-052-2/+13
|\ \ \ \ \ | | | | | | | | | | | | refdb: catch a directory disappearing
| * | | | | refdb: catch a directory disappearingCarlos Martín Nieto2014-03-052-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_writeVicent Marti2014-03-052-6/+53
|\ \ \ \ \ | |/ / / / |/| | | | ODB writing fails gracefully when unsupported
| * | | | ODB writing fails gracefully when unsupportedEdward Thomson2014-03-052-6/+53
| | | | | | | | | | | | | | | | | | | | If no ODB backends support writing, we should fail gracefully.
* | | | | Merge pull request #2160 from modocache/examples-diff-add-patience-and-minimalVicent Marti2014-03-052-4/+4
|\ \ \ \ \ | | | | | | | | | | | | examples/diff: Add minimal, patience diff options.
| * | | | | examples/diff: Add minimal, patience diff options.Brian Gesiak2014-03-052-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Add minimal, patience diff options to diff example. libgit2 `diff_xdiff.git_xdiff_init` already supports these flags, so no additional change is necessary. - Remove minimal and patience flag addition from project list.
* | | | | | Merge pull request #2161 from softwarenerd/softwarenerdVicent Marti2014-03-051-2/+5
|\ \ \ \ \ \ | |/ / / / / |/| | | | | Fixed missing error check on call to git_remote_download
| * | | | | Fixed missing error check on call to git_remote_download in ↵Brian Lambert2014-03-051-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.
| | | * | fix the output format of diffSun He2014-03-051-2/+2
| | | | |
| | | * | Add the --shortstat flag to examples/diff.cSun He2014-03-052-3/+51
| |_|/ / |/| | |
* | | | Merge pull request #2157 from libgit2/cmn/write-object-memVicent Marti2014-03-041-10/+17
|\ \ \ \ | |_|/ / |/| | | pack-objects: free memory safely
| * | | pack-objects: free memory safelyCarlos Martín Nieto2014-03-041-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.
* | | | Merge pull request #2155 from jacquesg/stash-save-remove-ignoredRussell Belfer2014-03-042-2/+9
|\ \ \ \ | | | | | | | | | | Remove ignored files from the working directory if they were stashed
| * | | | Remove ignored files from the working directory if they were stashedJacques Germishuys2014-03-042-2/+9
|/ / / /
View Lorry Controller Status