proxmox-mirrors/libgit2
1
0
Fork 0
mirror of https://git.proxmox.com/git/libgit2 synced 2025-06-03 08:46:25 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
8,792 Commits 2 Branches 0 Tags 22 MiB
f555f7cd70
Commit Graph

8792 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Carlos Martín Nieto
eb94199fe4 Merge pull request #3286 from libgit2/cmn/submodule-duplicate 
Correctly delimit the keys for submodule lookup
 2015-07-02 08:35:05 +02:00
Carlos Martín Nieto
e0af3cb30c submodule: correctly delimit the keys to use for lookup 
The regex we use to look at the gitmodules file does not correctly
delimit the name of submodule which we want to look up and puts '.*'
straight after the name, maching on any submodule which has the seeked
submodule as a prefix of its name.

Add the missing '\.' in the regex so we want a full stop to exist both
before and after the submodule name.
 2015-07-01 21:15:06 +02:00
Carlos Martín Nieto
e8e848a8da submodule: add failing test for loading the wrong submodule 
When two submodules are fairly similar, we may end up loading the wrong
one.
 2015-07-01 21:14:55 +02:00
Edward Thomson
bf7d2761d4 Merge pull request #3280 from linquize/8.3 
Fix 8.3 filename tests failure when 8.3 is disabled
 2015-07-01 12:02:27 -05:00
Carlos Martín Nieto
34065968ed submodule: completely remove reload_all 
The function was removed, but its declaration and changelog entry about
its removal were forgotten.

The comment in the test doesn't make any sense as the function doesn't
exist anymore, so get rid of it as well.
 2015-07-01 17:49:07 +02:00
Edward Thomson
63924435a1 filters: custom filters with wildcard attributes 
Allow custom filters with wildcard attributes, so that clients
can support some random `filter=foo` in a .gitattributes and look
up the corresponding smudge/clean commands in the configuration file.
 2015-07-01 09:40:11 -05:00
Linquize
526f91f552 Fix 8.3 filename tests failure when 8.3 is disabled 2015-07-01 14:58:13 +08:00
Edward Thomson
aa92c318a2 Merge pull request #3278 from mplough/master 
Fix #3093 - remove declaration of unused function git_fetch__download…
 2015-06-30 17:38:22 -05:00
Matthew Plough
9126ccac96 Fix #3093 - remove declaration of unused function git_fetch__download_pack 
Function was added in commit 2c982daa2e on October 5, 2011,
and removed in commit 41fb1ca0ec on October 29, 2012.
Given the length of time it's gone unused, it's safe to remove now.
 2015-06-30 16:48:47 -04:00
Carlos Martín Nieto
2f60073dc5 Merge pull request #3273 from ethomson/warnings3 
More warnings
 2015-06-30 21:40:20 +02:00
Edward Thomson
cb58fb24f5 Merge pull request #3275 from git-up/http_fix 
http: fixed leak when asking for credentials again
 2015-06-30 13:39:07 -05:00
Pierre-Olivier Latour
ccef5adb63 Added git_diff_index_to_index() 2015-06-30 10:03:32 -07:00
Pierre-Olivier Latour
1630981e6b http: fixed leak when asking for credentials again 
t->cred might have been allocated the previous time and needs to be
freed before asking caller for credentials again.
 2015-06-30 09:03:23 -07:00
Edward Thomson
eb29292aed index tests: add eol to avoid compiler warning 2015-06-30 14:31:07 +00:00
Edward Thomson
504b069701 checkout test: mark unused vars 2015-06-30 14:31:07 +00:00
Edward Thomson
0305721c10 winhttp: remove unused var 2015-06-30 14:31:07 +00:00
Edward Thomson
69c8bf7e0d posix compat: include sys/stat.h for mingw 2015-06-30 14:31:07 +00:00
Edward Thomson
49840056da diff: use size_t format 2015-06-30 14:31:07 +00:00
Edward Thomson
3451c871cb Merge pull request #3271 from jeffhostetler/more_leaks 
memory leak refspec.c
 2015-06-30 09:29:41 -05:00
Jeff Hostetler
64e6b5b035 fix memory leak in refspec.c on errors. 2015-06-30 09:41:17 -04:00
Carlos Martín Nieto
7bfdd1c2d2 Merge pull request #3270 from ethomson/warnings2 
Remove some warnings
 2015-06-30 10:21:06 +02:00