summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* openssl_stream: fix typoPatrick Steinhardt2016-10-311-1/+1
|
* PROJECTS: consistently quote directoriesPatrick Steinhardt2016-10-311-3/+3
|
* Documentation: fix small typosPatrick Steinhardt2016-10-312-3/+3
|
* Merge pull request #3973 from pks-t/pks/memleak-fixesPatrick Steinhardt2016-10-282-0/+4
|\ | | | | Trivial memory leak fixes in test suite
| * tests: fetchhead: fix memory leakPatrick Steinhardt2016-10-271-0/+2
| |
| * tests: vector: fix memory leakPatrick Steinhardt2016-10-271-0/+2
|/
* Merge pull request #3966 from vivaladav/documentation-fixesCarlos Martín Nieto2016-10-161-1/+1
|\ | | | | patch: minor documentation fix.
| * patch: minor documentation fix.Davide Coppola2016-10-161-1/+1
|/ | | | Fix @return description of git_patch_num_lines_in_hunk.
* Merge pull request #3897 from pks-t/pks/squelch-example-warningsPatrick Steinhardt2016-10-107-508/+720
|\ | | | | Squelch example warnings, enable CI
| * script: cibuild: build examplesPatrick Steinhardt2016-10-101-1/+1
| |
| * examples: add: fix type casting warningPatrick Steinhardt2016-10-101-5/+4
| |
| * examples: diff: parse correct types for line-diffoptsPatrick Steinhardt2016-10-103-3/+31
| |
| * examples: fix warnings in network/fetch.cPatrick Steinhardt2016-10-101-7/+7
| |
| * examples: general: fix remaining warningsPatrick Steinhardt2016-10-101-9/+14
| |
| * examples: general: convert C99 comments to C90 commentsPatrick Steinhardt2016-10-101-42/+54
| |
| * examples: general: extract function demonstrating OID parsingPatrick Steinhardt2016-10-101-26/+44
| |
| * examples: general: extract function demonstrating ODBPatrick Steinhardt2016-10-101-51/+77
| |
| * examples: general: extract function demonstrating commit writingPatrick Steinhardt2016-10-101-36/+51
| |
| * examples: general: extract functions demonstrating object parsingPatrick Steinhardt2016-10-101-131/+194
| |
| * examples: general: extract function demonstrating revwalkingPatrick Steinhardt2016-10-101-39/+53
| |
| * examples: general: extract function demonstrating index walkingPatrick Steinhardt2016-10-101-24/+33
| |
| * examples: general: extract function demonstrating reference listingsPatrick Steinhardt2016-10-101-22/+36
| |
| * examples: general: extract function demonstrating config filesPatrick Steinhardt2016-10-101-14/+23
| |
| * examples: general: use tabs instead of spacesPatrick Steinhardt2016-10-101-457/+457
|/
* Merge branch 'pr/3809'Edward Thomson2016-10-0912-13/+58
|\
| * make git_diff_stats_to_buf not show 0 insertions or 0 deletionsSim Domingo2016-10-0912-13/+58
| |
* | Merge pull request #3958 from libgit2/ethomson/settings_docsEdward Thomson2016-10-091-1/+2
|\ \ | | | | | | docs: GIT_OPT_ENABLE_STRICT_OBJECT_CREATION is enabled
| * | docs: GIT_OPT_ENABLE_STRICT_OBJECT_CREATION is enabledethomson/settings_docsEdward Thomson2016-10-091-1/+2
| | | | | | | | | | | | | | | We changed the defaults on strict object creation - it is enabled by default. Update the documentation to reflect that.
* | | Merge pull request #3956 from pks-t/pks/object-parsing-hardeningEdward Thomson2016-10-092-4/+10
|\ \ \ | |/ / |/| | Object parsing hardening
| * | commit: always initialize commit messagePatrick Steinhardt2016-10-091-3/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When parsing a commit, we will treat all bytes left after parsing the headers as the commit message. When no bytes are left, we leave the commit's message uninitialized. While uncommon to have a commit without message, this is the right behavior as Git unfortunately allows for empty commit messages. Given that this scenario is so uncommon, most programs acting on the commit message will never check if the message is actually set, which may lead to errors. To work around the error and not lay the burden of checking for empty commit messages to the developer, initialize the commit message with an empty string when no commit message is given.
| * | tree: validate filename and OID length when parsing objectPatrick Steinhardt2016-10-071-1/+6
| | | | | | | | | | | | | | | | | | | | | | | | When parsing tree entries from raw object data, we do not verify that the tree entry actually has a filename as well as a valid object ID. Fix this by asserting that the filename length is non-zero as well as asserting that there are at least `GIT_OID_RAWSZ` bytes left when parsing the OID.
* | | Merge pull request #3955 from arthurschreiber/arthur/fix-regcomp_l-checkCarlos Martín Nieto2016-10-072-8/+30
|\ \ \ | | | | | | | | Fix the existence check for `regcomp_l`.
| * | | Fix the existence check for `regcomp_l`.Arthur Schreiber2016-10-072-8/+30
|/ / / | | | | | | | | | | | | | | | | | | `xlocale.h` only defines `regcomp_l` if `regex.h` was included as well. Also change the test cases to actually test `p_regcomp` works with a multibyte locale.
* | | Merge pull request #3921 from libgit2/cmn/walk-limit-enoughEdward Thomson2016-10-0728-205/+407
|\ \ \ | | | | | | | | Improve revision walk preparation logic
| * | | revwalk: don't show commits that become uninteresting after being enqueuedcmn/walk-limit-enoughCarlos Martín Nieto2016-10-061-8/+13
| | | | | | | | | | | | | | | | | | | | | | | | When we read from the list which `limit_list()` gives us, we need to check that the commit is still interesting, as it might have become uninteresting after it was added to the list.
| * | | rebase: don't ask for time sortingCarlos Martín Nieto2016-10-061-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | `git-rebase--merge` does not ask for time sorting, but uses the default. We now produce the same default time-ordered output as git, so make us of that since it's not always the same output as our time sorting.
| * | | revwalk: update the description for the default sortingCarlos Martín Nieto2016-10-062-10/+4
| | | | | | | | | | | | | | | | | | | | | | | | It changed from implementation-defined to git's default sorting, as there are systems (e.g. rebase) which depend on this order. Also specify more explicitly how you can get git's "date-order".
| * | | revwalk: remove a useless enqueueing phase for topological and default sortingCarlos Martín Nieto2016-10-061-23/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | After `limit_list()` we already have the list in time-sorted order, which is what we want in the "default" case. Enqueueing into the "unsorted" list would just reverse it, and the topological sort will do its own sorting if it needs to.
| * | | Add revwalk note to CHANGELOGCarlos Martín Nieto2016-10-061-0/+2
| | | |
| * | | revwalk: get rid of obsolete marking codeCarlos Martín Nieto2016-10-061-122/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We've now moved to code that's closer to git and produces the output during the preparation phase, so we no longer process the commits as part of generating the output. This makes a chunk of code redundant, as we're simply short-circuiting it by detecting we've processed the commits alrady.
| * | | revwalk: style changeCarlos Martín Nieto2016-10-061-4/+2
| | | | | | | | | | | | | | | | | | | | Change the condition for returning 0 more in line with that we write elsewhere in the library.
| * | | commit_list: fix the date comparison functionCarlos Martín Nieto2016-10-061-3/+8
| | | | | | | | | | | | | | | | | | | | This returns the integer-cast truth value comparing the dates. What we want instead of a (-1, 0, 1) output depending on how they compare.
| * | | revwalk: port over the topological sortingCarlos Martín Nieto2016-10-062-49/+109
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | After porting over the commit hiding and selection we were still left with mistmaching output due to the topologial sort. This ports the topological sorting code to make us match with our equivalent of `--date-order` and `--topo-order` against the output from `rev-list`.
| * | | pqueue: support not having a comparison functionCarlos Martín Nieto2016-10-061-3/+9
| | | | | | | | | | | | | | | | In this case, we simply behave like a vector.
| * | | vector, pqueue: add git_vector_reverse and git_pqueue_reverseCarlos Martín Nieto2016-10-064-0/+51
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is a convenience function to reverse the contents of a vector and a pqueue in-place. The pqueue function is useful in the case where we're treating it as a LIFO queue.
| * | | revwalk: get closer to gitCarlos Martín Nieto2016-10-065-47/+182
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We had some home-grown logic to figure out which objects to show during the revision walk, but it was rather inefficient, looking over the same list multiple times to figure out when we had run out of interesting commits. We now use the lists in a smarter way. We also introduce the slop mechanism to determine when to stpo looking. When we run out of interesting objects, we continue preparing the walk for another 5 rounds in order to make it less likely that we miss objects in situations with complex graphs.
| * | | revwalk: introduce tests that hide old commitsEdward Thomson2016-10-0615-4/+64
| | | | | | | | | | | | | | | | | | | | | | | | Introduce some tests that show some commits, while hiding some commits that have a timestamp older than the common ancestors of these two commits.
* | | | Merge pull request #3953 from arthurschreiber/arthur/fix-regcomp-locale-issuesCarlos Martín Nieto2016-10-068-12/+54
|\ \ \ \ | |/ / / |/| | | Make sure we use the `C` locale for `regcomp` on macOS.
| * | | Make sure we use the `C` locale for `regcomp` on macOS.Arthur Schreiber2016-10-068-12/+54
|/ / /
* | | Merge pull request #3954 from libgit2/cmn/osx-ssh-keyCarlos Martín Nieto2016-10-051-2/+9
|\ \ \ | | | | | | | | Travis Mac SSH key issues
View Lorry Controller Status