proxmox-mirrors/libgit2
1
0
Fork 0
mirror of https://git.proxmox.com/git/libgit2 synced 2025-12-05 06:28:25 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
6,069 Commits 2 Branches 0 Tags 22 MiB
e82b6d13d2
Commit Graph

3933 Commits

Author SHA1 Message Date
Edward Thomson
238e814972 Summarize empty messages 2014-01-22 14:41:04 -05:00
Edward Thomson
e8b81c698c Preserve tree filemode in index during checkout 
Don't try to determine whether the system supports file modes
when putting the tree data in the index during checkout.  The tree's
mode is canonical and did not come from stat(2) in the first place.
 2014-01-22 13:26:30 -05:00
Nicolas Hake
c05cd7924d Drop git_patch_to_str 
It's hard or even impossible to correctly free the string buffer
allocated by git_patch_to_str in some circumstances. Drop the function
so people have to use git_patch_to_buf instead - git_buf has a dedicated
destructor.
 2014-01-22 17:51:32 +01:00
Nicolas Hake
450e8e9e62 Expose patch serialization to git_buf 
Returning library-allocated strings from libgit2 works fine on Linux,
but may cause problems on Windows because there is no one C Runtime that
everything links against. With libgit2 not exposing its own allocator,
freeing the string is a gamble.

git_patch_to_str already serializes to a buffer, then returns the
underlying memory. Expose the functionality directly, so callers can use
the git_buf_free function to free the memory later.
 2014-01-22 13:40:19 +01:00
Edward Thomson
0ef19fe14c Merge submodules 2014-01-20 18:07:17 -05:00
Edward Thomson
db3462ce77 Support union merges 2014-01-20 17:15:15 -05:00
Edward Thomson
0e1ba46cfb Remove the "merge none" flag 
The "merge none" (don't automerge) flag was only to aide in
merge trivial tests.  We can easily determine whether merge
trivial resulted in a trivial merge or an automerge by examining
the REUC after automerge has completed.
 2014-01-20 17:15:14 -05:00
Edward Thomson
6891a862bb Load merge.conflictstyle setting from config 2014-01-20 17:15:13 -05:00
Edward Thomson
e651e8e2b5 Introduce diff3 mode for checking out conflicts 2014-01-20 17:15:13 -05:00
Edward Thomson
6b92c99bcb Don't try to merge binary files 2014-01-20 17:15:12 -05:00
Edward Thomson
c1d648c5c6 merge_file should use more aggressive levels 
The default merge_file level was XDL_MERGE_MINIMAL, which will
produce conflicts where there should not be in the case where
both sides were changed identically.  Change the defaults to be
more aggressive (XDL_MERGE_ZEALOUS) which will more aggressively
compress non-conflicts.  This matches git.git's defaults.

Increase testing around reverting a previously reverted commit to
illustrate this problem.
 2014-01-20 17:15:11 -05:00
Russell Belfer
d62bf0bf83 Merge pull request #2063 from linquize/reflog-msg-null 
git_reflog_entry_message can be null
 2014-01-20 10:15:05 -08:00
Patrick Reynolds
7cbc6241cf fix corner cases and an undefined behavior 2014-01-20 11:41:21 -06:00
Linquize
e7c66fc89b git_reflog_entry_message can be null 2014-01-20 23:32:18 +08:00
Edward Thomson
b97e55f2f1 Merge pull request #2059 from linquize/git_config_get_crash 
Fix segfault when calling git_config_get_* functions when a config fails to load
 2014-01-18 14:48:59 -08:00
Linquize
c24130e068 Fix segfault when calling git_config_get_* functions when a config fails to load 
Reinitialize the result code of get_entry() to GIT_ENOTFOUND
 2014-01-18 22:58:31 +08:00
Russell Belfer
6b415f622e Convert gitdir paths to posix on Windows 
Apparently, a .git file with "gitdir: path" link on Windows is
allowed to use backslashes in the path.  Who knew?
 2014-01-17 13:46:44 -08:00
Vicent Marti
f04c7dcab4 Merge pull request #2050 from libgit2/cmn/always-reflog-message 
refs: remove the _with_log differentiation
 2014-01-15 11:54:10 -08:00
Carlos Martín Nieto
0b28217bda refs: remove the _with_log differentiation 
Any well-behaved program should write a descriptive message to the
reflog whenever it updates a reference. Let's make this more prominent
by removing the version without the reflog parameters.
 2014-01-15 13:32:43 +01:00
Edward Thomson
e85bbd5250 Move libgit2 settings out of util 2014-01-14 18:36:00 -08:00
Edward Thomson
39c2302a95 unnecessary include 2014-01-14 18:36:00 -08:00
Vicent Marti
3c1b3ded12 Merge pull request #2047 from arthurschreiber/arthur/fix-dup-functions 
Align `*_dup` functions
 2014-01-14 12:41:01 -08:00
Arthur Schreiber
529f342aba Align git_tree_entry_dup. 2014-01-14 21:33:59 +01:00
Arthur Schreiber
29be3a6d9e Align git_signature_dup. 
This changes git_signature_dup to actually honor oom conditions raised by
the call to git__strdup. It also aligns it with the error code return
pattern used everywhere else.
 2014-01-14 21:33:35 +01:00
Arthur Schreiber
99dcb2184a We don't need memset here. 2014-01-14 21:08:20 +01:00
Arthur Schreiber
616cd13757 Don't duplicate state that's only used when fetching. 2014-01-14 21:08:09 +01:00
Arthur Schreiber
40ef47dd46 Add git_remote_dup. 2014-01-14 21:03:01 +01:00
Vicent Marti
557bd1f410 Merge pull request #2043 from arthurschreiber/arthur/fix-memory-leaks 
Fix a bunch of memory leaks.
 2014-01-14 10:27:57 -08:00
Arthur Schreiber
249537573b Incorporate @arrbee's suggestions. 2014-01-14 19:08:58 +01:00
Edward Thomson
52a8a13072 Packbuilder contains its own zstream 2014-01-14 09:45:14 -08:00
Edward Thomson
0ade2f7a59 Packbuilder stream deflate instead of one-shot 2014-01-14 09:45:13 -08:00
Edward Thomson
c6f26b48e4 Refactor zlib for easier deflate streaming 2014-01-14 09:45:12 -08:00
Arthur Schreiber
ac44b3d244 Incorporate @ethomson's suggestions. 2014-01-13 23:28:03 +01:00
Arthur Schreiber
b0b32b4321 Fix a double free issue in git_blame__alloc. 
`git_blame_free` already calls `git__free` on `gbr`.
 2014-01-13 22:51:10 +01:00
Arthur Schreiber
ddf1b1ffa5 Fix a memory leak in hash_and_save and inject_object. 2014-01-13 22:33:10 +01:00
Arthur Schreiber
a8e4cb11fd Fix a memory leak in config_parse. 2014-01-13 22:17:07 +01:00
Arthur Schreiber
1234738e06 Fix a memory leak in git_config_iterator_glob_new. 2014-01-13 22:17:07 +01:00
Arthur Schreiber
63170bcae9 Fix a memory leak in git_pathspec__vinit. 2014-01-13 22:17:07 +01:00
Brodie Rao
2fcc0d07d0 util: handle NULL pointers passed to git_strarray_free() 
Signed-off-by: Brodie Rao <brodie@sf.io>
 2014-01-12 23:34:09 -08:00
Brodie Rao
2ad45213a8 refs: handle NULL pointers passed to git_reference_iterator_free() 
Signed-off-by: Brodie Rao <brodie@sf.io>
 2014-01-12 23:34:05 -08:00
Brodie Rao
32b7e84ec0 oid: handle NULL pointers passed to git_oid_shorten_free() 
Signed-off-by: Brodie Rao <brodie@sf.io>
 2014-01-12 23:34:02 -08:00
Brodie Rao
ae3b6d612d odb: handle NULL pointers passed to git_odb_stream_free 
Signed-off-by: Brodie Rao <brodie@sf.io>
 2014-01-12 23:33:59 -08:00
Brodie Rao
e3c6a1bf02 config: handle NULL pointers passed to git_config_iterator_free() 
Signed-off-by: Brodie Rao <brodie@sf.io>
 2014-01-12 23:33:56 -08:00
Brodie Rao
9eb45fc51a branch: handle NULL pointers passed to git_branch_iterator_free() 
Signed-off-by: Brodie Rao <brodie@sf.io>
 2014-01-12 23:33:52 -08:00
Ben Straub
426d8456ea Merge pull request #2033 from xtao/blame_orig_commit 
Add orig_commit.
 2014-01-08 19:43:31 -08:00
Edward Thomson
6adcaab70c Handle git_buf's from users more liberally 2014-01-08 10:08:23 -08:00
Jacques Germishuys
551f5cefb4 Solaris does not have qsort_r 2014-01-08 13:47:47 +02:00
XTao
a06474f81d Add orig_commit. 2014-01-08 11:19:12 +08:00
Vicent Marti
fe959e5273 Merge pull request #2023 from arthurschreiber/patch-1 
Add missing `git_reference_symbolic_create_with_log`.
 2014-01-07 09:58:05 -08:00
Russell Belfer
ac9f92316b Merge pull request #2022 from KTXSoftware/development 
submodule branch option + little VS2013 fix
 2014-01-03 14:40:25 -08:00