summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Travis: do non-threadsafe buildscmn/travis-jobsCarlos Martín Nieto2014-11-221-1/+1
| | | | | | When flipping the default to threadsafe, we never made sure that the tests were building non-threadsafe variants. Specify which thead-safety we want for each.
* Travis: move the valgrind run to allowed_failuresCarlos Martín Nieto2014-11-221-1/+3
| | | | | We don't need to know the result of the travis run before determining whether we want to consider the merge as successful.
* Merge pull request #2725 from libgit2/vmg/attr-nullEdward Thomson2014-11-216-19/+23
|\ | | | | Do not assume blob contents are NULL terminated
| * text: Null-terminate a string if we've been gouging itvmg/attr-nullVicent Marti2014-11-211-0/+1
| |
| * notes: Use `git__strndup`Vicent Marti2014-11-211-3/+2
| |
| * blame: Do not assume blob contents are NULL-terminatedVicent Marti2014-11-211-6/+8
| |
| * notes: Do not assume blob contents are NULL-terminatedVicent Marti2014-11-211-3/+3
| |
| * attr_file: Do not assume ODB data is NULL-terminatedVicent Marti2014-11-211-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | That's a bad assumption to make, even though right now it holds (because of the way we've implemented decompression of packfiles), this may change in the future, given that ODB objects can be binary data. Furthermore, the ODB object can return a NULL pointer if the object is empty. Copying the NULL pointer to the strbuf lets us handle it like an empty string. Again, the NULL pointer is valid behavior because you're supposed to check the *size* of the object before working on it.
| * buffer: Do not `put` anything if len is 0Vicent Marti2014-11-212-7/+9
|/
* Merge pull request #2710 from Therzok/shellcheckScriptsEdward Thomson2014-11-212-14/+15
|\ | | | | Run shell scripts through shellcheck
| * Run shell scripts through shellcheckUngureanu Marius2014-11-202-14/+15
| |
* | Merge pull request #2720 from ravindp/masterCarlos Martín Nieto2014-11-211-6/+6
|\ \ | | | | | | Fix for memory leak issue in indexer.c, that surfaces on windows
| * | Fix for memory leak issue in indexer.c, that surfaces on windowsRavindra Patel2014-11-191-6/+6
| | |
* | | Merge pull request #2724 from libgit2/vmg/emptyVicent Marti2014-11-212-2/+20
|\ \ \ | | | | | | | | odb: `git_odb_object` contents are never NULL
| * | | odb: `git_odb_object` contents are never NULLvmg/emptyVicent Marti2014-11-212-2/+20
|/ / / | | | | | | | | | | | | | | | | | | This is a contract that we made in the library and that we need to uphold. The contents of a blob can never be NULL because several parts of the library (including the filter and attributes code) expect `git_blob_rawcontent` to always return a valid pointer.
* | | Merge pull request #2713 from libgit2/jamill/push_fetch_firstVicent Marti2014-11-201-1/+2
|\ \ \ | | | | | | | | Update message for error during push
| * | | Update message for error during pushjamill/push_fetch_firstJameson Miller2014-11-171-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | When attempting to update a reference on a remote during push, and the reference on the remote refers to a commit that does not exist locally, then we should report a more clear error message.
* | | | Merge pull request #2717 from libgit2/cmn/remote-lsVicent Marti2014-11-202-9/+13
|\ \ \ \ | | | | | | | | | | Clarify the git_remote_ls() documentation
| * | | | remote: don't say we free the remote on disconnectcmn/remote-lsCarlos Martín Nieto2014-11-191-2/+1
| | | | | | | | | | | | | | | | | | | | | | | | | On disconnect we simply ask the transport to close the connection, we do not free it.
| * | | | remote: clarify which list of references _ls() returnsCarlos Martín Nieto2014-11-192-7/+12
| | |/ / | |/| | | | | | | | | | | | | | Make it clear that this is not the ls-remote command but a way to access the data we have and how long it's kept around.
* | | | Merge pull request #2719 from libgit2/cmn/fetch-twiceVicent Marti2014-11-202-0/+12
|\ \ \ \ | | | | | | | | | | fetch: clear the connection data on close
| * | | | fetch: clear the connection data on closecmn/fetch-twiceCarlos Martín Nieto2014-11-192-0/+12
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When we fetch twice with the same remote object, we did not properly clear the connection flags, so we would leak state from the last connection. This can cause the second fetch with the same remote object to fail if using a HTTP URL where the server redirects to HTTPS, as the second fetch would see `use_ssl` set and think the initial connection wanted to downgrade the connection.
* | | | Merge pull request #2722 from libgit2/cmn/disable-ssh-checkEdward Thomson2014-11-191-1/+4
|\ \ \ \ | |/ / / |/| | | travis: disable the cert callback on OSX
| * | | travis: disable the cert callback on OSXcmn/disable-ssh-checkCarlos Martín Nieto2014-11-201-1/+4
|/ / / | | | | | | | | | | | | | | | The sshd on OSX has stopped responding to the setting which this test assumes is there, so let's disable it until we can figure out what's happening.
* | | Remove two completed projects from the listCarlos Martín Nieto2014-11-181-3/+0
| | |
* | | Merge pull request #2654 from linquize/missing-objEdward Thomson2014-11-188-3/+5
|\ \ \ | | | | | | | | Fix missing object in tests/resources/crlf by changing the tail commit
| * | | Fix missing object in tests/resources/crlf by changing the tail commitLinquize2014-10-268-3/+5
| | | |
* | | | Merge pull request #2608 from libgit2/cmn/remote-pushEdward Thomson2014-11-185-59/+214
|\ \ \ \ | | | | | | | | | | Provide a convenience function `git_remote_push()`
| * | | | remote: use configured push refspecs if none are givencmn/remote-pushCarlos Martín Nieto2014-11-093-8/+53
| | | | | | | | | | | | | | | | | | | | | | | | | If the user does not pass any refspecs to push, try to use those configured via the configuration or via add_push().
| * | | | push: move main test function to git_remote_push()Carlos Martín Nieto2014-11-093-59/+80
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We have the step-by-step method in the initialization function as we want to remove references based on the list of references which are already there, and we can use the convenience function for testing the main push.
| * | | | remote: introduce git_remote_push()Carlos Martín Nieto2014-11-093-1/+90
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This function, similar in style to git_remote_fetch(), performs all the steps required for a push, with a similar interface. The remote callbacks struct has learnt about the push callbacks, letting us set the callbacks a single time instead of setting some in the remote and some in the push operation.
* | | | | Merge pull request #2671 from swisspol/remote_create_fixEdward Thomson2014-11-172-0/+39
|\ \ \ \ \ | | | | | | | | | | | | Fixed active_refspecs field not initialized on new git_remote objects
| * | | | | Fixed active_refspecs field not initialized on new git_remote objectsPierre-Olivier Latour2014-11-172-0/+39
| | |_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When creating a new remote, contrary to loading one from disk, active_refspecs was not populated. This means that if using the new remote to push, git_push_update_tips() will be a no-op since it checks the refspecs passed during the push against the base ones i.e. active_refspecs. And therefore the local refs won't be created or updated after the push operation.
* | | | | Merge pull request #2693 from libgit2/cmn/push-refspec-refactorEdward Thomson2014-11-177-73/+45
|\ \ \ \ \ | | | | | | | | | | | | push: use the common refspec parser
| * | | | | push: use the common refspec parsercmn/push-refspec-refactorCarlos Martín Nieto2014-11-097-73/+45
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There is one well-known and well-tested parser which we should use, instead of implementing parsing a second time. The common parser is also augmented to copy the LHS into the RHS if the latter is empty. The expressions test had to change a bit, as we now catch a bad RHS of a refspec locally.
* | | | | | Merge pull request #2699 from swisspol/fix_warningsEdward Thomson2014-11-172-1/+4
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | Fixed a couple Clang warnings
| * | | | | Fixed a couple Clang warningsPierre-Olivier Latour2014-11-102-1/+4
| | |/ / / | |/| | |
* | | | | branch: consider an empty upstream remote config as not foundCarlos Martín Nieto2014-11-172-0/+22
| | | | |
* | | | | Merge branch 'openssl-lock-free'Carlos Martín Nieto2014-11-171-0/+6
|\ \ \ \ \ | |_|_|_|/ |/| | | |
| * | | | Plug possible leak in the openssl locksUngureanu Marius2014-11-171-0/+6
| | | | |
* | | | | Merge pull request #2707 from swisspol/fix_includeCarlos Martín Nieto2014-11-151-1/+2
|\ \ \ \ \ | | | | | | | | | | | | Fixed git2.h not including threads.h anymore
| * | | | | Fixed git2.h not including threads.h anymorePierre-Olivier Latour2014-11-151-1/+2
| |/ / / /
* | | | | Merge pull request #2708 from phatblat/pr/threading-docCarlos Martín Nieto2014-11-151-3/+4
|\ \ \ \ \ | |/ / / / |/| | | | Fix typo in THREADING.md
| * | | | Fix GCD typoBen Chatelain2014-11-141-3/+4
|/ / / /
* | | | Merge pull request #2653 from ethomson/contributingCarlos Martín Nieto2014-11-091-14/+40
|\ \ \ \ | | | | | | | | | | Add test information to contributing guidelines
| * | | | Add instructions on running the testsEdward Thomson2014-10-241-9/+33
| | | | |
| * | | | Fix grammar of licensing sentence, add IRC linksWaldir Pimenta2014-10-241-5/+7
| | |_|/ | |/| | | | | | | | | | Also various formatting, wrapping and capitalization tweaks.
* | | | Merge pull request #2637 from libgit2/cmn/global-initEdward Thomson2014-11-0822-67/+88
|\ \ \ \ | |_|/ / |/| | | Rename git_threads_ to git_libgit2_
| * | | Rename git_threads_ to git_libgit2_Carlos Martín Nieto2014-11-0822-67/+88
|/ / / | | | | | | | | | | | | | | | This describes their purpose better, as we now initialize ssl and some other global stuff in there. Calling the init function is not something which has been optional for a while now.
* | | Merge pull request #2673 from swisspol/2672Edward Thomson2014-11-084-19/+25
|\ \ \ | | | | | | | | Fixed GIT_REMOTE_DOWNLOAD_TAGS_ALL to behave like git 1.9.0+