summaryrefslogtreecommitdiff
path: root/src
Commit message (Collapse)AuthorAgeFilesLines
* 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.
| * | | Add reflog parameters to git_push_update_tipsBen Straub2014-02-041-2/+7
| | | |
| * | | Fix reflog message when creating commitsBen Straub2014-02-041-2/+21
| | | |
| * | | Add reset tests for reflogBen Straub2014-02-031-1/+3
| | | |
| * | | Add reflog parameters to git_resetBen Straub2014-02-031-2/+10
| | | |
* | | | Merge pull request #2042 from libgit2/cmn/conditional-refRussell Belfer2014-02-074-46/+172
|\ \ \ \ | | | | | | | | | | refs: conditional ref updates
| * | | | refs: add an unconditional deleteCarlos Martín Nieto2014-02-051-0/+11
| | | | | | | | | | | | | | | | | | | | | | | | | 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 changedCarlos Martín Nieto2014-02-051-3/+15
| | | | | | | | | | | | | | | | | | | | | | | | | If the type of the on-disk reference has changed, the old value comparison should fail.
| * | | | refs: check the ref's old value when deletingCarlos Martín Nieto2014-02-051-1/+9
| | | | | | | | | | | | | | | | | | | | Recognize when the reference has changed since we loaded it.
| * | | | refs: placeholder conditional deleteCarlos Martín Nieto2014-02-054-26/+48
| | | | | | | | | | | | | | | | | | | | We don't actually pass the old value yet.
| * | | | refs: factor out old value comparisonCarlos Martín Nieto2014-02-051-14/+26
| | | | | | | | | | | | | | | | | | | | We will reuse this later for deletion.
| * | | | refs: bring conditional symbolic updates to the frontendCarlos Martín Nieto2014-02-051-5/+18
| | | | | | | | | | | | | | | | | | | | Bring the race detection goodness to symbolic references as well.
| * | | | refdb: add conditional symbolic updatesCarlos Martín Nieto2014-02-054-24/+26
| | | | | | | | | | | | | | | | | | | | | | | | | Add a parameter to the backend to allow checking for the old symbolic target.
| * | | | refs: fix leak on successful updateCarlos Martín Nieto2014-02-051-7/+7
| | | | | | | | | | | | | | | | | | | | Free the old ref even on success.
| * | | | refs: return GIT_EMODIFIED if the ref target movedCarlos Martín Nieto2014-02-051-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | | In case we loose the race to update the reference, return GIT_EMODIFIED to let the user distinguish it from other types of errors.
| * | | | refs: changes from feedbackCarlos Martín Nieto2014-02-051-27/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change the name to _matching() intead of _if(), and force _set_target() to be a conditional update. If the user doesn't care about the old value, they should use git_reference_create().
| * | | | refs: conditional ref updatesCarlos Martín Nieto2014-02-054-20/+74
| | | | | | | | | | | | | | | | | | | | Allow updating references if the old value matches the given one.
* | | | | Fix some Windows warningsRussell Belfer2014-02-074-20/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-pqueueVicent Marti2014-02-0712-247/+173
|\ \ \ \ \ | | | | | | | | | | | | Replace priority queue code with implementation from hashsig
| * | | | | Avoid extra copying in pqueue operationsRussell Belfer2014-02-042-20/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This tweaks the pqueue_up and pqueue_down routines so that they will not do full element swaps but instead carry over the state of the previous loop iteration and only assign elements for which we know the final position. This will avoid a little bit of data assignment which should improve performance in theory. Also got rid of some vector helpers that I'm no longer using.
View Lorry Controller Status