summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #3215 from jeffhostetler/windows_leak_diriterCarlos Martín Nieto2015-06-121-0/+2
|\ | | | | Fix memory leak on windows in diriter.
| * Fix memory leak on windows in diriter.Jeff Hostetler2015-06-121-0/+2
| |
* | Merge pull request #3208 from git-up/secure_transportCarlos Martín Nieto2015-06-121-20/+36
|\ \ | | | | | | Fixed some Secure Transport issues on OS X
| * | Fixed some Secure Transport issues on OS XPierre-Olivier Latour2015-06-111-20/+36
| | | | | | | | | | | | | | | | | | | | | | | | | | | The read and write callbacks passed to SSLSetIOFuncs() have been rewritten to match the implementation used on opensource.apple.com and other open source projects like VLC. This change also fixes a bug where the read callback could get into an infinite loop when 0 bytes were read.
* | | Merge pull request #3214 from libgit2/cmn/push-testsCarlos Martín Nieto2015-06-123-5/+10
|\ \ \ | |/ / |/| | travis: fail if we fail the push tests
| * | clone: set the credentials callback during testingcmn/push-testsCarlos Martín Nieto2015-06-121-0/+1
| | |
| * | push: pass the callbacks during setup as wellCarlos Martín Nieto2015-06-121-3/+7
| | | | | | | | | | | | | | | We need to pass these options in order to have the credentials callback set.
| * | travis: fail if we fail the push testsCarlos Martín Nieto2015-06-121-2/+2
|/ / | | | | | | | | | | These tests were not being taken into consideration for the failure of the test. They've been failing for a while now, but we hadn't noticed as Travis was reporting the builds successful.
* | Merge pull request #3155 from mgorny/userpass-constCarlos Martín Nieto2015-06-111-2/+2
|\ \ | | | | | | cred_helpers: Add 'const' qualifiers to git_cred_userpass_payload
| * | cred_helpers: Add 'const' qualifiers to git_cred_userpass_payloadMichał Górny2015-05-241-2/+2
| | | | | | | | | | | | | | | | | | Make both username & password in git_cred_userpass_payload 'const'. The values are not altered anywhere, and the extra qualifier allows clients to assign 'const' values there.
* | | Merge pull request #3205 from ethomson/crlf_queryCarlos Martín Nieto2015-06-114-1/+133
|\ \ \ | | | | | | | | Introduce `git_filter_list_contains`
| * | | Introduce `git_filter_list_contains`Edward Thomson2015-06-104-1/+133
| | | | | | | | | | | | | | | | | | | | `git_filter_list_contains` can be used to query a filter list to determine if a given filter will be run.
* | | | Merge pull request #3207 from ethomson/winhttp_eolCarlos Martín Nieto2015-06-111-29/+29
|\ \ \ \ | | | | | | | | | | Correct line endings on winhttp.def
| * | | | Correct line endings on winhttp.defEdward Thomson2015-06-101-29/+29
| | | | |
* | | | | Merge pull request #3174 from libgit2/cmn/idx-fill-holeEdward Thomson2015-06-101-3/+4
|\ \ \ \ \ | | | | | | | | | | | | indexer: use lseek to extend the packfile
| * | | | | indexer: use lseek to extend the packfilecmn/idx-fill-holeCarlos Martín Nieto2015-06-021-3/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We've been using `p_ftruncate()` to extend the packfile in order to mmap it and write the new data into it. This works well in the general case, but as truncation does not allocate space in the filesystem, it must do so when we write data to it. The only way the OS has to indicate a failure to allocate space is via SIGBUS which means we tried to write outside the file. This will cause everyone to crash as they don't expect to handle this signal. Switch to using `p_lseek()` and `p_write()` to extend the file in a way which tells the filesystem to allocate the space for the missing data. We can then be sure that we have space to write into.
* | | | | | Merge pull request #3204 from git-up/git_diff_find_similarEdward Thomson2015-06-101-4/+4
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | Fixed handling of GIT_DELTA_CONFLICTED in git_diff_find_similar()
| * | | | | Fixed handling of GIT_DELTA_CONFLICTED in git_diff_find_similar()Pierre-Olivier Latour2015-06-101-4/+4
| | |/ / / | |/| | | | | | | | | | | | | | | | | | git_diff_find_similar() now ignores git_diff_delta records with a status of GIT_DELTA_CONFLICTED, which fixes a crash due to assert() being hit.
* | | | | Merge pull request #3203 from ethomson/gitattributesCarlos Martín Nieto2015-06-101-2/+1
|\ \ \ \ \ | |/ / / / |/| | | | gitattributes: let clients use native line endings
| * | | | gitattributes: let clients use native line endingsEdward Thomson2015-06-101-2/+1
|/ / / / | | | | | | | | | | | | | | | | Use "text=auto" to ensure that we get LFs in the repository, but let clients have their native line endings in their worktree.
* | | | Merge pull request #3201 from libgit2/cmn/coverityEdward Thomson2015-06-104-19/+21
|\ \ \ \ | | | | | | | | | | A few more fixes from coverity
| * | | | filter: close the descriptor in case of errorcmn/coverityCarlos Martín Nieto2015-06-101-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When we hit an error writing to the next stream from a file, we jump to 'done' which currently skips over closing the file descriptor. Make sure to close the descriptor if it has been set to a valid value.
| * | | | object: correct the expected ID size in prefix lookupCarlos Martín Nieto2015-06-101-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We take in a possibly partial ID by taking a length and working off of that to figure out whether to just look up the object or ask the backends for a prefix lookup. Unfortunately we've been checking the size against `GIT_OID_HEXSZ` which is the size of a *string* containing a full ID, whereas we need to check against the size we can have when it's a 20-byte array. Change the checks and comment to use `GIT_OID_RAWSZ` which is the correct size of a git_oid to have when full.
| * | | | pack: use git_buf when building the index nameCarlos Martín Nieto2015-06-101-10/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The way we currently do it depends on the subtlety of strlen vs sizeof and the fact that .pack is one longer than .idx. Let's use a git_buf so we can express the manipulation we want much more clearly.
| * | | | merge: actually increment the counts, not the pointersCarlos Martín Nieto2015-06-101-2/+2
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | `merge_diff_list_count_candidates()` takes pointers to the source and target counts, but when it comes time to increase them, we're increasing the pointer, rather than the value it's pointing to. Dereference the value to increase.
* | | | cache: add a check for a failed allocationCarlos Martín Nieto2015-06-101-0/+1
| | | | | | | | | | | | | | | | Rather minimal change, but it's the kind of thing we should do.
* | | | Merge pull request #3198 from libgit2/cmn/coverityEdward Thomson2015-06-095-10/+11
|\ \ \ \ | |_|_|/ |/| | | A few fixes from Coverity
| * | | Initialize a few variablesCarlos Martín Nieto2015-06-093-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | Coverity complains about the git_rawobj ones because we use a loop in which we keep remembering the old version, and we end up copying our object as the base, so we want to have the data pointer be NULL.
| * | | ssh: move NULL check to the free functionCarlos Martín Nieto2015-06-091-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Let `ssh_stream_free()` take a NULL stream, as free functions should, and remove the check from the connection setup. The connection setup would not need the check anyhow, as we always have a stream by the time we reach this code.
| * | | remote: some error-handling issues from CoverityCarlos Martín Nieto2015-06-071-2/+3
| | | |
* | | | Merge pull request #3165 from ethomson/downcaseCarlos Martín Nieto2015-06-088-24/+75
|\ \ \ \ | | | | | | | | | | Downcase
| * | | | git__tolower: test that some non-ASCII downcasing isn'tEdward Thomson2015-05-291-0/+4
| | | | |
| * | | | git__tolower: a tolower() that isn't dumbEdward Thomson2015-05-297-24/+33
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Some brain damaged tolower() implementations appear to want to take the locale into account, and this may require taking some insanely aggressive lock on the locale and slowing down what should be the most trivial of trivial calls for people who just want to downcase ASCII.
| * | | | git__strcasecmp: treat input bytes as unsignedEdward Thomson2015-05-292-2/+40
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Treat input bytes as unsigned before doing arithmetic on them, lest we look at some non-ASCII byte (like a UTF-8 character) as a negative value and perform the comparison incorrectly.
* | | | | Merge pull request #3188 from thentenaar/clean-up-after-opensslCarlos Martín Nieto2015-06-081-0/+16
|\ \ \ \ \ | | | | | | | | | | | | global: Ensure we free our SSL context.
| * | | | | global: Ensure we free our SSL context.Tim Hentenaar2015-06-081-0/+16
|/ / / / /
* | | | | Merge pull request #3185 from libgit2/cmn/foreach-cancel-looseCarlos Martín Nieto2015-06-072-2/+24
|\ \ \ \ \ | | | | | | | | | | | | path: error out if the callback returns an error
| * | | | | path: error out if the callback returns an errorcmn/foreach-cancel-looseCarlos Martín Nieto2015-06-062-2/+24
| | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | When the callback returns an error, we should stop immediately. This broke when trying to make sure we pass specific errors up the chain. This broke cancelling out of the loose backend's foreach.
* | | | | Merge pull request #3175 from git-up/build_warningsCarlos Martín Nieto2015-06-078-10/+21
|\ \ \ \ \ | | | | | | | | | | | | Fixed build warnings on Xcode 6.1
| * | | | | Fixed build warnings on Xcode 6.1Pierre-Olivier Latour2015-06-028-10/+21
| | |_|/ / | |/| | |
* | | | | Merge pull request #3179 from arielb2/masterCarlos Martín Nieto2015-06-071-0/+2
|\ \ \ \ \ | |_|/ / / |/| | | | print_usage functions is defined but not used
| * | | | print_usage functions is defined but not usedAriel O. Barria2015-06-031-0/+2
| |/ / / | | | | | | | | | | | | | | | | | | | | Use the previously created function to display a message when the arguments are not valid. ticket 3095
* | | | Merge pull request #3172 from Therzok/patch-2Carlos Martín Nieto2015-06-041-1/+7
|\ \ \ \ | |/ / / |/| | | Change error when running out of ssh agent keys
| * | | Change error when running out of ssh agent keysMarius Ungureanu2015-06-021-1/+7
|/ / /
* | | Include git2/transaction.hCarlos Martín Nieto2015-05-311-0/+1
| | | | | | | | | | | | This was forgotten when the feature was implemented.
* | | Merge pull request #3152 from tkelman/patch-1Carlos Martín Nieto2015-05-311-0/+1
|\ \ \ | | | | | | | | build maint branches on appveyor
| * | | build maint branches on appveyorTony Kelman2015-05-221-0/+1
| | |/ | |/| | | | equivalent of ca183d27366ba75597a9806b746e42a074df7795
* | | Merge pull request #3048 from pks-t/insteadofCarlos Martín Nieto2015-05-315-5/+164
|\ \ \ | | | | | | | | Implementation of url.*.insteadOf
| * | | remote: test insteadOf for anonymous remotesPatrick Steinhardt2015-05-311-0/+12
| | | |
| * | | Add CHANGELOG entry for url.*.insteadOf feature.Patrick Steinhardt2015-05-311-0/+4
| | | |