proxmox-mirrors/libgit2
1
0
Fork 0
mirror of https://git.proxmox.com/git/libgit2 synced 2025-05-28 08:58:41 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
7,976 Commits 2 Branches 0 Tags 22 MiB
50fdfe2bcb
Commit Graph

7976 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Carlos Martín Nieto
50fdfe2bcb revwalk: don't insert uninteresting commits into the queue 
When a commit is first set as unintersting and then pushed, we must take
care that we do not put it into the commit list as that makes us return
at least that commit (but maybe more) as we've inserted it into the list
because we have the assumption that we want anything in the commit list.
 2015-04-08 23:51:49 +02:00
Carlos Martín Nieto
5a503fffbc revwalk: add failing test for hiding and then pushing a commit 
When we hide a commit which we later push into the revwalk, we do not
handle this well and return commits which we should not.
 2015-04-08 23:42:36 +02:00
Edward Thomson
47f3740025 Merge pull request #3031 from git-up/git_index_add 
Entry argument passed to git_index_add_frombuffer() should be const
 2015-04-04 09:17:59 -05:00
Pierre-Olivier Latour
807566d554 Entry argument passed to git_index_add_frombuffer() should be const 2015-04-03 18:59:11 -07:00
Edward Thomson
92a8194c44 Merge pull request #3022 from ethomson/gitignore_vim 
gitignore: ignore vim swapfiles
 2015-04-01 11:13:04 -04:00
Edward Thomson
bb3d67625b gitignore: ignore vim swapfiles 2015-03-30 09:33:02 -04:00
Edward Thomson
de355f2341 Merge pull request #3011 from ethomson/filter_zero_tempbuf 
Clear temporary buffer when filtering
 2015-03-25 13:14:28 -04:00
Edward Thomson
669ae27422 filter: clear the temp_buf if we're using one 
If we are using a temporary buffer for filtering, be sure to clear
it before using it, in case the file that we are filtering is empty.
 2015-03-25 10:20:59 -04:00
Jacques Germishuys
7c2b9e063b Illustrate bad checkout on Windows 2015-03-25 10:20:47 -04:00
Carlos Martín Nieto
585094cc46 Merge pull request #3017 from ethomson/leaks 
squash some leaks
 2015-03-25 02:22:42 +01:00
Edward Thomson
78db0239db squash some leaks 2015-03-24 20:58:00 +00:00
Edward Thomson
c5e071873c Merge pull request #2990 from leoyanggit/custom_param 
Add a custom param to git_smart_subtransport_definition
 2015-03-24 14:03:51 -04:00
Edward Thomson
aa7a4a5077 Merge pull request #2986 from tkelman/mingw_winhttp 
WinHTTP for MinGW
 2015-03-24 09:06:20 -04:00
Edward Thomson
95d1624b8d Merge pull request #2947 from libgit2/cmn/notes-buf 
note: use a git_buf to return the default namespace
 2015-03-24 08:34:12 -04:00
Carlos Martín Nieto
5dcd2d6628 Merge pull request #2858 from pks-t/remote-squashed 
examples: add remote example.
 2015-03-24 10:37:12 +01:00
Carlos Martín Nieto
7c3834d124 Merge pull request #3010 from ethomson/checkout_invalid_path_err 
checkout: report correct invalid path
 2015-03-24 10:18:44 +01:00
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
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