proxmox-mirrors/libgit2
1
0
Fork 0
mirror of https://git.proxmox.com/git/libgit2 synced 2025-12-30 11:22:44 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
21515f228b
libgit2/src
History
Edward Thomson 21515f228b index: also try conflict mode when inserting 
When we do not trust the on-disk mode, we use the mode of an existing
index entry.  This allows us to preserve executable bits on platforms
that do not honor them on the filesystem.

If there is no stage 0 index entry, also look at conflicts to attempt
to answer this question:  prefer the data from the 'ours' side, then
the 'theirs' side before falling back to the common ancestor.
2015-09-30 09:06:09 -04:00
..
hash hash_generic: __extension__ keyword for pedantry 2015-02-04 15:26:09 -05:00
transports Merge pull request #3379 from theseion/additional_libssh2_error_reporting 2015-09-09 13:59:38 +02:00
unix posix compat: include sys/stat.h for mingw 2015-06-30 14:31:07 +00:00
win32 win32: propogate filename too long errors 2015-09-22 23:10:56 -04:00
xdiff xdiff: cleanup some warnings 2015-07-10 09:41:56 -05:00
annotated_commit.c annotated_commit: provide a constructor from a revspec 2015-03-16 16:57:30 +01:00
annotated_commit.h s/git_merge_head/git_annotated_commit 2014-10-26 22:59:48 -04:00
array.h Make our overflow check look more like gcc/clang's 2015-02-13 09:27:33 -05:00
attr_file.c attr: declare variable at top of block for msvc 2015-05-12 17:00:35 -04:00
attr_file.h Improvements to ignore performance on Windows. 2015-04-28 14:24:58 -04:00
attr.c attr: always return errors 2015-05-12 14:39:49 -04:00
attr.h Attribute file cache refactor 2014-04-17 14:56:41 -07:00
attrcache.c config: borrow refcounted references 2015-03-03 18:35:12 +01:00
attrcache.h attrcache: don't re-read attrs during checkout 2015-02-03 00:31:08 -05:00
bitvec.h Address PR comments 2014-02-20 14:27:10 -08:00
blame_git.c xdiff: upgrade to core git 2.4.5 2015-07-07 17:01:49 -05:00
blame_git.h Blame: minor cleanup 2013-09-25 14:40:19 -07:00
blame.c diff: introduce binary diff callbacks 2015-06-12 09:39:20 -04:00
blame.h Improve GIT_EUSER handling 2013-12-11 10:57:49 -08:00
blob.c blob: fail to create a blob from a dir with EDIRECTORY 2015-07-12 12:11:22 +02:00
blob.h Fix rename detection to use actual blob size 2013-07-25 12:27:39 -07:00
branch.c refdb: delete a ref's reflog upon deletion 2015-07-12 19:08:06 +02:00
branch.h branch: rename 'tracking' to 'upstream' 2013-03-30 15:45:57 +01:00
buf_text.c git_buf_text_lf_to_crlf: allow mixed line endings 2015-06-22 12:00:23 -04:00
buf_text.h git_buf_text_lf_to_crlf: allow mixed line endings 2015-06-22 12:00:23 -04:00
buffer.c buffer: make use of EINVALID for growing a borrowed buffer 2015-06-24 23:49:10 +02:00
buffer.h buffer: don't allow growing borrowed buffers 2015-06-24 23:49:10 +02:00
cache.c Fix #3094 - improve use of portable size_t/ssize_t format specifiers. 2015-07-12 19:55:19 +02:00
cache.h Refactor git_cache to use an rwlock 2014-08-26 15:12:43 -07:00
cc-compat.h There is no "z" size specifier on MSVC 2014-10-13 16:32:26 +02:00
checkout.c git_futils_mkdir_*: make a relative-to-base mkdir 2015-09-17 10:00:35 -04:00
checkout.h iterator: submodules are determined by an index or tree 2014-11-07 08:33:27 +01:00
cherrypick.c cherrypick, revert: drop unnecessary SAFE_CREATE 2015-02-27 13:47:30 -05:00
clone.c errors: tighten up git_error_state OOMs a bit more 2015-08-03 19:44:51 -04:00
clone.h clone: add flags to override whether to perform a local clone 2014-05-28 15:40:22 +02:00
commit_list.c Spelling fixes 2014-12-04 21:06:59 -06:00
commit_list.h Move un-namespaced constant to internal header 2014-10-10 15:17:05 -07:00
commit.c commit: allow retrieving an arbitrary header field 2015-06-22 15:56:31 +02:00
commit.h Introduce git_revert to revert a single commit 2013-12-02 16:57:41 -06:00
common.h errors: tighten up git_error_state OOMs a bit more 2015-08-03 19:44:51 -04:00
config_cache.c config: borrow refcounted references 2015-03-03 18:35:12 +01:00
config_file.c config: buffer comments to match git's variable-adding 2015-09-18 12:28:05 +02:00
config_file.h config: implement basic transactional support 2015-08-12 04:09:09 +02:00
config.c Fix build warning: implicit declaration of function ‘git_transaction_config_new’ 2015-08-17 15:18:47 -04:00
config.h config: perform unlocking via git_transaction 2015-08-12 04:09:38 +02:00
crlf.c crlf: give Unix the glory of autocrlf=true 2015-06-22 12:00:30 -04:00
curl_stream.c curl: use the most secure auth method for the proxy 2015-08-06 13:02:35 +02:00
curl_stream.h curl: remove the encrypted param to the constructor 2015-06-24 17:26:36 +02:00
date.c Introduce git__date_rfc2822_fmt. Allows for RFC2822 date headers 2014-04-11 21:55:35 +02:00
delta-apply.c Make our overflow check look more like gcc/clang's 2015-02-13 09:27:33 -05:00
delta-apply.h
delta.c Make our overflow check look more like gcc/clang's 2015-02-13 09:27:33 -05:00
delta.h
describe.c Remove extra semicolon outside of a function 2015-07-31 16:23:11 +02:00
diff_driver.c diff: don't error out on an invalid regex 2015-08-15 18:46:38 +02:00
diff_driver.h Initial take on builtin drivers with multiline 2014-01-24 10:43:05 -08:00
diff_file.c Rename FALLBACK to UNSPECIFIED 2015-06-25 12:48:44 +02:00
diff_file.h diff: introduce binary diff callbacks 2015-06-12 09:39:20 -04:00
diff_patch.c diff: fix leaks in diff printing 2015-06-26 18:31:39 +02:00
diff_patch.h diff: determine DIFFABLE-ness for binaries 2015-06-24 12:06:41 -04:00
diff_print.c Fix binary diffs 2015-09-25 10:37:41 -07:00
diff_stats.c Don't scale diff stat when not needed 2014-05-12 10:28:45 -07:00
diff_tform.c stash: save the workdir file when deleted in index 2015-06-23 19:15:16 -04:00
diff_xdiff.c Remove converting user error to GIT_EUSER 2013-12-11 10:57:49 -08:00
diff_xdiff.h Reorganize diff and add basic diff driver 2013-06-10 10:10:39 -07:00
diff.c diff: check pathspec on non-files 2015-09-12 15:32:18 -04:00
diff.h Only write index if updated when passing GIT_DIFF_UPDATE_INDEX 2015-06-26 02:00:21 -04:00
errors.c errors: tighten up git_error_state OOMs a bit more 2015-08-03 19:44:51 -04:00
fetch.c Rename FALLBACK to UNSPECIFIED 2015-06-25 12:48:44 +02:00
fetch.h Fix #3093 - remove declaration of unused function git_fetch__download_pack 2015-06-30 16:48:47 -04:00
fetchhead.c fetchhead: deal with quotes in branch names 2014-04-24 14:08:29 +02:00
fetchhead.h Join typedef and struct definitions in single file. 2014-09-24 11:00:51 +02:00
filebuf.c filebuf: follow symlinks when creating a lock file 2015-09-05 16:43:49 +02:00
filebuf.h filebuf: remove lockfile upon rename errors 2015-07-24 23:02:11 +02:00
fileops.c mkdir: cope with root path on win32 2015-09-17 12:48:37 -04:00
fileops.h git_futils_mkdir_*: make a relative-to-base mkdir 2015-09-17 10:00:35 -04:00
filter.c filter: make sure to close the stream even on error 2015-07-12 13:28:03 +02:00
filter.h filter: take temp_buf in git_filter_options 2015-02-19 11:45:46 -05:00
fnmatch.c git__tolower: a tolower() that isn't dumb 2015-05-29 18:16:46 -04:00
fnmatch.h Restore attributions for fnmatch 2014-05-19 14:39:45 +01:00
global.c error: store the error messages in a reusable buffer 2015-07-28 09:31:00 +02:00
global.h error: store the error messages in a reusable buffer 2015-07-28 09:31:00 +02:00
graph.c graph: fix ahead-behind logic 2014-08-28 13:36:58 +02:00
hash.c
hash.h hash: use CommonCrypto on OSX for SHA-1 2014-10-24 13:31:18 +02:00
hashsig.c diff_tform: account for whitespace options 2015-03-04 00:01:34 -05:00
ident.c Fix ident replacement to match Git behavior 2015-05-26 19:56:06 +02:00
idxmap.h Add a hashmap for index entries 2015-08-14 21:06:09 +02:00
ignore.c ignore: add test and adjust style and comment for dir with wildmatch 2015-09-13 06:18:49 +02:00
ignore.h Improvements to ignore performance on Windows. 2015-04-28 14:24:58 -04:00
index.c index: also try conflict mode when inserting 2015-09-30 09:06:09 -04:00
index.h index: keep a hash table as well as a vector of entries 2015-08-14 21:10:12 +02:00
indexer.c Remove extra semicolon outside of a function 2015-07-31 16:23:11 +02:00
integer.h Fix MAX 32 bit build problem described in libgit2/libgit2#2917 2015-02-20 18:59:43 +01:00
iterator.c iterator: loop fs_iterator advance (don't recurse) 2015-09-13 14:07:54 -04:00
iterator.h iterator: saner pathlist matching for idx iterator 2015-08-31 11:48:06 -04:00
khash.h khash: add eol so picky compilers stop warning 2015-07-10 09:53:31 -05:00
map.h Fix compiler warning (git_off_t cast to size_t). 2014-05-19 17:37:29 -07:00
merge_file.c Added options to enable patience and minimal diff drivers 2015-03-16 09:53:27 +02:00
merge_file.h Introduce git_merge_file for consumers 2014-03-20 09:25:05 -07:00
merge.c diff: drop FILELIST_MATCH 2015-08-30 19:11:31 -04:00
merge.h merge: merge iterators 2015-05-11 14:11:56 -04:00
message.c message: don't assume the comment char 2014-05-18 10:06:49 +02:00
message.h
mwindow.c Remove extra semicolon outside of a function 2015-02-15 21:07:05 +01:00
mwindow.h pack: clean up error returns 2014-06-25 21:35:58 +02:00
netops.c git__tolower: a tolower() that isn't dumb 2015-05-29 18:16:46 -04:00
netops.h Rename GIT_SSL to GIT_OPENSSL 2015-04-23 17:39:51 +02:00
notes.c iterator: use an options struct instead of args 2015-08-28 18:39:47 -04:00
notes.h Introduce git_note_author, git_note_committer 2014-10-26 22:59:29 -04:00
object_api.c object: haha 2013-04-30 13:19:02 +02:00
object.c Revert "object: correct the expected ID size in prefix lookup" 2015-06-26 16:45:42 +02:00
object.h object: Explicitly define helper API methods for all obj types 2013-04-30 13:13:38 +02:00
odb_loose.c git_futils_mkdir_*: make a relative-to-base mkdir 2015-09-17 10:00:35 -04:00
odb_mempack.c mempack: expose clear function 2015-09-11 20:06:14 -04:00
odb_pack.c Initialize a few variables 2015-06-09 16:53:07 +02:00
odb.c odb: cast to long long for printf 2015-06-29 21:45:04 +00:00
odb.h odb: make the writestream's size a git_off_t 2015-05-13 09:34:20 +02:00
offmap.h Remove extra semicolon outside of a function 2015-02-15 21:07:05 +01:00
oid.c git__*allocarray: safer realloc and malloc 2015-02-12 22:54:47 -05:00
oid.h oid: Export git_oid_tostr_s instead of _allocfmt 2014-08-18 12:41:06 +02:00
oidarray.c merge: expose multiple merge bases 2014-07-27 17:17:22 +02:00
oidarray.h merge: expose multiple merge bases 2014-07-27 17:17:22 +02:00
oidmap.h mempack: expose clear function 2015-09-11 20:06:14 -04:00
openssl_stream.c Merge pull request #3297 from tkelman/patch-2 2015-07-10 19:07:41 +02:00
openssl_stream.h Add an OpenSSL IO stream 2014-12-10 01:17:41 +01:00
pack-objects.c Remove extra semicolon outside of a function 2015-07-31 16:23:11 +02:00
pack-objects.h packbuilder: report progress during deltification 2015-05-13 15:52:13 +02:00
pack.c Remove extra semicolon outside of a function 2015-07-31 16:23:11 +02:00
pack.h Reorder some khash declarations 2015-03-11 02:36:11 +01:00
path.c core::mkdir tests: ensure we don't stomp symlinks in mkdir 2015-09-17 10:11:38 -04:00
path.h mkdir: cope with root path on win32 2015-09-17 12:48:37 -04:00
pathspec.c iterator: use an options struct instead of args 2015-08-28 18:39:47 -04:00
pathspec.h Add git_pathspec_match_diff API 2013-07-10 20:50:33 +02:00
pool.c Make our overflow check look more like gcc/clang's 2015-02-13 09:27:33 -05:00
pool.h Fix compiler warning (git_off_t cast to size_t). 2014-05-19 17:37:29 -07:00
posix.c p_read: ensure requested len is ssize_t 2015-02-12 22:54:47 -05:00
posix.h git_path: introduce 'git_path_diriter' 2015-05-01 12:31:05 -04:00
pqueue.c Fix pqueue sort boundary condition bug 2014-03-12 11:21:55 -07:00
pqueue.h Convert pqueue to just be a git_vector 2014-02-04 10:01:37 -08:00
push.c push: fix the update constructor 2015-05-14 10:34:42 +02:00
push.h Better param docs 2015-07-28 08:28:33 -06:00
rebase.c Fix #3094 - improve use of portable size_t/ssize_t format specifiers. 2015-07-12 19:55:19 +02:00
refdb_fs.c git_futils_mkdir_*: make a relative-to-base mkdir 2015-09-17 10:00:35 -04:00
refdb_fs.h immutable references and a pluggable ref database 2013-03-07 11:01:52 -06:00
refdb.c Introduce reference transactions 2014-09-30 15:44:32 +02:00
refdb.h Introduce reference transactions 2014-09-30 15:44:32 +02:00
reflog.c Fix wrong format string in git_reflog_drop() error message 2015-04-24 23:56:59 +08:00
reflog.h reflog: move the reflog implementation into refdb_fs 2013-10-02 06:53:24 +02:00
refs.c Fixed Xcode 6.1 build warnings 2015-06-15 09:55:12 -07:00
refs.h repository: remove log message override for switching the active branch 2015-03-03 14:40:50 +01:00
refspec.c fix memory leak in refspec.c on errors. 2015-06-30 09:41:17 -04:00
refspec.h refspec: git_refspec_parse() does not exist 2014-04-01 20:18:36 +02:00
remote.c remote: don't confuse tag auto-follow rules with refspec matching 2015-08-11 22:51:53 +02:00
remote.h remote: move the update_fetchhead setting to the options 2015-05-13 09:46:36 +02:00
repo_template.h Make mode handling during init more like git 2013-02-27 13:44:15 -08:00
repository.c Merge pull request #3434 from ethomson/reservednames 2015-09-21 06:01:03 +02:00
repository.h submodule: remove the per-repo cache 2015-06-22 17:02:54 +02:00
reset.c diff/status: introduce conflicts 2015-05-28 09:44:02 -04:00
revert.c cherrypick, revert: drop unnecessary SAFE_CREATE 2015-02-27 13:47:30 -05:00
revparse.c reflog: Error handling on empty reflog 2014-09-05 03:25:53 +02:00
revwalk.c Remove extra semicolon outside of a function 2015-07-31 16:23:11 +02:00
revwalk.h Reorder some khash declarations 2015-03-11 02:36:11 +01:00
settings.c Rename GIT_SSL to GIT_OPENSSL 2015-04-23 17:39:51 +02:00
sha1_lookup.c Backport @peff's fix for duplicates in sha1_lookup 2013-09-04 13:16:57 +02:00
sha1_lookup.h sha1_lookup: do not use the "experimental" lookup mode 2013-08-14 10:28:01 +02:00
signature.c Introduce git_rebase_commit 2014-10-26 22:59:19 -04:00
signature.h Introduce git_rebase_commit 2014-10-26 22:59:19 -04:00
socket_stream.c stream: constify the write buffer 2014-12-10 16:20:52 +01:00
socket_stream.h Add an OpenSSL IO stream 2014-12-10 01:17:41 +01:00
sortedcache.c Remove extra semicolon outside of a function 2015-02-15 21:07:05 +01:00
sortedcache.h Add stddef include for sortedcache 2013-08-28 11:20:47 -07:00
stash.c iterator: use an options struct instead of args 2015-08-28 18:39:47 -04:00
status.c diff/status: introduce conflicts 2015-05-28 09:44:02 -04:00
status.h Rename diff objects and split patch.h 2013-10-11 14:51:54 -07:00
stransport_stream.c git_cert: child types use proper base type 2015-07-10 09:28:33 -05:00
stransport_stream.h Add a SecureTransport TLS channel 2015-04-23 17:39:51 +02:00
stream.h stream: add support for setting a proxy 2015-06-24 17:26:36 +02:00
strmap.c config: get rid of a useless asignment 2013-08-12 11:40:57 +02:00
strmap.h Remove extra semicolon outside of a function 2015-02-15 21:07:05 +01:00
strnlen.h strnlen() is only available from Visual Studio 2005+ 2014-07-06 09:22:24 +02:00
submodule.c Plug some leaks 2015-09-27 23:32:20 +02:00
submodule.h submodule: handle writing out all enum values for settings 2015-06-22 17:02:56 +02:00
sysdir.c git__getenv: utf-8 aware env reader 2015-07-02 16:35:43 +00:00
sysdir.h Move system directory cache out of utils 2014-02-24 17:52:38 -08:00
tag.c Remove the signature from ref-modifying functions 2015-03-03 14:40:50 +01:00
tag.h Simplify object table parse functions 2013-04-22 16:52:06 +02:00
thread-utils.c Fix macro redefinition warning 2015-07-15 11:40:06 +01:00
thread-utils.h Clean up various compiler warnings 2014-10-26 22:13:40 -04:00
tls_stream.c Rename GIT_SSL to GIT_OPENSSL 2015-04-23 17:39:51 +02:00
tls_stream.h Abstract away the TLS stream implementation 2015-04-23 17:39:51 +02:00
trace.c Remove trace / add git_diff_perfdata struct + api 2014-05-02 09:21:33 -07:00
trace.h Variadic macros is only available from Visual Studio 2005+ 2014-07-06 09:22:24 +02:00
transaction.c Don't free config in git_transaction_commit. 2015-09-13 16:32:24 +02:00
transaction.h config: perform unlocking via git_transaction 2015-08-12 04:09:38 +02:00
transport.c Rename GIT_SSL to GIT_OPENSSL 2015-04-23 17:39:51 +02:00
tree-cache.c tree-cache: correct the entry_count calculation 2014-10-22 21:25:08 +02:00
tree-cache.h index: write out the tree cache extension 2014-10-10 19:43:42 +02:00
tree.c tree: add more correct error messages for not found 2015-03-17 20:51:14 +01:00
tree.h treebuilder: take a repository for path validation 2014-12-17 13:05:27 -05:00
tsort.c git__*allocarray: safer realloc and malloc 2015-02-12 22:54:47 -05:00
userdiff.h Update the javascript diff driver's function pattern. 2014-10-09 22:21:34 +02:00
util.c Fix duplicate basenames to support older VS 2015-08-05 13:02:58 -07:00
util.h Merge pull request #3288 from ethomson/getenv 2015-07-07 00:48:17 +02:00
vector.c Make our overflow check look more like gcc/clang's 2015-02-13 09:27:33 -05:00
vector.h Some vector utility tweaks 2014-04-17 14:43:45 -07:00
zstream.c git_buf_grow_by: increase buf asize incrementally 2015-02-12 22:54:47 -05:00
zstream.h Reorganize zstream API and fix wrap problems 2014-01-30 09:59:59 -08:00