Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | remote: accept a repository and remote name for deletioncmn/remote-delete-name | Carlos Martín Nieto | 2014-09-30 | 4 | -39/+14 |
| | | | | | | | | We don't need the remote loaded, and the function extracted both of these from the git_remote in order to do its work, so let's remote a step and not ask for the loaded remote at all. This fixes #2390. | ||||
* | the wiki, it is dead | Brendan Forster | 2014-09-30 | 1 | -2/+1 |
| | |||||
* | Merge pull request #2581 from jacquesg/stash-ignored-directories | Edward Thomson | 2014-09-29 | 2 | -3/+22 |
|\ | | | | | Stash ignored directories | ||||
| * | Recurse ignored directories when stashing | Jacques Germishuys | 2014-09-26 | 1 | -3/+5 |
| | | |||||
| * | Added test for stashing files in ignored directories | Jacques Germishuys | 2014-09-24 | 1 | -0/+17 |
| | | |||||
* | | Merge pull request #2584 from jacquesg/pool-alignment | Edward Thomson | 2014-09-29 | 8 | -29/+43 |
|\ \ | | | | | | | Pool/Index data is not aligned | ||||
| * | | Silence unused return value warning | Jacques Germishuys | 2014-09-26 | 1 | -1/+1 |
| | | | |||||
| * | | Ensure patch is initialized to zero, otherwise, the allocated flag may be set | Jacques Germishuys | 2014-09-26 | 1 | -0/+1 |
| | | | |||||
| * | | Silence uninitialized warning | Jacques Germishuys | 2014-09-26 | 1 | -1/+1 |
| | | | |||||
| * | | Fixed odb foreach test failure for big-endian 64-bit | Jakub Čajka | 2014-09-26 | 1 | -1/+1 |
| | | | |||||
| * | | Fixed merge REUC test for big-endian 64-bit | Jakub Čajka | 2014-09-26 | 1 | -1/+1 |
| | | | |||||
| * | | The raw index buffer content is not guaranteed to be aligned | Jacques Germishuys | 2014-09-26 | 1 | -24/+29 |
| | | | | | | | | | | | | * Ensure alignment by copying the content into a structure on the stack | ||||
| * | | Ensure pool data is aligned on an 8 byte boundary | Jacques Germishuys | 2014-09-25 | 1 | -1/+1 |
| | | | |||||
| * | | Introduce GIT_ALIGN | Jacques Germishuys | 2014-09-25 | 1 | -0/+8 |
| |/ | |||||
* | | Merge pull request #2582 from swansontec/master | Edward Thomson | 2014-09-29 | 1 | -1/+1 |
|\ \ | | | | | | | Correctly handle getaddrinfo return result | ||||
| * | | Correctly handle getaddrinfo return result | William Swanson | 2014-09-24 | 1 | -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-error | Edward Thomson | 2014-09-29 | 2 | -0/+17 |
|\ \ | | | | | | | global: free the error message when exiting a thread | ||||
| * | | global: free the error message when exiting a threadcmn/free-tls-error | Carlos Martín Nieto | 2014-09-14 | 2 | -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-var | Carlos Martín Nieto | 2014-09-25 | 0 | -0/+0 |
|\ \ \ | |_|/ |/| | | Remove unused buf variable from path/core test. | ||||
| * | | Remove unused buf variable from path/core test. | Ciro Santilli | 2014-09-16 | 1 | -2/+0 |
| | | | |||||
* | | | Add a note about cert check in the CHANGELOG | Carlos Martín Nieto | 2014-09-24 | 1 | -0/+4 |
| | | | |||||
* | | | Merge pull request #2567 from cirosantilli/factor-41 | Vicent Marti | 2014-09-17 | 12 | -24/+25 |
|\ \ \ | | | | | | | | | Factor 40 and 41 constants from source. | ||||
| * | | | Factor 40 and 41 constants from source. | Ciro Santilli | 2014-09-16 | 12 | -24/+25 |
| |/ / | |||||
* | | | travis: another attempt at multiple allowed failures | Carlos Martín Nieto | 2014-09-17 | 1 | -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-path | Vicent Marti | 2014-09-17 | 9 | -41/+86 |
|\ \ \ | | | | | | | | | Fix `git_path_walk_up` to work with non-rooted paths | ||||
| * | | | repository: Do not double-free configvmg/walk-up-path | The rugged tests are fragile | 2014-09-17 | 1 | -8/+8 |
| | | | | |||||
| * | | | Style | The rugged tests are fragile | 2014-09-17 | 1 | -3/+2 |
| | | | | |||||
| * | | | attr: Do not walk path if we're at the root | The rugged tests are fragile | 2014-09-17 | 1 | -5/+8 |
| | | | | |||||
| * | | | attr: Add an extra test for files under a subfolder | The rugged tests are fragile | 2014-09-17 | 1 | -0/+7 |
| | | | | |||||
| * | | | path: Fix `git_path_walk_up` to work with non-rooted paths | The rugged tests are fragile | 2014-09-17 | 7 | -28/+64 |
| | | | | |||||
* | | | | travis: fix allowed failures list | Carlos Martín Nieto | 2014-09-17 | 1 | -2/+2 |
| | | | | |||||
* | | | | Merge pull request #2572 from cirosantilli/factor-void | Vicent Marti | 2014-09-17 | 2 | -4/+4 |
|\ \ \ \ | |/ / / |/| | | | Replace void casts with GIT_UNUSED. | ||||
| * | | | Replace void casts with GIT_UNUSED. | Ciro Santilli | 2014-09-17 | 2 | -4/+4 |
| |/ / | |||||
* | | | Merge pull request #2464 from libgit2/cmn/host-cert-info | Vicent Marti | 2014-09-17 | 17 | -91/+422 |
|\ \ \ | | | | | | | | | Provide a callback for certificate validation | ||||
| * | | | ssh: skip the localhost cert check earliercmn/host-cert-info | Carlos Martín Nieto | 2014-09-16 | 1 | -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 flag | Carlos Martín Nieto | 2014-09-16 | 1 | -7/+0 |
| | | | | | | | | | | | | | | | | This brings us back in line with the other transports. | ||||
| * | | | ssh: expose both hashes | Carlos Martín Nieto | 2014-09-16 | 3 | -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 lengths | Carlos Martín Nieto | 2014-09-16 | 3 | -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 Travis | Carlos Martín Nieto | 2014-09-16 | 1 | -1/+1 |
| | | | | |||||
| * | | | net: use only structs to pass information about cert | Carlos Martín Nieto | 2014-09-16 | 6 | -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-info | Carlos Martín Nieto | 2014-09-16 | 39 | -159/+796 |
| |\ \ \ | |||||
| * | | | | ssh: add test for host key | Carlos Martín Nieto | 2014-09-16 | 2 | -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 certificates | Carlos Martín Nieto | 2014-09-16 | 7 | -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.h | Carlos Martín Nieto | 2014-09-16 | 2 | -17/+16 |
| | | | | | | | | | | | | | | | | | | | | This should make the mingw compiler happy. | ||||
| * | | | | winhttp: set ignore security flags on user command | Carlos Martín Nieto | 2014-09-16 | 1 | -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 sending | Carlos Martín Nieto | 2014-09-16 | 1 | -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. | ||||
| * | | | | winhttp: only do certificate check for SSL | Carlos Martín Nieto | 2014-09-16 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | If we're not using SSL, don't call the user's certificate check callback. | ||||
| * | | | | winhttp: credential check on successful connect | Carlos Martín Nieto | 2014-09-16 | 2 | -2/+45 |
| | | | | | | | | | | | | | | | | | | | | On successful connection, still ask the user whether they accept the server's certificate, indicating that WinHTTP would let it though. | ||||
| * | | | | Bring certificate check back to the normal return code | Carlos Martín Nieto | 2014-09-16 | 3 | -22/+19 |
| | | | | | | | | | | | | | | | | | | | | | | | | | Returning 0 lets the certificate check succeed. An error code is bubbled up to the user. | ||||
| * | | | | ssh: do ssh cert info before asking for credentials | Carlos Martín Nieto | 2014-09-16 | 2 | -47/+47 |
| | | | | | | | | | | | | | | | | | | | | | | | | | We know the host's key as soon as we connect, so we should perform the check as soon as we can, before we bother with the user's credentials. |