proxmox-mirrors/libgit2
1
0
Fork 0
mirror of https://git.proxmox.com/git/libgit2 synced 2025-10-31 07:41:33 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
10,103 Commits 2 Branches 0 Tags 22 MiB
c9efa995e4
Commit Graph

10103 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Edward Thomson
a93acf9169 Merge pull request #2818 from leoyanggit/openssl_option 
Add option to turn off OpenSSL
 2015-01-14 10:23:38 -06:00
Edward Thomson
85880693d5 Merge branch 'pr/2740' 2015-01-14 10:19:28 -06:00
Pierre-Olivier Latour
b3837d4d2b Always use GIT_HASHSIG_SMART_WHITESPACE when diffing for merges 
git_merge_tree_flag_t cannot contain any GIT_DIFF_FIND_xxx flags so there's not point in checking for them
 2015-01-14 10:18:00 -06:00
Pierre-Olivier Latour
36fc549781 Added GIT_HASHSIG_ALLOW_SMALL_FILES to allow computing signatures for small files 
The implementation of the hashsig API disallows computing a signature on
small files containing only a few lines. This new flag disables this
behavior.

git_diff_find_similar() sets this flag by default which means that rename
/ copy detection of small files will now work. This in turn affects the
behavior of the git_status and git_blame APIs which will now detect rename
of small files assuming the right options are passed.
 2015-01-14 10:17:56 -06:00
Leo Yang
7641327c8b Add option to turn off OpenSSL 2015-01-13 16:53:07 -05:00
nulltoken
e6911dff9d Merge pull request #2817 from PeterDaveHello/patch-1 
Use svg instead of png to get better image quality
 2015-01-13 20:35:08 +01:00
Carlos Martín Nieto
16bcf0c79c Pre-fill the changelog with the subheadings 2015-01-13 19:29:00 +01:00
Peter Dave Hello
c5c8ece1d6 Use svg instead of png to get better image quality 2015-01-14 02:14:38 +08:00
Carlos Martín Nieto
04bdd97f2b Merge pull request #2815 from ethomson/example 
clone example: don't divide by zero
 2015-01-12 08:59:46 +01:00
Edward Thomson
9af3c4169c clone example: don't divide by zero 
Local transports don't have data about the size, avoid dividing by
zero in the callback.
 2015-01-10 18:24:27 +00:00
Carlos Martín Nieto
b91f28be7d Reformat the changelog 
This should provide a easier way to see what kinds of changes we have,
and a single place to look at the breaking changes.
 2015-01-10 00:49:20 +01:00
Carlos Martín Nieto
d4b2410126 Merge commit '4b1018d24f980273528743c27c47ceb96cb720bd' 
Fix crash in free() when git_buf_grow() fails.
 2015-01-09 16:47:48 +01:00
Jeff Hostetler
4b1018d24f Fix crash in free() when git_buf_grow() fails. 2015-01-09 16:46:44 +01:00
Carlos Martín Nieto
fe8399fe9b Fix warning 2015-01-09 16:29:08 +01:00
Carlos Martín Nieto
788c5f1ca8 Merge pull request #2810 from ethomson/remove_symlinks 
Remove symlinks from the repository
 2015-01-09 10:23:08 +01:00
Edward Thomson
aebdbcd954 Merge pull request #2811 from ethomson/remote_leak 
remote: plug leak
 2015-01-08 17:27:58 -06:00
Edward Thomson
365d367238 submodule::init tests: free some leaks 2015-01-08 22:31:15 +00:00
Edward Thomson
a8846da7b3 remote: plug leak 2015-01-08 13:45:22 -06:00
Edward Thomson
3b40ed897f repo::init test: create hook symlink 
Remove the hook symlink from the test resources, so that we can
have a source tree that is easy to zip up and copy around on systems
that don't support symlinks.  Create it dynamically at test execution
instead.
 2015-01-08 19:23:37 +00:00
Edward Thomson
1646412d8f Merge pull request #2802 from calavera/remote_create_prune_config 
Load prune configuration when a remote is created.
 2015-01-08 11:20:44 -06:00
David Calavera
de4a75f977 Fix more indentation. 2015-01-07 09:26:36 -08:00
David Calavera
c868981f0e Add extern function to initialize submodule update options. 2015-01-07 09:04:49 -06:00
Carlos Martín Nieto
6a6c24e016 Merge pull request #2806 from ethomson/changelog 
CHANGELOG: we've added git_describe
 2015-01-07 11:54:08 +00:00
Edward Thomson
2ce37794d0 Merge pull request #2805 from ethomson/msvc 
submodule: declare vars at top of func block
 2015-01-06 18:34:55 -06:00
Edward Thomson
9b22f8b414 Merge pull request #2803 from ethomson/appveyor 
Add appveyor yaml
 2015-01-06 18:34:43 -06:00
Edward Thomson
61cd037e0b CHANGELOG: we've added git_describe 2015-01-06 17:18:57 -06:00
Edward Thomson
388ca7e73c Add appveyor yaml 2015-01-06 17:10:50 -06:00
Edward Thomson
5018e2c639 submodule: declare vars at top of func block 2015-01-06 17:08:38 -06:00
Carlos Martín Nieto
007f3ff6fa Merge pull request #2801 from ethomson/changelog 
CHANGELOG: add missing 0.22 changes
 2015-01-05 21:34:26 +00:00
David Calavera
66b71ea5f5 Fix intentation. 2015-01-05 13:33:36 -08:00
Edward Thomson
974d21c899 CHANGELOG: add missing 0.22 changes 2015-01-05 15:28:55 -06:00
Carlos Martín Nieto
239bdc5761 Merge pull request #2799 from ethomson/merge_doc 
Better document `git_merge_commits`
 2015-01-05 21:28:30 +00:00
David Calavera
1ef3f0cebb Load prune configuration when a remote is created. 2015-01-05 13:24:11 -08:00
Carlos Martín Nieto
c8b64f70e0 Fix the version in CHANGELOG to 0.22 
The release after 0.21 is 0.22. Add a new heading for the changes since
0.22.
 2015-01-05 20:20:08 +00:00
Carlos Martín Nieto
9b2efc15a2 Bump version to 0.22 
Bump the version number to 0.22.0 and the SOVERSION to 22.
 2015-01-05 20:16:48 +00:00
Carlos Martín Nieto
0c6012293a Merge commit 'refs/pull/2632/head' of github.com:libgit2/libgit2 2015-01-05 20:10:43 +00:00
Edward Thomson
5e44d9bcb6 Better document git_merge_commits 
`git_merge_commits` (and thus `git_merge`) do not use the same
strategy as `git-merge-recursive` wherein they can produce an
artificial common ancestor that is the merge of all common
ancestors.  Document this accordingly.
 2015-01-05 11:35:18 -06:00
Carlos Martín Nieto
c4a2fd5c1d Plug a couple of leaks 2015-01-04 17:39:43 +00:00
Carlos Martín Nieto
55d9c29aa0 Merge pull request #2792 from swisspol/fix_remote_download 
Fixed internal push state not being cleared when calling git_remote_download()
 2015-01-04 16:44:33 +00:00
Carlos Martín Nieto
e48d0266b8 Merge pull request #2794 from calavera/include_right_common 
Include git2/common.h in sys/openssl.h.
 2015-01-04 12:33:18 +00:00
David Calavera
d76e9df9a2 Include git2/common.h in sys/openssl.h. 2015-01-02 15:56:03 -08:00
Pierre-Olivier Latour
c070ac64fd Fixed internal push state not being cleared on download 
git_remote_download() must also clear the internal push state resulting from a possible earlier push operation. Otherwise calling git_remote_update_tips() will execute the push version instead of the fetch version and among other things, tags won't be updated.
 2015-01-01 04:19:33 -08:00
Edward Thomson
56065c0954 Merge pull request #2788 from swisspol/fix_docs 
Fixed git_revert() documentation
 2014-12-31 09:27:44 -06:00
Pierre-Olivier Latour
f8263472d1 Fixed git_revert() documentation 2014-12-30 15:54:30 -08:00
Edward Thomson
a3ef70bb40 Merge pull request #2761 from libgit2/cmn/fetch-prune 
Remote-tracking branch prunning
 2014-12-30 11:53:55 -06:00
Edward Thomson
c4c47fc286 Merge pull request #2762 from libgit2/cmn/hide-push 
remote: remove git_push from the public API
 2014-12-30 11:53:45 -06:00
Carlos Martín Nieto
8aba3d47cf Update CHANGELOG for pruning 2014-12-30 17:06:04 +00:00
Carlos Martín Nieto
fe794b2ea7 remote: remove git_push from the public API 
Instead we provide git_remote_upload() and git_remote_update_tips() in
order to have a parallel API for fetching and pushing.
 2014-12-30 17:02:50 +00:00
Carlos Martín Nieto
13da562a87 Merge pull request #2785 from jacquesg/coverity 
Coverity fixes
 2014-12-30 16:48:52 +00:00
Jacques Germishuys
dfda1cf507 Check for OOM 2014-12-30 12:33:40 +02:00