summaryrefslogtreecommitdiff
path: root/include
Commit message (Collapse)AuthorAgeFilesLines
...
* mailmap: Fix some other minor style nitsEmilio Cobos Álvarez2018-06-141-2/+1
|
* mailmap: Fix more bugs which snuck in when I rebasedNika Layzell2018-06-141-2/+2
|
* mailmap: Integrate mailmaps with blame and signaturesNika Layzell2018-06-144-0/+54
|
* mailmap: Make everything a bit more style conformingNika Layzell2018-06-141-30/+31
|
* mailmap: Clean up mailmap parser, and finish APINika Layzell2018-06-141-16/+103
|
* mailmap: WIP mailmap supportEmilio Cobos Álvarez2018-06-142-0/+40
|
* Merge pull request #4680 from pks-t/pks/diff-opts-enumEdward Thomson2018-06-121-6/+6
|\ | | | | diff: fix enum value being out of allowed range
| * diff: fix enum value being out of allowed rangePatrick Steinhardt2018-06-121-6/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The C89 standard states in §6.7.2.2 "Enumeration specifiers": > The expression that defines the value of an enumeration constant shall > be an integer constant expression that has a value representable as an > int. On most platforms, this effectively limits the range to a 32 bit signed integer. The enum `git_diff_option_t` though recently gained an entry `GIT_DIFF_INDENT_HEURISTIC = (1u << 31)`, which breaks this limit. Fix the issue by using a gap in `git_diff_option_t`'s enum values. While this has the benefit of retaining our API, it may break applications which do not get recompiled after upgrading libgit2. But as we are bumping the soversion on each release anyway and thus force a recompile of dependents, this is not a problem.
* | Merge pull request #4436 from pks-t/pks/packfile-stream-freeEdward Thomson2018-06-112-1/+24
|\ \ | |/ |/| pack: rename `git_packfile_stream_free`
| * buffer: deprecate `git_buf_free` in favor of `git_buf_dispose`Patrick Steinhardt2018-06-101-1/+13
| |
| * common.h: create `GIT_DEPRECATED` macroPatrick Steinhardt2018-06-101-0/+11
| |
* | settings: allow swapping out memory allocatorPatrick Steinhardt2018-06-072-0/+31
| | | | | | | | | | | | | | Tie in the newly created infrastructure for swapping out memory allocators into our settings code. A user can now simply use the new option "GIT_OPT_SET_ALLOCATOR" with `git_libgit2_opts`, passing in an already initialized allocator structure as vararg.
* | alloc: make memory allocators use function pointersPatrick Steinhardt2018-06-071-0/+77
|/ | | | | | | | | | | | | | | | | Currently, our memory allocators are being redirected to the correct implementation at compile time by simply using macros. In order to make them swappable at runtime, this commit reshuffles that by instead making use of a global "git_allocator" structure, whose pointers are set up to reference the allocator functions. Like this, it becomes easy to swap out allocators by simply setting these function pointers. In order to initialize a "git_allocator", our provided allocators "stdalloc" and "crtdbg" both provide an init function. This is being called to initialize a passed in allocator struct and set up its members correctly. No support is yet included to enable users of libgit2 to switch out the memory allocator at a global level.
* docs: standardize struct git_*_options commentsEtienne Samson2018-05-078-27/+26
|
* docs: fix comment styleEtienne Samson2018-05-071-3/+6
|
* attr: fix typoEtienne Samson2018-05-071-1/+1
|
* branch: typoEtienne Samson2018-05-071-1/+1
|
* docs: move blame options struct field commentsEtienne Samson2018-05-071-14/+17
|
* docs: correct defgroupEtienne Samson2018-05-071-1/+1
|
* docs: fix incorrect codeblock on outputEtienne Samson2018-05-071-35/+35
|
* docs: move comment so docurium sees itEtienne Samson2018-05-071-1/+1
|
* docs: standardize comment block for git_*_init_options functionsEtienne Samson2018-05-0716-84/+157
|
* docs: missing documentation commentEtienne Samson2018-05-071-0/+1
|
* docs: move callback-specific documentation to the callbackEtienne Samson2018-05-071-7/+18
|
* docs: fix some comment-marker typosEtienne Samson2018-05-073-3/+3
|
* docs: fix more missing includesEtienne Samson2018-05-074-0/+12
|
* docs: add buffer.h & oid.h to types.hEtienne Samson2018-05-073-0/+5
| | | | Otherwise docurium/clang chokes on the types, and ignores the documentation comments altogether.
* Merge pull request #4640 from mkeeler/worktree-convenience2Patrick Steinhardt2018-04-301-0/+18
|\ | | | | worktree: add functions to get name and path
| * worktree: add functions to get name and pathMatt Keeler2018-04-251-0/+18
| |
* | Merge pull request #4525 from pks-t/pks/config-iterate-in-orderEdward Thomson2018-04-221-0/+1
|\ \ | | | | | | Configuration entry iteration in order
| * | config_file: move include depth into config entryPatrick Steinhardt2018-03-261-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In order to reject writes to included configuration entries, we need to keep track of whether an entry was included via another configuration file or not. This information is being stored in the `cvar` structure, which is a rather weird location, as it is only used to create a list structure of config entries. Move the include depth into the structure `git_config_entry` instead. While this fixes the layering issue, it enables users of libgit2 to access the depth, too.
* | | Merge pull request #4524 from pks-t/pks/worktree-refsEdward Thomson2018-04-171-1/+2
|\ \ \ | |_|/ |/| | worktree: add ability to create worktree with pre-existing branch
| * | worktree: add ability to create worktree with pre-existing branchPatrick Steinhardt2018-02-091-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently, we always create a new branch after the new worktree's name when creating a worktree. In some workflows, though, the caller may want to check out an already existing reference instead of creating a new one, which is impossible to do right now. Add a new option `ref` to the options structure for adding worktrees. In case it is set, a branch and not already checked out by another worktree, we will re-use this reference instead of creating a new one.
* | | Merge pull request #4597 from cjhoward92/fix/cert-check-docsPatrick Steinhardt2018-04-062-4/+4
|\ \ \ | | | | | | | | remote/proxy: fix git_transport_certificate_check_db description
| * | | remote/proxy: fix git_transport_certificate_check_db commentCarson Howard2018-03-272-4/+4
| | | |
* | | | Merge pull request #4587 from rcjsuen/patch-2Patrick Steinhardt2018-04-061-3/+3
|\ \ \ \ | | | | | | | | | | Flag options in describe.h as being optional
| * | | | Flag options in describe.h as being optionalRemy Suen2018-03-271-3/+3
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The git_describe_options in git_describe_commit and git_describe_workdir and the git_describe_format_options in git_describe_format are optional and can be NULL. State this in the documentation to make people's lives easier when calling these functions. Signed-off-by: Remy Suen <remy.suen@gmail.com>
* | | | types: remove unused git_merge_resultCarson Howard2018-03-271-3/+0
|/ / / | | | | | | `git_merge_result` is currently unused in the codebase and generates a blank page in the [documentation](https://libgit2.github.com/libgit2/#HEAD/type/git_merge_result).
* | | checkout: change default strategy to SAFEEtienne Samson2018-03-261-2/+2
| |/ |/| | | As per #4200, our default is quite surprising to users that expect checkout to just "do the thing".
* | Merge pull request #4544 from josharian/docsPatrick Steinhardt2018-03-131-18/+35
|\ \ | | | | | | pathspec: improve git_pathspec_flag_t doc rendering
| * | pathspec: improve git_pathspec_flag_t doc renderingJosh Bleecher Snyder2018-02-231-18/+35
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | By placing docs per enum value rather than in a large block, the automated doc generation tool can make nicer docs, as could other automated tools, such as the mooted https://github.com/libgit2/git2go/issues/427. The current rendering is somewhat ugly: https://libgit2.github.com/libgit2/#HEAD/type/git_pathspec_flag_t No textual changes, just reorganization.
* | | Merge pull request #4396 from libgit2/cmn/config-regex-is-normalisedEdward Thomson2018-03-121-2/+26
|\ \ \ | | | | | | | | config: specify how we match the regular expressions
| * | | config: explicitly state that subsections are case-sensitivecmn/config-regex-is-normalisedCarlos Martín Nieto2018-03-111-6/+11
| | | |
| * | | config: specify how we match the regular expressionsCarlos Martín Nieto2017-11-181-0/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We do it the same as git does: case-sensitively on the normalized form of the variable name. While here also specify that we're case-sensitive on the values when handling the values when setting or deleting multivars.
* | | | diff: ensure an unsigned number is shiftedJacques Germishuys2018-03-081-3/+3
| | | |
* | | | worktree: lock reason should be constJacques Germishuys2018-03-021-1/+1
| |/ / |/| |
* | | Update version number to v0.27Patrick Steinhardt2018-02-201-3/+3
| | |
* | | odb: provide length and type with streaming readEdward Thomson2018-02-012-2/+10
| |/ |/| | | | | | | The streaming read functionality should provide the length and the type of the object, like the normal read functionality does.
* | Merge pull request #4488 from libgit2/ethomson/conflict_marker_sizeEdward Thomson2018-01-311-0/+6
|\ \ | | | | | | Use longer conflict markers in recursive merge base
| * | merge: allow custom conflict marker sizeEdward Thomson2018-01-211-0/+6
| | | | | | | | | | | | | | | | | | Allow for a custom conflict marker size, allowing callers to override the default size of the "<<<<<<<" and ">>>>>>>" markers in the conflicted output file.
View Lorry Controller Status