summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* notes: fix comments for git_note_next()cmn/notes-consistencyCarlos Martín Nieto2014-12-061-4/+2
| | | | | The iterator is the last argument. There is also no returned notes, just ids, so the comment about freeing is out of place.
* notes: move the notes name argumentCarlos Martín Nieto2014-12-068-17/+20
| | | | | Make it consistent between git_note_create() and git_note_remote() by putting it after the repository.
* Rever spelling fixes for dependenciesCarlos Martín Nieto2014-12-052-2/+2
| | | | | This is not our code and it adds unecessary changes from the upstream code.
* Merge pull request #2744 from epmatsw/spellingnulltoken2014-12-0522-23/+23
|\ | | | | Spelling fixes
| * Spelling fixesWill Stamper2014-12-0422-23/+23
| |
* | Merge pull request #2743 from ethomson/init_valCarlos Martín Nieto2014-12-054-18/+58
|\ \ | |/ |/| init: return the number of initializations
| * init: return the number of initializationsEdward Thomson2014-12-044-18/+58
| |
* | Merge pull request #2742 from stewid/add_missing_else_directiveCarlos Martín Nieto2014-12-031-0/+1
|\ \ | |/ |/| Add missing else directive
| * Add missing else directiveStefan Widgren2014-12-031-0/+1
| | | | | | | | | | Add missing else directive to fix compiler warning: control reaches end of non-void function
* | Merge pull request #2741 from ethomson/fetch-twiceCarlos Martín Nieto2014-12-031-0/+1
|\ \ | |/ |/| win32: clear connection data on close
| * win32: clear connection data on closeEdward Thomson2014-12-031-0/+1
|/
* Merge pull request #2734 from jeffhostetler/jeffhostetler/git_mkfileEdward Thomson2014-12-011-1/+1
|\ | | | | fix cl_git_mkfile() to test for -1 rather than 0 for errors from p_creat...
| * fix cl_git_mkfile() to test for -1 rather than 0 for errors from p_creat()Jeff Hostetler2014-11-261-1/+1
| |
* | Merge pull request #2736 from ethomson/describe_errorcodeCarlos Martín Nieto2014-11-301-2/+2
|\ \ | |/ |/| describe: check error codes
| * describe: check error codesEdward Thomson2014-11-291-2/+2
|/
* Merge pull request #2727 from libgit2/cmn/travis-jobsEdward Thomson2014-11-231-2/+4
|\ | | | | Regain non-threadsafe builds and make the valgrind build failable
| * 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 #2718 from libgit2/cmn/peeling-errorsEdward Thomson2014-11-237-32/+80
|\ \ | | | | | | peel: reject bad queries with EPEEL
| * | peel: reject bad queries with EINVALIDSPECcmn/peeling-errorsCarlos Martín Nieto2014-11-227-32/+80
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There are some combination of objects and target types which we know cannot be fulfilled. Return EINVALIDSPEC for those to signify that there is a mismatch in the user-provided data and what the object model is capable of satisfying. If we start at a tag and in the course of peeling find out that we cannot reach a particular type, we return EPEEL.
* | | Plug leaksCarlos Martín Nieto2014-11-238-14/+25
| | | | | | | | | | | | Valgrind is now clean except for libssl and libgcrypt.
* | | Merge pull request #2723 from ravindp/ravindp/fix_4_missing_delta_basesCarlos Martín Nieto2014-11-222-3/+7
|\ \ \ | |_|/ |/| | Fix for misleading "missing delta bases" error.
| * | Fix for misleading "missing delta bases" error - Fix #2721.Ravindra Patel2014-11-212-3/+7
| | |
* | | 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().