summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* add precompose testprecompose-testJosh Vera2014-04-231-0/+43
|
* Merge branch 'development'Vicent Marti2013-11-202418-35837/+56412
|\
| * libgit2 0.20.0 "anmeldung"v0.20.0Vicent Marti2013-11-201-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Apologies for the delay. This release is chunky, but you're probably used to chunky releases by now. Full changelog follows: Internal changes + Added support for decomposed Unicode paths in Mac OS X + Added support for junctions in win32 + Fixed issues with HTTP redirects in the network stack + Performance improvements (as always) git2/blame.h + added full support for blame operations git2/blob.h + added `git_blob_filtered_content` to load blobs in memory with their corresponding filters applied git2/branch.h + added branch iterators as an alternative to the callback-based API git2/buffer.h + exported the git_buf struct to allow binary buffers to be passed from/to the library. This simplifies several APIs git2/checkout.h + implemented additional checkout options ('skip unmerged', 'use ours' and 'use theirs') git2/clone.h + simplified the clone API + added new `git_clone_into` to clone into an existing (empty) repository git2/commit.h + added APIs to access the raw (uncleaned) text of a commit message git2/common.h + added global options to set the default paths to load templates from git2/config.h + added multivar iterators + added globbing iterator + added `git_config_foreach_match` to perform operations on every single var in a config file git2/diff.h + restructured and simplified the diff API git2/filter.h + added external APIs to configure and apply custom filters to checked out blobs git2/index.h + `git_index_read` can now force a reload of the index file even if it hasn't changed on-disk git2/indexer.h + improved the streaming indexer APIs git2/merge.h + added support for merge! git2/object.h + added helper API to lookup a generic object by path git2/pack.h + added progress callbacks to the packbuilder git2/patch.h + added support for patch generation as part of the Diff API revamp git2/pathspec.h + added helper APIs to work with pathspecs and match files in the workdir or diffs git2/push.h + added progress callbacks to push git2/reflog.h + changed reflog APIs to work on reference names instead of the references themselves, so they become less racy git2/remote.h + added support for setting refspecs on remotes, either at creation or on existing ones + simplified the remotes API git2/revwalk.h + add API to simplify parents during a walk git2/signature.h + add helper to create a signature with the default values for a repository (i.e. the set `user.name` and `user.email` values, and the current time) git2/submodules.h + improve the status detection for submodules git2/sys/ + exported many new internal APIs, such as pluggabe transport APIs -vmg, out
| * Formatting fix for cred_acquire_cbCarlos Martín Nieto2013-11-201-6/+6
| |
| * Merge pull request #1966 from nickh/patch_content_offsetsVicent Martí2013-11-193-4/+20
| |\ | | | | | | Add content offset to git_diff_line
| | * Add content offset to git_diff_lineNick Hengeveld2013-11-183-4/+20
| | | | | | | | | | | | | | | | | | For additions and deletions, external consumers like subversion can make use of the content offset to generate diffs in their proprietary formats.
| * | Merge pull request #1970 from ghedo/netbsd_qsortVicent Martí2013-11-191-1/+2
| |\ \ | | | | | | | | util: NetBSD doesn't have qsort_r either
| | * | util: NetBSD doesn't have qsort_r eitherAlessandro Ghedini2013-11-191-1/+2
| |/ /
| * | Merge pull request #1969 from libgit2/ntk/fix/drop_commentVicent Martí2013-11-191-1/+0
| |\ \ | | | | | | | | Cleaning up
| | * | tests: Drop unrelated commentnulltoken2013-11-191-1/+0
| |/ /
| * | Merge pull request #1968 from libgit2/ntk/fix/bad_indexVicent Martí2013-11-194-7/+27
| |\ \ | | | | | | | | Corrupted index is bad for your health
| | * | index: Free the index on git_index_open() failurenulltoken2013-11-191-1/+7
| | | |
| | * | tree-cache: Fix error message typonulltoken2013-11-191-2/+2
| | | |
| | * | tree-cache: Don't segfault upon corruptionnulltoken2013-11-193-3/+15
| | | |
| | * | tree-cache: Zero out the allocated tree children arraynulltoken2013-11-191-0/+2
| | | |
| | * | tree-cache: Free the tree upon the detection of a corrupted childnulltoken2013-11-191-1/+1
| | |/
| * | Merge pull request #1967 from victorgp/cleaning-code-minor-changeVicent Martí2013-11-191-4/+0
| |\ \ | | |/ | |/| Cleaning code, removing unused variables
| | * cleaning code, removing unused variablesVictor Garcia2013-11-191-4/+0
| | |
| * | netops: fix leakCarlos Martín Nieto2013-11-181-2/+5
| | |
| * | Fix warningsRussell Belfer2013-11-183-5/+7
| | |
| * | Merge pull request #1960 from ethomson/ntlmVicent Martí2013-11-187-41/+176
| |\ \ | | |/ | |/| NTLM/Negotiate support in WinHTTP
| | * Introduce git_cred_default for NTLM/SPNEGO authEdward Thomson2013-11-184-4/+87
| | |
| | * Propagate auth error codes as GIT_EUSER in winhttpEdward Thomson2013-11-184-37/+89
| |/
| * Merge pull request #1963 from libgit2/ntk/fix/mailmapVicent Martí2013-11-151-0/+3
| |\ | | | | | | Add missing mappings to .mailmap file
| | * Add missing mappings to .mailmap filenulltoken2013-11-151-0/+3
| |/
| * Merge pull request #1962 from libgit2/rename-testsVicent Martí2013-11-142067-12/+12
| |\ | | | | | | Rename tests directory
| | * Update files that reference tests-clarBen Straub2013-11-147-12/+12
| | |
| | * Rename tests-clar to testsBen Straub2013-11-142062-0/+0
| |/
| * Merge pull request #1951 from victorgp/create-remote-plus-fetchVicent Martí2013-11-143-1/+60
| |\ | | | | | | Allowing create remotes with custom fetch spec
| | * fixing typoVictor Garcia2013-11-081-1/+1
| | |
| | * splitting funcionality in two methods to avoid ambiguity with NULLVictor Garcia2013-11-0810-25/+68
| | |
| | * adding doc for new param and test to check fetch spec is correctly addedVictor Garcia2013-11-072-2/+14
| | |
| | * allowing create remote with custom fetch specVictor Garcia2013-11-0710-21/+25
| | |
| * | Fix warningsRussell Belfer2013-11-134-5/+8
| | |
| * | tests: make a few globals staticsCarlos Martín Nieto2013-11-132-3/+3
| | | | | | | | | | | | ld was warning that the size of path changed, rightly so.
| * | Merge pull request #1958 from libgit2/blame-fixesVicent Martí2013-11-133-10/+50
| |\ \ | | | | | | | | Blame fixes
| | * | Minor cleanupblame-fixesBen Straub2013-11-121-3/+2
| | | |
| | * | Don't leak memory when duplicating a NULL signatureBen Straub2013-11-122-5/+7
| | | |
| | * | Fix buffer blame with new lines at end of fileBen Straub2013-11-122-11/+9
| | | |
| | * | Duplicate all fields of a blame hunkBen Straub2013-11-121-0/+5
| | | |
| | * | Add some failing blame test casesBen Straub2013-11-121-0/+36
| |/ /
| * | Merge pull request #1957 from linquize/warning3Vicent Martí2013-11-124-4/+4
| |\ \ | | | | | | | | Fix warnings
| | * | Fix warningsLinquize2013-11-124-4/+4
| |/ /
| * | Merge pull request #1956 from libgit2/cmn/fetch-default-headVicent Martí2013-11-1120-287/+433
| |\ \ | | | | | | | | Remote revamp (director's cut)
| | * | remote: update head list on pushCarlos Martín Nieto2013-11-113-11/+27
| | | | | | | | | | | | | | | | | | | | A previous commit forgot to update the head list after push as well, leading to wrong output of git_remote_ls().
| | * | tests: update push testsCarlos Martín Nieto2013-11-113-19/+23
| | | | | | | | | | | | | | | | These tests were forgotten when modifying git_remote_ls().
| | * | remote: let's at least pretend to have some memory safetyCarlos Martín Nieto2013-11-111-3/+27
| | | | | | | | | | | | | | | | | | | | | | | | Copy the pointers into temporary vectors instead of assigning them tot he same array so we don't mess up with someone else's memory by accident (e.g. by sorting).
| | * | remote: fix a couple of leaksCarlos Martín Nieto2013-11-112-7/+4
| | | |
| | * | remote: make _ls return the list directlyCarlos Martín Nieto2013-11-1116-163/+140
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The callback-based method of listing remote references dates back to the beginning of the network code's lifetime, when we didn't know any better. We need to keep the list around for update_tips() after disconnect() so let's make use of this to simply give the user a pointer to the array so they can write straightforward code instead of having to go through a callback.
| | * | remote: don't allow such direct access to the refspecsCarlos Martín Nieto2013-11-103-34/+95
| | | | | | | | | | | | | | | | | | | | | | | | Removing arbitrary refspecs makes things more complex to reason about. Instead, let the user set the fetch and push refspec list to whatever they want it to be.