summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* remote: implement opportunistic remote-tracking branch updatescmn/remote-fetch-refsCarlos Martín Nieto2014-09-304-0/+124
| | | | | | | | | | | When a list of refspecs is passed to fetch (what git would consider refspec passed on the command-line), we not only need to perform the updates described in that refspec, but also update the remote-tracking branch of the fetched remote heads according to the remote's configured refspecs. These "fetches" are not however to be written to FETCH_HEAD as they would be duplicate data, and it's not what the user asked for.
* remote: store passive refspecsCarlos Martín Nieto2014-09-302-1/+10
| | | | | | The configured/base fetch refspecs need to be taken into account in order to implement opportunistic remote-tracking branch updates. DWIM them and store them in the struct, but don't do anything with them yet.
* remote: don't DWIM refspecs unnecessarilyCarlos Martín Nieto2014-09-301-19/+3
| | | | | | | We can only DWIM when we've connected to the remote and have the list of the remote's references. Adding or setting the refspecs should not trigger an attempt to DWIM the refspecs as we typically cannot do it, and even if we did, we would not use them for the current fetch.
* remote: use active refspec override in the testsCarlos Martín Nieto2014-09-302-28/+71
| | | | | This lets us test this bit as well as getting closer to what they were trying to do.
* remote: allow overriding the refspecs for download and fetchCarlos Martín Nieto2014-09-3010-29/+64
| | | | | | | With opportunistic ref updates, git has introduced the concept of having base refspecs *and* refspecs that are active for a particular fetch. Let's start by letting the user override the refspecs for download.
* 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.
| * | | | net: remove support for outright ignoring certificatesCarlos Martín Nieto2014-09-167-41/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This option make it easy to ignore anything about the server we're connecting to, which is bad security practice. This was necessary as we didn't use to expose detailed information about the certificate, but now that we do, we should get rid of this. If the user wants to ignore everything, they can still provide a callback which ignores all the information passed.
| * | | | transport: move the cert type enum to types.hCarlos Martín Nieto2014-09-162-17/+16
| | | | | | | | | | | | | | | | | | | | This should make the mingw compiler happy.
| * | | | winhttp: set ignore security flags on user commandCarlos Martín Nieto2014-09-161-6/+42
| | | | | | | | | | | | | | | | | | | | If the user returns 0 from the certificate check and we had certificate issues, set the options to ignore certificate errors and resend the request.
| * | | | winhttp: bring together request sendingCarlos Martín Nieto2014-09-161-32/+44
| | | | | | | | | | | | | | | | | | | | We need to call WinHttpSendRequest() in three different places. Unify all in a single function to have a single place for the certificate check.
View Lorry Controller Status