summaryrefslogtreecommitdiff
path: root/src
Commit message (Collapse)AuthorAgeFilesLines
* git_revert_opts -> git_revert_optionsoptions-namesBen Straub2014-03-061-12/+12
|
* git_checkout_opts -> git_checkout_optionsBen Straub2014-03-065-19/+19
|
* Added function-based initializers for every options struct.Matthew Bowen2014-03-0514-0/+190
| | | | The basic structure of each function is courtesy of arrbee.
* Merge pull request #2159 from libgit2/rb/odb-exists-prefixVicent Marti2014-03-064-10/+140
|\ | | | | 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-041-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 APIRussell Belfer2014-03-043-4/+98
| |
* | 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-051-6/+12
|\ \ \ | |/ / |/| | ODB writing fails gracefully when unsupported
| * | ODB writing fails gracefully when unsupportedEdward Thomson2014-03-051-6/+12
| | | | | | | | | | | | If no ODB backends support writing, we should fail gracefully.
* | | 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.
* | | 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.
* | | Remove ignored files from the working directory if they were stashedJacques Germishuys2014-03-041-2/+7
| | |
* | | Merge pull request #2141 from ravselj/developmentVicent Marti2014-03-033-2/+9
|\ \ \ | |/ / |/| | BUGFIX - Fetching twice from the same remote causes a segfault
| * | Merge remote-tracking branch 'remotes/upstream/development' into developmentMiha2014-03-035-163/+155
| |\ \
| * | | - need_pack was not set to 0 when local fetch was already present causing ↵Miha2014-02-251-1/+3
| | | | | | | | | | | | | | | | negotiate_fetch access violation
| * | | - BUGFIX #2133 (@fourplusone) in smart_protocol.cMiha2014-02-252-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/featuresVicent Marti2014-03-031-3/+3
| | | |
* | | | caps: Rename to features to avoid confusionVicent Marti2014-03-031-4/+4
| |/ / |/| |
* | | Merge pull request #2144 from linquize/branch-f-currentBen Straub2014-03-021-0/+13
|\ \ \ | | | | | | | | Do not allow git_branch_create() to force update branch
| * | | Do not allow git_branch_create() to force update branchLinquize2014-02-271-0/+13
| | | |
* | | | Add buffer to buffer diff and patch APIsRussell Belfer2014-02-273-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-parentBen Straub2014-02-261-2/+4
|\ \ \ \ | |_|/ / |/| | | Blame first-parent history
| * | | Reset num_parents to 1 only for merge commitsJuan Rubén2014-02-261-1/+1
| | | | | | | | | | | | | | | | Also, correct test case to account for the boundary flag
| * | | Add option to limit blame to first parentJuan Rubén2014-02-231-2/+4
| | | |
* | | | Merge pull request #2138 from ethomson/sysdirVicent Marti2014-02-2510-334/+372
|\ \ \ \ | | | | | | | | | | Move system directory cache out of utils
| * | | | Move system directory cache out of utilsEdward Thomson2014-02-2410-334/+372
| | | | |
* | | | | Remove now-duplicated stdarg.h includeEdward Thomson2014-02-2410-16/+0
| | | | |
* | | | | Include stdarg.h for the va_copy testEdward Thomson2014-02-241-0/+2
|/ / / /
* | | | Use a portable castBen Straub2014-02-241-2/+2
| | | |
* | | | Prevent icc warningBen Straub2014-02-241-1/+3
| | | |
* | | | Avoid casting warningBen Straub2014-02-241-2/+2
| | | |
* | | | Address PR commentsRussell Belfer2014-02-206-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 APIRussell Belfer2014-02-201-0/+5
| | | |
* | | | ReadabilityBen Straub2014-02-181-1/+3
| | | |
* | | | Improve error propagation in shallow callBen Straub2014-02-181-4/+5
|/ / /
* | | Check for EWOULDBLOCK as well as EAGAIN on write.brian m. carlson2014-02-162-1/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | On some systems, notably HP PA-RISC systems running Linux or HP-UX, EWOULDBLOCK and EAGAIN are not the same value. POSIX (and these OSes) allow EWOULDBLOCK to occur on write(2) (and send(2), etc.), so check explicitly for this case as well as EAGAIN by defining and using a macro GIT_ISBLOCKED that considers both. The macro is necessary because MSYS does not provide EWOULDBLOCK and compilation fails if an attempt is made to use it unconditionally. On most systems, where the two values are the same, the compiler will simply optimize this check out and it will have no effect.
* | | Never convert CRLF->LFEdward Thomson2014-02-111-17/+4
| | | | | | | | | | | | Core git performs no conversion on systems that use LF, emulate that.
* | | Merge pull request #2110 from libgit2/ed/crlf_inputRussell Belfer2014-02-111-1/+7
|\ \ \ | | | | | | | | Handle `core.autocrlf=input` when checking out
| * | | core.autocrlf=input w/ text=auto attr to workdirEdward Thomson2014-02-091-1/+7
| | |/ | |/|
* | | refs: move current_id before the reflog parametersCarlos Martín Nieto2014-02-101-8/+8
| | | | | | | | | | | | | | | Keep the reflog parameters as the last two, as they're the optional parameters.
* | | refs: conditional wording fixupsCarlos Martín Nieto2014-02-101-3/+2
|/ / | | | | | | | | This addresses arrbee's concerns about wording in the conditional reference udpate functions.
* | Add git_commit_amend APIRussell Belfer2014-02-072-66/+163
| | | | | | | | | | | | | | | | | | 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-stuffRussell Belfer2014-02-077-17/+77
|\ \ | | | | | | More reflogness
| * | Correct default reflog message for git_remote_fetchBen Straub2014-02-061-1/+12
| | |
| * | Merge remote-tracking branch 'libgit2/development' into bs/more-reflog-stuffBen Straub2014-02-057-81/+85
| |\ \
| * | | Add reflog params to git_repository_detach_headBen Straub2014-02-041-2/+5
| | | |
| * | | Add reflog parameters to remote apisBen Straub2014-02-042-8/+20
| | | | | | | | | | | | Also added a test for git_remote_fetch.
View Lorry Controller Status