proxmox-mirrors/libgit2
1
0
Fork 0
mirror of https://git.proxmox.com/git/libgit2 synced 2025-05-12 13:35:59 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
8,064 Commits 2 Branches 0 Tags 22 MiB
9f73e1f335
Commit Graph

8064 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Edward Thomson
3cda9cf247 checkout: report correct invalid path 2015-03-23 11:30:30 -04:00
Carlos Martín Nieto
2a0f67f04c git: make sure to close the network stream 
In case of a bad url or other error during the connection setup, we
close the stream via free.
 2015-03-21 21:49:27 +01:00
Edward Thomson
a3f693e9a1 Merge pull request #3003 from shawnl/master 
fix changelog
 2015-03-20 16:57:32 -04:00
Shawn Landden
b8c508087b fix changelog 2015-03-20 10:18:12 -07:00
Edward Thomson
8311db0cf8 Merge pull request #3000 from libgit2/vmg/mkdir-ext 
mkdir-ext: Assume directories don't exist; fix all race cases
 2015-03-19 15:10:58 -04:00
Vicent Marti
d88e6e9b3c mkdir-ext: Retry lstat on EEXIST race 2015-03-19 18:38:13 +01:00
Tony Kelman
b631e0d96d Use swprintf_s everywhere except mingw.org 2015-03-19 08:42:45 -07:00
Patrick Steinhardt
0a2f99fd13 examples: add remote example. 2015-03-19 08:45:34 +01:00
Carlos Martín Nieto
2c4e90f3fa Merge pull request #2996 from ethomson/dll_comments 
win32 resource: allow custom comments field in DLL
 2015-03-19 01:03:41 +01:00
Edward Thomson
523526e55d win32 resource: allow custom comments field in DLL 2015-03-18 18:25:14 -04:00
Edward Thomson
89ba9f1acc Merge pull request #2967 from jacquesg/merge-whitespace 
Allow merges of files (and trees) with whitespace problems/fixes
 2015-03-18 13:17:04 -04:00
Leo Yang
142e5379ca Add a custom param to git_smart_subtransport_definition 
The smart transport has already take the payload param. For the
sub transport a payload param is useful for the implementer.
 2015-03-18 13:15:21 -04:00
Carlos Martín Nieto
7568bdf4ab Merge pull request #2993 from ethomson/clar_update 
clar: update to 08f434d
 2015-03-18 05:04:50 +01:00
Carlos Martín Nieto
03b51b5d94 Merge pull request #2955 from git-up/update_tips_fixes 
Update tips fixes
 2015-03-18 05:04:12 +01:00
Carlos Martín Nieto
83ad46f726 Merge remote-tracking branch 'ethomson/submodule_8dot3' 2015-03-18 04:59:16 +01:00
Edward Thomson
4c2e6b1e87 Merge pull request #2985 from claudiuolteanu/patch-1 
Lower case the include directive of windows header
 2015-03-17 23:35:52 -04:00
Edward Thomson
fa8a38a490 Merge pull request #2983 from jeffhostetler/jeffhostetler/perf_merge_lazy_binary_check 
PERF: In MERGE, lazily compute is_binary
 2015-03-17 22:22:38 -04:00
Edward Thomson
08c29c4451 clar: update to 08f434d 2015-03-17 19:04:48 -04:00
Edward Thomson
f0593a6b52 Merge pull request #2991 from sba1/fix-uninitialized-data-access-remote-update-tips 
Initialize refs vector in git_remote_update_tips().
 2015-03-17 18:35:28 -04:00
Sebastian Bauer
cdedef4061 Initialize refs vector in git_remote_update_tips(). 
Otherwise, bailing out early when ls_to_vector() fails accesses
uninitialized memory.
 2015-03-17 22:03:51 +01:00
Carlos Martín Nieto
c84a9dd2da local: recusrively insert non-branch objects into the packfile 
When we insert e.g. a tag or tagged object into the packfile, we must
make sure to insert any referenced objects as well, or we will have
broken links.

Use the recursive version of packfile insertion to make sure we send
over not just the tagged object but also the objects it references.
 2015-03-17 20:51:47 +01:00
Carlos Martín Nieto
84511143fd tree: add more correct error messages for not found 
Don't use the full path, as that's not what we are asserting does not
exist, but just the subpath we were looking up.
 2015-03-17 20:51:14 +01:00
Carlos Martín Nieto
a61fa4c0c7 packbuilder: introduce git_packbuilder_insert_recur() 
This function recursively inserts the given object and any referenced
ones. It can be thought of as a more general version of the functions to
insert a commit or tree.
 2015-03-17 20:51:14 +01:00
Carlos Martín Nieto
d23fb5c943 clone: add failing test for local transport with a tag 
When there is a tag, we must make sure that we get all referenced
objects from this tag as well. This failing test shows that e.g. when
there is a tagged tree, we insert the top tree but do not descend, thus
causing the clone to have broken links.
 2015-03-17 20:50:39 +01:00
Carlos Martín Nieto
385449b1df note: use a git_buf to return the default namespace 
The caller has otherwise no way to know how long the string will be
allocated or ability to free it.

This fixes #2944.
 2015-03-17 20:50:02 +01:00
Tony Kelman
7aa96593fa set PKG_CONFIG_LIBDIR in toolchain-mingw32.cmake 2015-03-17 12:05:07 -07:00
Jacques Germishuys
70b0f128c8 Added changelog entries for whitespace and patience merges. 2015-03-17 16:34:36 +02:00
Edward Thomson
9bbc8f350b Merge pull request #2962 from libgit2/cmn/reflog-annotated 
Add annotated versions of ref-modying functions
 2015-03-17 10:21:28 -04:00
Edward Thomson
7800048afb Merge pull request #2972 from libgit2/cmn/pack-objects-walk 
[WIP] Smarter pack-building
 2015-03-17 10:06:50 -04:00
Edward Thomson
828e595969 Merge pull request #2982 from libgit2/cmn/stream-check-ec 
Don't ask for a stream's certificate unless it's encrypted
 2015-03-17 09:44:56 -04:00
Edward Thomson
c07d02064d Merge pull request #2977 from pks-t/submodule-sync-url-fix 
Fix git_submodule_sync writing URL to wrong key.
 2015-03-17 09:44:25 -04:00
Tony Kelman
547517d7f9 use a different .def file for 64 bit 2015-03-16 14:59:20 -07:00
Claudiu Olteanu
118e6fdc8f Lower case the include directive of windows header 
Since the Linux platform has a case sensitive file system, the header name should be lower case for cross compiling purposes. (On Linux, the mingw header is called ```windows.h```).
 2015-03-16 23:08:16 +02:00
Tony Kelman
d612e48ecc Fix out-of-tree build 
link against crypt32 for CertFreeCertificateContext
 2015-03-16 13:59:33 -07:00
Alex Crichton
3066026b04 Fix build on mingw-w64 2015-03-16 13:59:29 -07:00
klutzy
e613e6ebb8 patch so mingw-w64 can build 2015-03-16 13:59:02 -07:00
Philip Kelley
8f426d7dd2 Win32: Enable WinHTTP for MinGW 2015-03-16 12:59:55 -07:00
Jeff Hostetler
fea24c5300 PERF: In MERGE, lazily compute is_binary 2015-03-16 15:54:53 -04:00
Carlos Martín Nieto
84d83b8e75 http: do not try to use the cert callback on unencrypted streams 
When the user has a certificate check callback set, we still have to
check whether the stream we're using is even capable of providing a
certificate.

In the case of an unencrypted certificate, do not ask for it from the
stream, and do not call the callback.
 2015-03-16 19:43:46 +01:00
Carlos Martín Nieto
29e7ae5d81 Add failing test for cert callback with non-ecrypted stream 
When we have an HTTP stream and have set the certificatre check
callback, we currently fail as we ask the unencrypted stream for its
certificate.
 2015-03-16 19:39:05 +01:00
Carlos Martín Nieto
8acf058ff7 CHANGELOG: add notes about the annotated ref-modifying functions 2015-03-16 16:58:47 +01:00
Carlos Martín Nieto
a5815a2afb Add tests for the annotated versions of ref-modifying functions 
This also brings the soft-reset tests back to life. The function name
was missing an underscore, meaning they had not been running.
 2015-03-16 16:57:30 +01:00
Carlos Martín Nieto
62dd4d71db annotated_commit: provide a constructor from a revspec 
This extra constructor will be useful for the annotated versions of
ref-modifying functions, as it allows us to create a commit with the
extended sha syntax which was used to retrieve it.
 2015-03-16 16:57:30 +01:00
Carlos Martín Nieto
62d38a1ddb Add annotated commit versions of reflog-modifying functions 
We do not always want to put the id directly into the reflog, but we
want to speicfy what a user typed. For this use-case we provide
annotated version of a few functions which let the caller specify what
user-friendly name was used when asking for the operation.
 2015-03-16 16:57:30 +01:00
Jacques Germishuys
74c37c2a48 Added options to enable patience and minimal diff drivers 2015-03-16 09:53:27 +02:00
Jacques Germishuys
13de936316 Collapse whitespace flags into git_merge_file_flags_t 2015-03-16 09:53:27 +02:00
Jacques Germishuys
f29dde6828 Renamed git_merge_options 'flags' to 'tree_flags' 2015-03-16 09:53:27 +02:00
Jacques Germishuys
0f24cac2b9 Added tests to merge files and branches with whitespace problems and fixes 2015-03-16 09:53:27 +02:00
Jacques Germishuys
45a86bbfd0 Allow for merges with whitespace discrepancies 2015-03-16 09:53:27 +02:00
Carlos Martín Nieto
d675982a15 Merge pull request #2975 from git-up/diff_index_retain 
Avoid retaining / releasing the index more than necessary when GIT_DIFF_...
 2015-03-15 00:24:36 +01:00