summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #4178 from libgit2/ethomson/enfasten_sha1enterprise/backport-2.9-4136-4178Carlos Martín Nieto2017-03-285-230/+887
| | | sha1dc: perf improvements from upstream
* Merge pull request #4136 from libgit2/ethomson/sha1dcCarlos Martín Nieto2017-03-2812-8/+1814
| | | | Introduce (optional) SHA1 collision attack detection
* 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
| * travis: take the newer ssh-keygen format into accountcmn/osx-ssh-keyCarlos Martín Nieto2016-10-051-2/+7
| | | | | | | | | | | | The Mac machines have updated their SSH version and so the ssh-keygen format has changed. Ask it for MD5, which is the one that is output as hex.
| * cibuild: set -xCarlos Martín Nieto2016-10-051-0/+2
|/ | | | | This lets us see the details of what we're doing instead of just seeing the output of unknown commands in the build output.
* Merge pull request #3931 from ↵Edward Thomson2016-10-011-0/+4
|\ | | | | | | | | libgit2/ethomson/checkout_dont_calculate_oid_for_dirs checkout: don't try to calculate oid for directories
| * checkout: don't try to calculate oid for directoriesethomson/checkout_dont_calculate_oid_for_dirsEdward Thomson2016-09-141-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When trying to determine if we can safely overwrite an existing workdir item, we may need to calculate the oid for the workdir item to determine if its identical to the old side (and eligible for removal). We previously did this regardless of the type of entry in the workdir; if it was a directory, we would open(2) it and then try to read(2). The read(2) of a directory fails on many platforms, so we would treat it as if it were unmodified and continue to perform the checkout. On FreeBSD, you _can_ read(2) a directory, so this pattern failed. We would calculate an oid from the data read and determine that the directory was modified and would therefore generate a checkout conflict. This reliance on read(2) is silly (and was most likely accidentally giving us the behavior we wanted), we should be explicit about the directory test.
* | Merge pull request #3929 from libgit2/vmg/timeEdward Thomson2016-09-132-0/+36
|\ \ | | | | | | time: Export `git_time_monotonic`
| * | time: Export `git_time_monotonic`vmg/timeVicent Marti2016-09-132-0/+36
|/ /
* | Merge pull request #3925 from pks-t/pks/cmake-library-dirsPatrick Steinhardt2016-09-091-0/+1
|\ \ | | | | | | cmake: add curl library path
| * | cmake: add curl library pathPatrick Steinhardt2016-09-051-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The `PKG_CHECK_MODULES` function searches a pkg-config module and then proceeds to set various variables containing information on how to link to the library. In contrast to the `FIND_PACKAGE` function, the library path set by `PKG_CHECK_MODULES` will not necessarily contain linking instructions with a complete path to the library, though. So when a library is not installed in a standard location, the linker might later fail due to being unable to locate it. While we already honor this when configuring libssh2 by adding `LIBSSH2_LIBRARY_DIRS` to the link directories, we fail to do so for libcurl, preventing us to build libgit2 on e.g. FreeBSD. Fix the issue by adding the curl library directory to the linker search path.
* | | Merge pull request #3923 from libgit2/ethomson/diff-read-empty-binaryEdward Thomson2016-09-068-22/+86
|\ \ \ | | | | | | | | Read binary patches (with no binary data)
| * | | diff: treat binary patches with no data specialethomson/diff-read-empty-binaryEdward Thomson2016-09-057-19/+80
| | | | | | | | | | | | | | | | | | | | | | | | When creating and printing diffs, deal with binary deltas that have binary data specially, versus diffs that have a binary file but lack the actual binary data.
| * | | diff_print: change test for skipping binary printingEdward Thomson2016-09-021-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Instead of skipping printing a binary diff when there is no data, skip printing when we have a status of `UNMODIFIED`. This is more in-line with our internal data model and allows us to expand the notion of binary data. In the future, there may have no data because the files were unmodified (there was no data to produce) or it may have no data because there was no data given to us in a patch. We want to treat these cases separately.
| * | | patch: error on diff callback failureEdward Thomson2016-09-021-0/+3
| | | |
* | | | Merge pull request #3882 from pks-t/pks/fix-fetch-refspec-dst-parsingPatrick Steinhardt2016-09-062-2/+55
|\ \ \ \ | |/ / / |/| | | refspec: do not set empty rhs for fetch refspecs
| * | | refspec: do not set empty rhs for fetch refspecsPatrick Steinhardt2016-08-042-2/+55
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | According to git-fetch(1), "[t]he colon can be omitted when <dst> is empty." So according to git, the refspec "refs/heads/master" is the same as the refspec "refs/heads/master:" when fetching changes. When trying to fetch from a remote with a trailing colon with libgit2, though, the fetch actually fails while it works when the trailing colon is left out. So obviously, libgit2 does _not_ treat these two refspec formats the same for fetches. The problem results from parsing refspecs, where the resulting refspec has its destination set to an empty string in the case of a trailing colon and to a `NULL` pointer in the case of no trailing colon. When passing this to our DWIM machinery, the empty string gets translated to "refs/heads/", which is simply wrong. Fix the problem by having the parsing machinery treat both cases the same for fetch refspecs.
* | | | Merge pull request #3922 from pks-t/pks/diff-only-load-binaries-when-requestedEdward Thomson2016-09-021-14/+18
|\ \ \ \ | |_|_|/ |/| | | patch_generate: only calculate binary diffs if requested
| * | | patch_generate: only calculate binary diffs if requestedPatrick Steinhardt2016-09-011-14/+18
| | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When generating diffs for binary files, we load and decompress the blobs in order to generate the actual diff, which can be very costly. While we cannot avoid this for the case when we are called with the `GIT_DIFF_SHOW_BINARY` flag, we do not have to load the blobs in the case where this flag is not set, as the caller is expected to have no interest in the actual content of binary files. Fix the issue by only generating a binary diff when the caller is actually interested in the diff. As libgit2 uses heuristics to determine that a blob contains binary data by inspecting its size without loading from the ODB, this saves us quite some time when diffing in a repository with binary files.
* | | Merge pull request #3915 from pks-t/pks/index-collision-test-leakCarlos Martín Nieto2016-08-301-2/+0
|\ \ \ | |/ / |/| | tests: index: do not re-allocate index
| * | tests: index: do not re-allocate indexPatrick Steinhardt2016-08-291-2/+0
| | | | | | | | | | | | | | | | | | Plug a memory leak caused by re-allocating a `git_index` structure which has already been allocated by the test suite's initializer.
* | | Merge pull request #3907 from steffhip/git_checkout_tree-fixPatrick Steinhardt2016-08-302-1/+5
|\ \ \
| * | | git_checkout_tree options fixStefan Huber2016-08-302-1/+5
|/ / / | | | | | | | | | | | | | | | | | | | | | According to the reference the git_checkout_tree and git_checkout_head functions should accept NULL in the opts field This was broken since the opts field was dereferenced and thus lead to a crash.
* | | Merge pull request #3914 from pks-t/pks/libqgit2-binding-urlEdward Thomson2016-08-291-1/+1
|\ \ \ | |/ / |/| | README: adjust URL to libqgit2 repository
| * | README: adjust URL to libqgit2 repositoryPatrick Steinhardt2016-08-291-1/+1
|/ /
* | Merge pull request #3900 from pks-t/pks/http-close-substream-on-connectPatrick Steinhardt2016-08-291-0/+3
|\ \ | | | | | | transports: http: set substream as disconnected after closing
| * | transports: http: reset `connected` flag when closing transportPatrick Steinhardt2016-08-171-0/+2
| | |
| * | transports: http: reset `connected` flag when re-connecting transportPatrick Steinhardt2016-08-171-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When calling `http_connect` on a subtransport whose stream is already connected, we first close the stream in case no keep-alive is in use. When doing so, we do not reset the transport's connection state, though. Usually, this will do no harm in case the subsequent connect will succeed. But when the connection fails we are left with a substransport which is tagged as connected but which has no valid stream attached. Fix the issue by resetting the subtransport's connected-state when closing its stream in `http_connect`.
* | | Merge pull request #3908 from libgit2/ethomson/patch_from_diffEdward Thomson2016-08-2610-7/+95
|\ \ \ | | | | | | | | Teach `git_patch_from_diff` about parsed diffs
| * | | Teach `git_patch_from_diff` about parsed diffsethomson/patch_from_diffEdward Thomson2016-08-2410-7/+95
|/ / / | | | | | | | | | | | | Ensure that `git_patch_from_diff` can return the patch for parsed diffs, not just generate a patch for a generated diff.
* | | Merge pull request #3904 from stinb/filesystem-iterator-double-freePatrick Steinhardt2016-08-241-5/+3
|\ \ \ | | | | | | | | filesystem_iterator: fixed double free on error
| * | | filesystem_iterator: fixed double free on errorJason Haslam2016-08-221-5/+3
|/ / /