proxmox-mirrors/libgit2
1
0
Fork 0
mirror of https://git.proxmox.com/git/libgit2 synced 2025-05-09 19:58:09 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
8,563 Commits 2 Branches 0 Tags 22 MiB
6d8f3a5162
Commit Graph

8563 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Ben Chatelain
6d8f3a5162 Better param docs 2015-07-28 08:28:33 -06:00
Ben Chatelain
08afd227df Fix remaining documentation warnings 2015-07-27 18:32:55 -06:00
Ben Chatelain
2da64edb80 Add -Wdocumentation flag if supported 2015-07-27 18:28:29 -06:00
Ben Chatelain
f90fbb8d22 Use correct Doxygen trailing comment syntax 2015-07-27 17:42:08 -06:00
Ben Chatelain
41808d0470 Fix @param names in doc comments 2015-07-27 14:46:50 -06:00
Josh Abernathy
abbe17ef1f Merge pull request #3322 from libgit2/fix-init-ordering 
Increment `git__n_inits` before doing `init_once`.
 2015-07-22 16:01:08 -04:00
joshaber
9830fbba05 Merge branch 'master' into fix-init-ordering 2015-07-22 11:33:18 -04:00
joshaber
cf198fdf2a Increment git__n_inits before doing init_once. 
Fixes #3318.
 2015-07-22 10:51:38 -04:00
Carlos Martín Nieto
42156d5617 Merge pull request #3315 from rcorre/docfix 
Document git_fetch_options struct and fix typo.
 2015-07-20 16:47:21 +02:00
Ryan Roden-Corrent
37996d474b Document git_fetch_options struct and fix typo. 
git_fetch_options was missing from the API docs because it lacked a
documentation comment above the struct declaration.
I used the git_checkout_options docstring as a template.

Also fixes a typo in git_remote_prune_refs (remote, not reamote).
 2015-07-20 09:48:01 -04:00
Edward Thomson
274f0b9371 Merge pull request #3311 from Fallso/MacroRedefinition 
Fix macro redefinition warning
 2015-07-15 09:17:35 -05:00
Fallso
cec3569f25 Fix macro redefinition warning 2015-07-15 11:40:06 +01:00
Carlos Martín Nieto
ceb5873913 Merge pull request #3302 from libgit2/cmn/submodule-foreach-diff-path 
List a submodule only once when the path matches a submodule in the index
 2015-07-13 18:50:39 +02:00
Carlos Martín Nieto
97c0a85fc6 Merge pull request #3306 from libgit2/cmn/fetch-ex-fetch 
examples: modernise the fetch example
 2015-07-13 11:23:07 +02:00
Carlos Martín Nieto
f861abadfe Merge branch 'portable-zu' 2015-07-12 19:56:19 +02:00
Matthew Plough
768f8be31c Fix #3094 - improve use of portable size_t/ssize_t format specifiers. 
The header src/cc-compat.h defines portable format specifiers PRIuZ, PRIdZ, and PRIxZ. The original report highlighted the need to use these specifiers in examples/network/fetch.c.  For this commit, I checked all C source and header files not in deps/ and transitioned to the appropriate format specifier where appropriate.
 2015-07-12 19:55:19 +02:00
Carlos Martín Nieto
6c7e86e158 examples: modernise the fetch example 
Under normal conditions, git_remote_fetch() should be the only function
used to perform a fetch. Don't let the example lead people astray.
 2015-07-12 19:41:01 +02:00
Edward Thomson
a522d8c1e7 Merge pull request #3292 from tkelman/patch-1 
Increase required version of cmake to 2.8
 2015-07-11 17:35:59 -05:00
Carlos Martín Nieto
08c2d3e97c submodule: lookup the submodule by path if available 
If we get the path from the gitmodules file, look up the submodule we're
interested in by path, rather then by name. Otherwise we might get
duplicate results.
 2015-07-11 18:31:28 +02:00
Carlos Martín Nieto
a34c4f8dce submdule: reproduce double-reporting of a submodule in foreach 
When we rename a submodule, we should be merging two sets of information
based on whether their path is the same. We currently only deduplicate
on equal name, which causes us to double-report.
 2015-07-11 13:32:57 +02:00
Tony Kelman
37c84dc58f Increase required version of cmake to 2.8 2015-07-10 12:10:47 -07:00
Carlos Martín Nieto
1cd9601616 Merge pull request #3301 from ethomson/warnings 
Clean up some warnings
 2015-07-10 19:32:04 +02:00
Carlos Martín Nieto
a1687f7855 Merge pull request #3297 from tkelman/patch-2 
Fix undefined reference with old versions of openssl
 2015-07-10 19:07:41 +02:00
Carlos Martín Nieto
f2a328fa2a Merge pull request #3272 from ethomson/cert 
git_cert: child types use proper base type
 2015-07-10 18:36:53 +02:00
Edward Thomson
9c0331026b khash: add eol so picky compilers stop warning 2015-07-10 09:53:31 -05:00
Edward Thomson
9a99ca7b21 wildcard filters: move CHANGELOG message to 0.23+1 2015-07-10 09:53:30 -05:00
Edward Thomson
bae467aec4 wildcard filters: clean up some warnings in tests 2015-07-10 09:53:29 -05:00
Edward Thomson
a3c00cd8e3 xdiff: cleanup some warnings 2015-07-10 09:41:56 -05:00
Edward Thomson
79698030b0 git_cert: child types use proper base type 2015-07-10 09:28:33 -05:00
Carlos Martín Nieto
9847d80ddc Merge pull request #3281 from ethomson/wildcard_filters 
filters: custom filters with wildcard attributes
 2015-07-09 18:21:31 +02:00
Carlos Martín Nieto
cd85ce6040 Merge pull request #3299 from ethomson/xdiff_update 
Don't add unnecessary trailing newline during file merge
 2015-07-08 21:17:56 +02:00
Edward Thomson
234ca40a89 xdiff: upgrade to core git 2.4.5 
Upgrade xdiff to version used in core git 2.4.5 (0df0541).

Corrects an issue where an LF is added at EOF while applying
an unrelated change (ba31180), cleans up some unused code (be89977 and
e5b0662), and provides an improved callback to avoid leaking internal
(to xdiff) structures (467d348).

This also adds some additional functionality that we do not yet take
advantage of, namely the ability to ignore changes whose lines are
all blank (36617af).
 2015-07-07 17:01:49 -05:00
Edward Thomson
43ce8cb52e revert: correct test that added trailing newline 2015-07-07 17:01:49 -05:00
Edward Thomson
ae8f7260ec merge_files: don't add trailing newlines 
When invoked with three files that each lack a trailing newline,
the merge result should also lack a trailing newline.
 2015-07-07 17:01:48 -05:00
Edward Thomson
286befeb96 Merge pull request #3298 from ethomson/gitauthors 
meta: Add Antoine Pelisse to hall-of-fame list
 2015-07-07 16:55:32 -05:00
Edward Thomson
01e031d921 meta: Add Antoine Pelisse to hall-of-fame list 
Antoine Pelisse <apelisse@gmail.com> has kindly allowed his
contributions to core git to be used under the libgit2 license.
 2015-07-07 12:40:15 -05:00
Tony Kelman
febc8c4612 Fix undefined reference with old versions of openssl 
Versions prior to 0.9.8f  did not have this function, rhel/centos5 are still on a
heavily backported version of 0.9.8e and theoretically supported until March 2017

Without this ifdef, I get the following link failure:
```
CMakeFiles/libgit2_clar.dir/src/openssl_stream.c.o: In function `openssl_connect':
openssl_stream.c:(.text+0x45a): undefined reference to `SSL_set_tlsext_host_name'
collect2: error: ld returned 1 exit status
make[6]: *** [libgit2_clar] Error 1
```
 2015-07-07 06:55:05 -04:00
Carlos Martín Nieto
3704ac35d3 Merge pull request #3277 from git-up/git_diff_index_to_index 
Added git_diff_index_to_index()
 2015-07-07 12:38:47 +02:00
Carlos Martín Nieto
ea445e0602 Merge pull request #3288 from ethomson/getenv 
git__getenv: utf-8 aware env reader
 2015-07-07 00:48:17 +02:00
Carlos Martín Nieto
3c831113ca Merge pull request #3202 from jeffhostetler/windows_stack_trace 
Stacktraces with CRTDBG memory leaks on Windows
 2015-07-06 19:04:48 +02:00
Carlos Martín Nieto
a0bdfe3241 travis: don't install CMake on OS X 
Homebrew will error out because it's already installed.
 2015-07-06 18:42:39 +02:00
Carlos Martín Nieto
d41b8ed083 travis: update the homebrew db 
We need to make sure we are asking for the current version of packages,
or we might get 404s from the download service.
 2015-07-06 18:32:31 +02:00
Carlos Martín Nieto
159061a8ce Update CHANGELOG with the release number 2015-07-06 16:23:44 +02:00
Carlos Martín Nieto
4d6362b168 Merge pull request #3290 from libgit2/cmn/filter-doc 
filter: add docs for streaming filters
 2015-07-03 16:29:32 +02:00
Carlos Martín Nieto
a94d3e68bf filter: add docs for streaming filters 
These functions are available on the public API but don't have any
documentation, so they don't appear on the API reference. Fix that.
 2015-07-03 14:36:41 +02:00
Carlos Martín Nieto
99090a8522 Merge pull request #3289 from ethomson/warnings4 
iterator_walk: cast away constness for free
 2015-07-03 00:38:33 +02:00
Edward Thomson
e069c621bd git__getenv: utf-8 aware env reader 
Introduce `git__getenv` which is a UTF-8 aware `getenv` everywhere.
Make `cl_getenv` use this to keep consistent memory handling around
return values (free everywhere, as opposed to only some platforms).
 2015-07-02 16:35:43 +00:00
Carlos Martín Nieto
f034c8518e Merge pull request #3287 from ethomson/filter_test_cleanup 
filter::stream: free the filter sanely
 2015-07-02 17:55:16 +02:00
Edward Thomson
dd6b24b19a iterator_walk: cast away constness for free 2015-07-02 10:36:15 -05:00
Edward Thomson
79306d8d59 filter::stream: free the filter sanely 
Don't use the filter's free callback to free the actual data structure
holding the filter, as we may not always actually initialize it (the
test may be skipped).
 2015-07-02 10:21:48 -05:00