proxmox-mirrors/libgit2
1
0
Fork 0
mirror of https://git.proxmox.com/git/libgit2 synced 2025-11-03 23:45:05 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
7,972 Commits 2 Branches 0 Tags 22 MiB
c02a0e46eb
Commit Graph

7972 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Jacques Germishuys
0beb7fe427 Added missing error handling path 2014-12-30 12:33:40 +02:00
Jacques Germishuys
3dbd9a0e86 Check the result of git_buf_joinpath 2014-12-30 12:33:39 +02:00
Edward Thomson
4ceb388b13 Merge pull request #2784 from jacquesg/undef-stat 
Undef stat for Mingw
 2014-12-29 14:22:36 -06:00
Jacques Germishuys
6f73e02605 Plug some leaks 2014-12-29 18:18:49 +02:00
Jacques Germishuys
a1daec3c53 Undef stat first 2014-12-29 18:11:33 +02:00
Edward Thomson
ddf9532498 Merge pull request #2783 from libgit2/cmn/treebuilder-new 
treebuilder: rename _create() to _new()
 2014-12-29 09:30:05 -06:00
Edward Thomson
61cf3823e3 Merge pull request #2777 from sba1/amigaos-get-timer 
Added git__timer() variant for AmigaOS.
 2014-12-29 09:26:57 -06:00
Sebastian Bauer
7cf86f923a Added AmigaOS-specific implementation of git__timer(). 
The clock_gettime() function is normally not available under
AmigaOS, hence another solution is required. We are using now
GetUpTime() that is present in current versions of this
operating system.
 2014-12-28 10:35:47 +01:00
Carlos Martín Nieto
208a2c8aef treebuilder: rename _create() to _new() 
This function is a constructor, so let's name it like one and leave
_create() for the reference functions, which do create/write the
reference.
 2014-12-27 12:09:11 +00:00
Carlos Martín Nieto
aad27e6ef6 Add a few missing CHANGELOG entries 2014-12-27 11:56:00 +00:00
Carlos Martín Nieto
5692dcf181 Merge pull request #2772 from ethomson/case_changing_rename 
Case changing rename
 2014-12-24 06:24:42 +00:00
Carlos Martín Nieto
171c2ff121 Merge pull request #2778 from ethomson/whitespace_85 
don't treat 0x85 as whitespace
 2014-12-24 06:23:36 +00:00
Carlos Martín Nieto
d6398d3558 Merge pull request #2779 from ethomson/openssl_export 
global: include sys/openssl.h for GIT_EXPORT of fn
 2014-12-24 06:19:02 +00:00
Edward Thomson
73f0278e5d global: include sys/openssl.h for GIT_EXPORT of fn 
The openssl setup function needs to be GIT_EXPORT'ed, be sure
to include the `sys/openssl.h` header so that it is appropriately
decorated as an export function.
 2014-12-23 16:40:01 -06:00
Edward Thomson
fe5f7722f5 don't treat 0x85 as whitespace 
A byte value of 0x85 is not whitespace, we were conflating that with
U+0085 (UTF8: 0xc2 0x85).  This caused us to incorrectly treat valid
multibyte characters like U+88C5 (UTF8: 0xe8 0xa3 0x85) as whitespace.
 2014-12-23 11:27:01 -06:00
Edward Thomson
40d791545a Always checkout with case sensitive iterator 
On a case-insensitive filesystem, we need to deal with case-changing
renames (eg, foo -> FOO) by removing the old and adding the new,
exactly as if we were on a case-sensitive filesystem.

Update the `checkout::tree::can_cancel_checkout_from_notify` test, now
that notifications are always sent case sensitively.
 2014-12-23 10:14:04 -06:00
Edward Thomson
61ee5b0e57 Introduce test for checkout case-changing rename 2014-12-23 10:14:01 -06:00
Carlos Martín Nieto
e8cd432123 Merge pull request #2775 from ethomson/index_entrycounts 
index: reuc and name entrycounts should be size_t
 2014-12-23 14:09:01 +00:00
Edward Thomson
2fe8157e1b index: reuc and name entrycounts should be size_t 
For the REUC and NAME entries, we use size_t internally, and we take
size_t for the get_byindex() functions, but the entrycount() functions
strangely cast to an unsigned int instead.
 2014-12-22 18:42:03 -06:00
Jameson Miller
9d1f97df10 Introduce a convenience function for submodule update 
This introduces the functionality of submodule update in
'git_submodule_do_update'. The existing 'git_submodule_update' function is
renamed to 'git_submodule_update_strategy'. The 'git_submodule_update'
function now refers to functionality similar to `git submodule update`,
while `git_submodule_update_strategy` is used to get the configured value
of submodule.<name>.update.
 2014-12-22 16:37:35 -05:00
Jameson Miller
b2ab887e11 submodule init should resolve relative url paths 
Submodule init should handle relative paths in .gitmodules files
and resolve these urls when updating the git config file.
 2014-12-22 16:35:45 -05:00
Edward Thomson
0bb237ed89 Merge pull request #2773 from ethomson/findpkgconfig 
cmake: include FindPkgConfig for windows
 2014-12-22 13:10:04 -06:00
Edward Thomson
6e1205ef62 cmake: include FindPkgConfig for windows 
Apparently FindPkgConfig is not included by default on VS builds,
only Unix and Unix-like (mingw) builds.
 2014-12-22 12:40:04 -06:00
Edward Thomson
62d66a4ac5 Merge pull request #2745 from libgit2/cmn/pkg-config-ssh 
Find libssh2 via pkg-config
 2014-12-22 10:22:03 -06:00
Edward Thomson
d147900ea4 Merge pull request #2759 from libgit2/cmn/openssl-sys 
Make OpenSSL locking warnings more severe
 2014-12-20 21:24:45 -06:00
Edward Thomson
25a03d4ad4 Merge pull request #2760 from libgit2/cmn/init-readme 
Mention the init function in the README
 2014-12-20 21:23:55 -06:00
Edward Thomson
c7d9839f54 Merge pull request #2763 from libgit2/cmn/local-proto-progress 
Show progress output on fetch for the local transport
 2014-12-20 21:22:30 -06:00
Edward Thomson
0de26b7c4a Merge pull request #2767 from linquize/winpath 
More Windows Path checking
 2014-12-20 21:18:15 -06:00
Carlos Martín Nieto
6afc0bfad9 Merge pull request #2768 from dprofeta/fix/c++-refs 
Fix public header on sys/refs.h
 2014-12-20 08:06:48 +00:00
Linquize
6987a580f7 Add more Windows reserved filenames 2014-12-19 23:54:42 +08:00
Linquize
6fd00266a8 COM0 is a valid path, although Windows Explorer does not allow to create this 2014-12-19 23:54:01 +08:00