summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* revwalk: clear first-parent flag on resetcmn/revwalk-merge-baseCarlos Martín Nieto2014-10-081-0/+1
| | | | | This should have been included when implementing the feature but was missed.
* revwalk: catch no-push and no-hide casesCarlos Martín Nieto2014-10-082-11/+17
| | | | | | | If there have been no pushes, we can immediately return ITEROVER. If there have been no hides, we must not run the uninteresting pre-mark phase, as we do not want to hide anything and this would simply cause us to spend time loading objects.
* revwalk: mark uninteresting only up to the common ancestorsCarlos Martín Nieto2014-10-081-1/+73
| | | | | | | | | | | | | | | | | | | | This introduces a phase at the start of preparing a walk which pre-marks uninteresting commits, but only up to the common ancestors. We do this in a similar way to git, by walking down the history and marking (which is what we used to do), but we keep a time-sorted priority queue of commits and stop marking as soon as there are only uninteresting commits in this queue. This is a similar rule to the one used to find the merge-base. As we keep inserting commits regardless of the uninteresting bit, if there are only uninteresting commits in the queue, it means we've run out of interesting commits in our walk, so we can stop. The old mark_unintesting() logic is still in place, but that stops walking if it finds an already-uninteresting commit, so it will stop on the ones we've pre-marked; but keeping it allows us to also hide those that are hidden via the callback.
* revwalk: keep a single list of user inputsCarlos Martín Nieto2014-10-082-27/+22
| | | | | The old separation was due to the old merge-base finding, so it's no longer necessary.
* revwalk: clear the flags on resetCarlos Martín Nieto2014-10-081-0/+1
| | | | These store merge-base information which is only valid for a single run.
* Merge pull request #2594 from libgit2/vmg/hashsigVicent Marti2014-10-016-12/+16
|\ | | | | hashsig: Export as a `sys` header
| * hashsig: Export as a `sys` headervmg/hashsigVicent Marti2014-10-016-12/+16
|/
* Include git2/odb_backend.h in git2.hCarlos Martín Nieto2014-09-301-0/+1
| | | | | | | Since this isn't under sys/ we need to have it included in the main git2.h file. This fixes #2551.
* path: fix invalid accessErdur2014-09-301-1/+4
|
* the wiki, it is deadBrendan Forster2014-09-301-2/+1
|
* Merge pull request #2581 from jacquesg/stash-ignored-directoriesEdward Thomson2014-09-292-3/+22
|\ | | | | Stash ignored directories
| * Recurse ignored directories when stashingJacques Germishuys2014-09-261-3/+5
| |
| * Added test for stashing files in ignored directoriesJacques Germishuys2014-09-241-0/+17
| |
* | Merge pull request #2584 from jacquesg/pool-alignmentEdward Thomson2014-09-298-29/+43
|\ \ | | | | | | Pool/Index data is not aligned
| * | Silence unused return value warningJacques Germishuys2014-09-261-1/+1
| | |
| * | Ensure patch is initialized to zero, otherwise, the allocated flag may be setJacques Germishuys2014-09-261-0/+1
| | |
| * | Silence uninitialized warningJacques Germishuys2014-09-261-1/+1
| | |
| * | Fixed odb foreach test failure for big-endian 64-bitJakub Čajka2014-09-261-1/+1
| | |
| * | Fixed merge REUC test for big-endian 64-bitJakub Čajka2014-09-261-1/+1
| | |
| * | The raw index buffer content is not guaranteed to be alignedJacques Germishuys2014-09-261-24/+29
| | | | | | | | | | | | * Ensure alignment by copying the content into a structure on the stack
| * | Ensure pool data is aligned on an 8 byte boundaryJacques Germishuys2014-09-251-1/+1
| | |
| * | Introduce GIT_ALIGNJacques Germishuys2014-09-251-0/+8
| |/
* | Merge pull request #2582 from swansontec/masterEdward Thomson2014-09-291-1/+1
|\ \ | | | | | | Correctly handle getaddrinfo return result
| * | Correctly handle getaddrinfo return resultWilliam Swanson2014-09-241-1/+1
| |/ | | | | | | | | | | The getaddrinfo function indicates failure with a non-zero return code, but this code is not necessarily negative. On platforms like Android where the code is positive, a failed call causes libgit2 to segfault.
* | Merge pull request #2559 from libgit2/cmn/free-tls-errorEdward Thomson2014-09-292-0/+17
|\ \ | | | | | | global: free the error message when exiting a thread
| * | global: free the error message when exiting a threadcmn/free-tls-errorCarlos Martín Nieto2014-09-142-0/+17
| | | | | | | | | | | | | | | When we free the global state at thread termination, we must also free the error message in order not to leak the string once per thread.
* | | Merge pull request #2570 from cirosantilli/rm-unused-varCarlos Martín Nieto2014-09-250-0/+0
|\ \ \ | |_|/ |/| | Remove unused buf variable from path/core test.
| * | Remove unused buf variable from path/core test.Ciro Santilli2014-09-161-2/+0
| | |
* | | Add a note about cert check in the CHANGELOGCarlos Martín Nieto2014-09-241-0/+4
| | |
* | | Merge pull request #2567 from cirosantilli/factor-41Vicent Marti2014-09-1712-24/+25
|\ \ \ | | | | | | | | Factor 40 and 41 constants from source.
| * | | Factor 40 and 41 constants from source.Ciro Santilli2014-09-1612-24/+25
| |/ /
* | | travis: another attempt at multiple allowed failuresCarlos Martín Nieto2014-09-171-3/+2
| | | | | | | | | | | | | | | It looks like what Travis wants is a list of hashes, rather than a hash with a list.
* | | Merge pull request #2571 from libgit2/vmg/walk-up-pathVicent Marti2014-09-179-41/+86
|\ \ \ | | | | | | | | Fix `git_path_walk_up` to work with non-rooted paths
| * | | repository: Do not double-free configvmg/walk-up-pathThe rugged tests are fragile2014-09-171-8/+8
| | | |
| * | | StyleThe rugged tests are fragile2014-09-171-3/+2
| | | |
| * | | attr: Do not walk path if we're at the rootThe rugged tests are fragile2014-09-171-5/+8
| | | |
| * | | attr: Add an extra test for files under a subfolderThe rugged tests are fragile2014-09-171-0/+7
| | | |
| * | | path: Fix `git_path_walk_up` to work with non-rooted pathsThe rugged tests are fragile2014-09-177-28/+64
| | | |
* | | | travis: fix allowed failures listCarlos Martín Nieto2014-09-171-2/+2
| | | |
* | | | Merge pull request #2572 from cirosantilli/factor-voidVicent Marti2014-09-172-4/+4
|\ \ \ \ | |/ / / |/| | | Replace void casts with GIT_UNUSED.
| * | | Replace void casts with GIT_UNUSED.Ciro Santilli2014-09-172-4/+4
| |/ /
* | | Merge pull request #2464 from libgit2/cmn/host-cert-infoVicent Marti2014-09-1717-91/+422
|\ \ \ | | | | | | | | Provide a callback for certificate validation
| * | | ssh: skip the localhost cert check earliercmn/host-cert-infoCarlos Martín Nieto2014-09-161-2/+4
| | | | | | | | | | | | | | | | | | | | Skip it before we attempt to clone, as we would exit with -1 on systems which do not have sshd running.
| * | | winhttp: get rid of the cert ignore flagCarlos Martín Nieto2014-09-161-7/+0
| | | | | | | | | | | | | | | | This brings us back in line with the other transports.
| * | | ssh: expose both hashesCarlos Martín Nieto2014-09-163-22/+38
| | | | | | | | | | | | | | | | | | | | The user may have the data hashed as MD5 or SHA-1, so we should provide both types for consumption.
| * | | ssh: provide our own types for host key lengthsCarlos Martín Nieto2014-09-163-11/+21
| | | | | | | | | | | | | | | | | | | | Instead of using the libssh2 defines, provide our own, which eases usage as we do not need to check whether libgit2 was built with libssh2 or not.
| * | | script: use a parallel build on TravisCarlos Martín Nieto2014-09-161-1/+1
| | | |
| * | | net: use only structs to pass information about certCarlos Martín Nieto2014-09-166-19/+56
| | | | | | | | | | | | | | | | | | | | | | | | Instead of spreading the data in function arguments, some of which aren't used for ssh and having a struct only for ssh, use a struct for both, using a common parent to pass to the callback.
| * | | Merge remote-tracking branch 'upstream/master' into cmn/host-cert-infoCarlos Martín Nieto2014-09-1639-159/+796
| |\ \ \
| * | | | ssh: add test for host keyCarlos Martín Nieto2014-09-162-1/+36
| | | | | | | | | | | | | | | | | | | | | | | | | Test that the certificate check callback gets the right fingerprint from the host we're connecting to.
View Lorry Controller Status