kmx git

Commit	Date	Message
2c26c867	2015-11-12T19:22:31	Merge pull request #3499 from ethomson/ref_dir_errmsgs Improve error messages when dirs prevent ref/reflog creation
ecdc0428	2015-11-12T19:20:36	Merge pull request #3448 from libgit2/cmn/custom-agent Support setting custom user-agent
1411cb9e	2015-10-02T03:57:14	winhttp: use a custom user-agent if the user has set it We also keep the "git/1.0" prefix in order to maintain compatibility with hosters.
94bac76c	2015-10-02T03:46:34	http: use a custom user-agent if the user has set it We still prefix it with "git/1.0" since that's required in many situations, but we replace the area which mentions libgit2.
de870533	2015-10-02T03:43:11	settings: add a setter for a custom user-agent
0a700ee3	2015-11-03T17:34:54	reflog: error when a directory is at reflog path When a non-empty directory exists and prevents the creation of a reflog, provide a more informative error message.
b46c7ee5	2015-11-03T17:18:00	refs: complain when a directory exists at ref When a (non-empty) directory exists at the reference target location, complain with a more actionable error message.
ad8509ef	2015-11-12T11:54:06	index: overwrite the path when inserting conflicts When we insert a conflict in a case-insensitive index, accept the new entry's path as the correct case instead of leaving the path we already had. This puts `git_index_conflict_add()` on the same level as `git_index_add()` in this respect.
16604d74	2015-11-11T00:36:15	index: correctly report which conflict stage has a wrong filemode When we're at offset 'i', we're dealing with the 'i+1' stage, since conflicts start at 1.
1c34b717	2015-11-08T05:10:18	Merge pull request #3498 from ethomson/windows_symlinks Diff: Honor `core.symlinks=false` and fake symlinks
61948894	2015-11-08T04:54:55	Merge pull request #3500 from ethomson/submodules_with_path Handle submodules with paths in `git_submodule_update`
f4b02671	2015-11-04T16:17:51	submodule: reload HEAD/index after reading config Reload the HEAD and index data for a submodule after reading the configuration. The configuration may specify a `path`, so we must update HEAD and index data with that path in mind.
5aa28a8f	2015-11-04T14:16:24	Merge pull request #3465 from libgit2/cmn/tls-register stream: allow registering a user-provided TLS constructor
f5f96a23	2015-10-09T10:41:06	Fix git_commit_summary to convert newlines to spaces even after whitespace. Collapse spaces around newlines for the summary.
ec50b23a	2015-11-03T17:02:07	filebuf: detect directories in our way When creating a filebuf, detect a directory that exists in our target file location. This prevents a failure later, when we try to move the lock file to the destination.
6b0fc6ab	2015-11-03T09:43:18	diff: on win32, treat fake "symlinks" specially On platforms that lack `core.symlinks`, we should not go looking for symbolic links and `p_readlink` their target. Instead, we should examine the file's contents.
7fafde63	2015-10-13T11:25:41	stream: allow registering a user-provided TLS constructor This allows the application to use their own TLS stream, regardless of the capabilities of libgit2 itself.
d39f643a	2015-10-13T19:34:07	stream: accept NULL in the free function
3138ad93	2015-07-16T10:17:16	Add diff progress callback.
db1edf91	2015-11-02T15:09:19	Merge pull request #3491 from libgit2/cmn/config-checksum Use checksums to detect config file changes
1d0bed9d	2015-10-30T14:02:01	merge-base: Style
4cacf5b5	2015-10-30T11:50:43	merge-base: Do not read parents from the root
136a71f4	2015-10-30T11:45:52	merge-base: Remove redundant merge bases
3547b122	2015-10-30T21:36:51	filebuf: use an internal buffer This reduces the chances of a crash in the thread tests. This shouldn't affect general usage too much, since the main usage of these functions are to read into an empty buffer.
eb597799	2015-10-29T21:12:37	filebuf: use a checksum to detect file changes Instead of relying on the size and timestamp, which can hide changes performed in the same second, hash the file content's when we care about detecting changes.
d571a54e	2015-10-30T19:36:16	Merge pull request #3493 from ethomson/read_index index: read_index must update hashes
e0be1d60	2015-10-30T18:23:17	git: put NULL check at the top
0bf77e32	2015-10-30T13:07:02	index: read_index must update hashes
45d295e0	2015-10-30T17:51:50	git: accept NULL as argument to its stream free
fd74bd08	2015-10-29T20:37:48	Merge pull request #3486 from srajko/reflog-segfault-fix Fix segfault when reading reflog with extra newlines
335c9e2f	2015-10-26T15:33:00	Prevent segfault when parsing a reflog with oid parse error Using calloc instead of malloc because the parse error will lead to an immediate free of committer (and its properties, which can segfault on free if undefined - test_refs_reflog_reflog__reading_a_reflog_with_invalid_format_returns_error segfaulted before the fix). #3458
1b4449b4	2015-10-28T10:53:03	pool: fix documentation
d845abe6	2015-10-28T14:49:28	merge: Do not mallocz unecessary entries
340b15b7	2015-10-28T14:31:09	pool: update comment
d3416dfe	2015-10-28T10:50:25	pool: Dot not assume mallocs are zeroed out
410efda8	2015-10-28T10:28:43	pool: Take into account malloc overhead & pool page size
4f971852	2015-10-28T10:15:24	repository: plug memory leak cc @carlosmn
1e5e02b4	2015-10-27T17:26:04	pool: Simplify implementation
7a02e93e	2015-10-27T22:42:40	merge: Plug memory leak
a1f5d691	2015-10-27T22:42:15	merge: Implement `GIT_MERGE_TREE_SKIP_REUC`
d307a013	2015-10-27T22:17:32	reuc: Be smarter when inserting new REUC entries Inserting new REUC entries can quickly become pathological given that each insert unsorts the REUC vector, and both subsequent lookups and insertions will require sorting it again before being successful. To avoid this, we're switching to `git_vector_insert_sorted`: this keeps the REUC vector constantly sorted and lets us use the `on_dup` callback to skip an extra binary search on each insertion.
e324005e	2015-10-23T15:13:38	Merge pull request #3481 from ethomson/xdiff_include xdiff: reference util.h in parent directory
8683d31f	2015-10-22T14:39:20	merge: add GIT_MERGE_TREE_FAIL_ON_CONFLICT Provide a new merge option, GIT_MERGE_TREE_FAIL_ON_CONFLICT, which will stop on the first conflict and fail the merge operation with GIT_EMERGECONFLICT.
dc2cf3eb	2015-10-22T18:35:43	Merge pull request #3480 from ethomson/nsecs Nanoseconds in the index: ignore for diffing
c7b336b0	2015-10-22T10:29:51	xdiff: reference util.h in parent directory Although CMake will correctly configure include directories for us, some people may use their own build system, and we should reference `util.h` based on where it actually lives.
7499eae9	2015-10-22T09:30:41	diff: ignore nsecs when diffing Although our index contains the literal time present in the index, we do not read nanoseconds from disk, and thus we should not use them in any comparisons, lest we always think our working directory is dirty. Guard this behind a `GIT_USE_NSECS` for future improvement.
44b1e3e3	2015-10-21T13:43:22	Merge pull request #3475 from libgit2/cmn/programdata-config config: add a ProgramData level
8c7c5fa5	2015-10-20T17:42:42	config: add a ProgramData level This is where portable git stores the global configuration which we can use to adhere to it even though git isn't quite installed on the system.
128e94bb	2015-10-21T12:04:53	index: Remove unneeded consts
307c4a2b	2015-10-21T11:58:44	signature: Strip crud just like Git does
4280fabb	2015-10-15T07:10:48	Merge pull request #3466 from libgit2/cmn/quick-parse-64 revwalk: make commit list use 64 bits for time
8321596a	2015-10-15T12:22:10	Merge pull request #3444 from ethomson/add_preserves_conflict_mode Preserve modes from a conflict in `git_index_insert`
a0a1b19a	2015-10-14T19:31:54	odb: Prioritize alternate backends For most real use cases, repositories with alternates use them as main object storage. Checking the alternate for objects before the main repository should result in measurable speedups. Because of this, we're changing the sorting algorithm to prioritize alternates in cases where two backends have the same priority. This means that the pack backend for the alternate will be checked before the pack backend for the main repository but both of them will be checked before any loose backends.
43820f20	2015-10-14T19:24:07	odb: Be smarter when refreshing backends In the current implementation of ODB backends, each backend is tasked with refreshing itself after a failed lookup. This is standard Git behavior: we want to e.g. reload the packfiles on disk in case they have changed and that's the reason we can't find the object we're looking for. This behavior, however, becomes pathological in repositories where multiple alternates have been loaded. Given that each alternate counts as a separate backend, a miss in the main repository (which can potentially be very frequent in cases where object storage comes from the alternate) will result in refreshing all its packfiles before we move on to the alternate backend where the object will most likely be found. To fix this, the code in `odb.c` has been refactored as to perform the refresh of all the backends externally, once we've verified that the object is nowhere to be found. If the refresh is successful, we then perform the lookup sequentially through all the backends, skipping the ones that we know for sure weren't refreshed (because they have no refresh API). The on-disk pack backend has been adjusted accordingly: it no longer performs refreshes internally.
5ffdea6f	2015-10-14T16:49:01	revwalk: make commit list use 64 bits for time We moved the "main" parsing to use 64 bits for the timestamp, but the quick parsing for the revwalk did not. This means that for large timestamps we fail to parse the time and thus the walk. Move this parser to use 64 bits as well.
ae195a71	2015-09-29T12:46:41	blame: guard xdiff calls for large files
6c014bcc	2015-09-29T12:18:17	diff: don't feed large files to xdiff
e4352066	2015-09-28T18:25:24	merge_file: treat large files as binary xdiff craps the bed on large files. Treat very large files as binary, so that it doesn't even have to try. Refactor our merge binary handling to better match git.git, which looks for a NUL in the first 8000 bytes.
46c0e6e3	2015-09-28T16:34:29	xdiff: convert size variables to size_t
4bc9b74c	2015-09-28T16:24:50	GITERR_CHECK_ALLOC_ADDn: multi-arg adders
d3b29fb9	2015-10-01T00:50:37	refdb and odb backends must provide `free` function As refdb and odb backends can be allocated by client code, libgit2 can’t know whether an alternative memory allocator was used, and thus should not try to call `git__free` on those objects. Instead, odb and refdb backend implementations must always provide their own `free` functions to ensure memory gets freed correctly.
ba1a5553	2015-09-30T17:44:10	Merge pull request #3446 from ethomson/portability portability: use `CHECK_FUNCTION_EXISTS` for checking whether functions exist...
21515f22	2015-09-29T15:49:16	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.
e683d152	2015-09-30T05:49:04	qsort_r/qsort_s: detect their support
8649dfd8	2015-09-29T13:36:37	p_futimes: support using futimens when available
146a96de	2015-09-30T09:41:25	openssl: don't try to teardown an unconnected SSL context SSL_shutdown() does not like it when we pass an unitialized ssl context to it. This means that when we fail to connect to a host, we hide the error message saying so with OpenSSL's indecipherable error message.
72b7c570	2015-09-30T09:17:18	Merge pull request #3411 from spraints/custom-push-headers Include custom HTTP headers
5c5df666	2015-09-27T23:32:20	Plug some leaks
e4b2b919	2015-09-25T10:37:41	Fix binary diffs git expects an empty line after the binary data: literal X ...binary data... <empty_line> The last literal block of the generated patches were not containing the required empty line. Example: diff --git a/binary_file b/binary_file index 3f1b3f9098131cfecea4a50ff8afab349ea66d22..86e5c1008b5ce635d3e3fffa4434c5eccd8f00b6 100644 GIT binary patch literal 8 Pc${NM&PdElPvrst3ey5{ literal 6 Nc${NM%g@i}0ssZ\|0lokL diff --git a/binary_file2 b/binary_file2 index 31be99be19470da4af5b28b21e27896a2f2f9ee2..86e5c1008b5ce635d3e3fffa4434c5eccd8f00b6 100644 GIT binary patch literal 8 Pc${NM&PdElPvrst3ey5{ literal 13 Sc${NMEKbZyOexL+Qd\|HZV+4u- git apply of that diff results in: error: corrupt binary patch at line 9: diff --git a/binary_file2 b/binary_file2 fatal: patch with only garbage at line 10 The proper formating is: diff --git a/binary_file b/binary_file index 3f1b3f9098131cfecea4a50ff8afab349ea66d22..86e5c1008b5ce635d3e3fffa4434c5eccd8f00b6 100644 GIT binary patch literal 8 Pc${NM&PdElPvrst3ey5{ literal 6 Nc${NM%g@i}0ssZ\|0lokL diff --git a/binary_file2 b/binary_file2 index 31be99be19470da4af5b28b21e27896a2f2f9ee2..86e5c1008b5ce635d3e3fffa4434c5eccd8f00b6 100644 GIT binary patch literal 8 Pc${NM&PdElPvrst3ey5{ literal 13 Sc${NMEKbZyOexL+Qd\|HZV+4u-
d7375662	2015-09-25T10:16:16	Copy custom_headers insteach of referencing the caller's copy
d16c1b97	2015-09-24T10:30:37	These can be static
e60db3c7	2015-09-24T09:24:10	Revise custom header error messages If the header doesn't look like a header (e.g. if it doesn't have a ":" or if it has newlines), report "custom HTTP header '%s' is malformed". If the header has the same name as a header already set by libgit2 (e.g. "Host"), report "HTTP header '%s' is already set by libgit2".
63cc5723	2015-09-24T09:13:05	Don't null-check
098f1e6e	2015-09-24T09:09:48	Use an array of forbidden custom headers
588e28eb	2015-09-24T13:20:48	Merge pull request #3437 from libgit2/cmn/plug-sm submodule: plug a few leaks
ab8f2c66	2015-09-23T15:09:19	submodule: plug a few leaks
92a47824	2015-09-22T23:10:56	win32: propogate filename too long errors
aebddbe7	2015-09-21T06:01:03	Merge pull request #3434 from ethomson/reservednames Win32 Reserved names: don't reserve names outside the working directory
538dfc88	2015-09-17T18:12:05	repository: only reserve repo dirs in the workdir Check that the repository directory is beneath the workdir before adding it to the list of reserved paths. If it is not, then there is no possibility of checking out files into it, and it should not be a reserved word. This is a particular problem with submodules where the repo directory may be in the super's .git directory.
cd677b8f	2015-09-18T12:28:05	config: buffer comments to match git's variable-adding When there is a comment at the end of a section, git keeps it there, while we write the new variable right at the end. Keep comments buffered and dump them when we're going to output a variable or section, or reach EOF. This puts us in line with the config files which git produces.
9ce2e7b3	2015-09-17T12:48:37	`mkdir`: cope with root path on win32
e164ddb1	2015-09-17T12:23:19	win32: return EACCES in `p_lstat` Don't coalesce all errors into ENOENT. At least identify EACCES. All callers should be handling this case already, as the POSIX `lstat` will return this.
81aaf370	2015-09-17T11:26:38	mkdir: chmod existing paths with `GIT_MKDIR_CHMOD`
e24c60db	2015-09-17T09:42:05	mkdir: find component paths for mkdir_relative `git_futils_mkdir` does not blindly call `git_futils_mkdir_relative`. `git_futils_mkdir_relative` is used when you have some base directory and want to create some path inside of it, potentially removing blocking symlinks and files in the process. This is not suitable for a general recursive mkdir within the filesystem. Instead, when `mkdir` is being recursive, locate the first existent parent directory and use that as the base for `mkdir_relative`.
0862ec2e	2015-09-17T09:58:38	core::mkdir tests: ensure we don't stomp symlinks in mkdir In `mkdir` and `mkdir_r`, ensure that we don't try to remove symlinks that are in our way.
ac2fba0e	2015-09-16T15:07:27	git_futils_mkdir_*: make a relative-to-base mkdir Untangle git_futils_mkdir from git_futils_mkdir_ext - the latter assumes that we own everything beneath the base, as if it were being called with a base of the repository or working directory, and is tailored towards checkout and ensuring that there is no bogosity beneath the base that must be cleaned up. This is (at best) slow and (at worst) unsafe in the larger context of a filesystem where we do not own things and cannot do things like unlink symlinks that are in our way.
eea7c850	2015-09-16T05:44:27	checkout: overwrite files with differing modes When a file exists on disk and we're checking out a file that differs in executableness, remove the old file. This allows us to recreate the new file with p_open, which will take the new mode into account and handle setting the umask properly. Remove any notion of chmod'ing existing files, since it is now handled by the aforementioned removal and was incorrect, as it did not take umask into account.
b0885675	2015-09-13T23:21:14	Merge pull request #3425 from ethomson/diriter_root Handle `git_path_diriter` instances at the drive root on Windows
9d905541	2015-09-13T14:18:08	diriter: don't double '/' on posix The canonical directory path of the root directory of a volume on POSIX already ends in a slash (eg, `/`). This is true only at the root. Do not add a slash to paths in this case.
26d7cf6e	2015-09-11T18:27:04	iterator: loop fs_iterator advance (don't recurse)
5a466bef	2015-09-13T13:59:41	diriter: don't double '/' on Windows The canonical directory path of the root directory of a volume on windows already ends in a slash (eg, `c:/`). This is true only at the volume root. Do not add a slash to paths in this case.
e78aeefa	2015-09-13T19:43:39	Merge pull request #3420 from ethomson/iterator iterator: advance the tree iterator smartly
548cb334	2015-09-13T16:32:24	Don't free config in `git_transaction_commit`. The config is not owned by the transaction, so please don’t free it.
1e80bf27	2015-09-13T06:21:18	Merge branch 'cmn/ignore-dir-check'
657afd35	2015-09-13T06:18:49	ignore: add test and adjust style and comment for dir with wildmatch The previous commit left the comment referencing the earlier state of the code, change it to explain the current logic. While here, change the logic to avoid repeating the copy of the base pattern.
305407e1	2015-09-13T06:03:12	Merge pull request #3370 from libgit2/cmn/submodule-refactor submodule: refactor to be more explicit in the search
8ab4d0e1	2015-09-12T15:32:18	diff: check pathspec on non-files When we're not doing pathspec matching, we let the iterator handle file matching for us. However, we can only trust the iterator to return files that match the pattern, because the iterator must return directories that are not strictly in the pathlist, but that are the parents of files that match the pattern, so that diff can later recurse into them. Thus, diff must examine non-files explicitly before including them in the delta list.
220d6f8a	2015-09-11T20:06:14	mempack: expose clear function
707f6537	2015-09-11T16:35:14	Removing memory leak in mempack's free It calls git_mempack_reset which reallocates the object array. git_oidmap_free is now called on it explicitly.
a1859e21	2015-09-11T17:38:28	iterator: advance the tree iterator smartly While advancing the tree iterator, if we advance over things that we aren't interested in, then call `current`. Which may itself call advance. While advancing the tree iterator, if we advance over things that we aren't interested in, then call `current`. Which may itself call advance. While advancing the tree iterator, if we advance over things that we aren't interested in, then call `current`. Which may itself call advance. While advancing the tree iterator, if we advance over things that we aren't interested in, then call `current`. Which may itself call advance. While advancing the tree iterator, if we advance over things that we aren't interested in, then call `current`. Which may itself call advance. Error: stack overflow.

2c26c867

2015-11-12T19:22:31

Merge pull request #3499 from ethomson/ref_dir_errmsgs Improve error messages when dirs prevent ref/reflog creation

ecdc0428

2015-11-12T19:20:36

Merge pull request #3448 from libgit2/cmn/custom-agent Support setting custom user-agent

1411cb9e

2015-10-02T03:57:14

winhttp: use a custom user-agent if the user has set it We also keep the "git/1.0" prefix in order to maintain compatibility with hosters.

94bac76c

2015-10-02T03:46:34

http: use a custom user-agent if the user has set it We still prefix it with "git/1.0" since that's required in many situations, but we replace the area which mentions libgit2.

de870533

2015-10-02T03:43:11

settings: add a setter for a custom user-agent

0a700ee3

2015-11-03T17:34:54

reflog: error when a directory is at reflog path When a non-empty directory exists and prevents the creation of a reflog, provide a more informative error message.

b46c7ee5

2015-11-03T17:18:00

refs: complain when a directory exists at ref When a (non-empty) directory exists at the reference target location, complain with a more actionable error message.

ad8509ef

2015-11-12T11:54:06

index: overwrite the path when inserting conflicts When we insert a conflict in a case-insensitive index, accept the new entry's path as the correct case instead of leaving the path we already had. This puts `git_index_conflict_add()` on the same level as `git_index_add()` in this respect.

16604d74

2015-11-11T00:36:15

index: correctly report which conflict stage has a wrong filemode When we're at offset 'i', we're dealing with the 'i+1' stage, since conflicts start at 1.

1c34b717

2015-11-08T05:10:18

Merge pull request #3498 from ethomson/windows_symlinks Diff: Honor `core.symlinks=false` and fake symlinks

61948894

2015-11-08T04:54:55

Merge pull request #3500 from ethomson/submodules_with_path Handle submodules with paths in `git_submodule_update`

f4b02671

2015-11-04T16:17:51

submodule: reload HEAD/index after reading config Reload the HEAD and index data for a submodule after reading the configuration. The configuration may specify a `path`, so we must update HEAD and index data with that path in mind.

5aa28a8f

2015-11-04T14:16:24

Merge pull request #3465 from libgit2/cmn/tls-register stream: allow registering a user-provided TLS constructor

f5f96a23

2015-10-09T10:41:06

Fix git_commit_summary to convert newlines to spaces even after whitespace. Collapse spaces around newlines for the summary.

ec50b23a

2015-11-03T17:02:07

filebuf: detect directories in our way When creating a filebuf, detect a directory that exists in our target file location. This prevents a failure later, when we try to move the lock file to the destination.

6b0fc6ab

2015-11-03T09:43:18

diff: on win32, treat fake "symlinks" specially On platforms that lack `core.symlinks`, we should not go looking for symbolic links and `p_readlink` their target. Instead, we should examine the file's contents.

7fafde63

2015-10-13T11:25:41

stream: allow registering a user-provided TLS constructor This allows the application to use their own TLS stream, regardless of the capabilities of libgit2 itself.

d39f643a

2015-10-13T19:34:07

stream: accept NULL in the free function

3138ad93

2015-07-16T10:17:16

Add diff progress callback.

db1edf91

2015-11-02T15:09:19

Merge pull request #3491 from libgit2/cmn/config-checksum Use checksums to detect config file changes

1d0bed9d

2015-10-30T14:02:01

merge-base: Style

4cacf5b5

2015-10-30T11:50:43

merge-base: Do not read parents from the root

136a71f4

2015-10-30T11:45:52

merge-base: Remove redundant merge bases

3547b122

2015-10-30T21:36:51

filebuf: use an internal buffer This reduces the chances of a crash in the thread tests. This shouldn't affect general usage too much, since the main usage of these functions are to read into an empty buffer.

eb597799

2015-10-29T21:12:37

filebuf: use a checksum to detect file changes Instead of relying on the size and timestamp, which can hide changes performed in the same second, hash the file content's when we care about detecting changes.

d571a54e

2015-10-30T19:36:16

Merge pull request #3493 from ethomson/read_index index: read_index must update hashes

e0be1d60

2015-10-30T18:23:17

git: put NULL check at the top

0bf77e32

2015-10-30T13:07:02

index: read_index must update hashes

45d295e0

2015-10-30T17:51:50

git: accept NULL as argument to its stream free

fd74bd08

2015-10-29T20:37:48

Merge pull request #3486 from srajko/reflog-segfault-fix Fix segfault when reading reflog with extra newlines

335c9e2f

2015-10-26T15:33:00

Prevent segfault when parsing a reflog with oid parse error Using calloc instead of malloc because the parse error will lead to an immediate free of committer (and its properties, which can segfault on free if undefined - test_refs_reflog_reflog__reading_a_reflog_with_invalid_format_returns_error segfaulted before the fix). #3458

1b4449b4

2015-10-28T10:53:03

pool: fix documentation

d845abe6

2015-10-28T14:49:28

merge: Do not mallocz unecessary entries

340b15b7

2015-10-28T14:31:09

pool: update comment

d3416dfe

2015-10-28T10:50:25

pool: Dot not assume mallocs are zeroed out

410efda8

2015-10-28T10:28:43

pool: Take into account malloc overhead & pool page size

4f971852

2015-10-28T10:15:24

repository: plug memory leak cc @carlosmn

1e5e02b4

2015-10-27T17:26:04

pool: Simplify implementation

7a02e93e

2015-10-27T22:42:40

merge: Plug memory leak

a1f5d691

2015-10-27T22:42:15

merge: Implement `GIT_MERGE_TREE_SKIP_REUC`

d307a013

2015-10-27T22:17:32

reuc: Be smarter when inserting new REUC entries Inserting new REUC entries can quickly become pathological given that each insert unsorts the REUC vector, and both subsequent lookups *and* insertions will require sorting it again before being successful. To avoid this, we're switching to `git_vector_insert_sorted`: this keeps the REUC vector constantly sorted and lets us use the `on_dup` callback to skip an extra binary search on each insertion.

e324005e

2015-10-23T15:13:38

Merge pull request #3481 from ethomson/xdiff_include xdiff: reference util.h in parent directory

8683d31f

2015-10-22T14:39:20

merge: add GIT_MERGE_TREE_FAIL_ON_CONFLICT Provide a new merge option, GIT_MERGE_TREE_FAIL_ON_CONFLICT, which will stop on the first conflict and fail the merge operation with GIT_EMERGECONFLICT.

dc2cf3eb

2015-10-22T18:35:43

Merge pull request #3480 from ethomson/nsecs Nanoseconds in the index: ignore for diffing

c7b336b0

2015-10-22T10:29:51

xdiff: reference util.h in parent directory Although CMake will correctly configure include directories for us, some people may use their own build system, and we should reference `util.h` based on where it actually lives.

7499eae9

2015-10-22T09:30:41

diff: ignore nsecs when diffing Although our index contains the literal time present in the index, we do not read nanoseconds from disk, and thus we should not use them in any comparisons, lest we always think our working directory is dirty. Guard this behind a `GIT_USE_NSECS` for future improvement.

44b1e3e3

2015-10-21T13:43:22

Merge pull request #3475 from libgit2/cmn/programdata-config config: add a ProgramData level

8c7c5fa5

2015-10-20T17:42:42

config: add a ProgramData level This is where portable git stores the global configuration which we can use to adhere to it even though git isn't quite installed on the system.

128e94bb

2015-10-21T12:04:53

index: Remove unneeded consts

307c4a2b

2015-10-21T11:58:44

signature: Strip crud just like Git does

4280fabb

2015-10-15T07:10:48

Merge pull request #3466 from libgit2/cmn/quick-parse-64 revwalk: make commit list use 64 bits for time

8321596a

2015-10-15T12:22:10

Merge pull request #3444 from ethomson/add_preserves_conflict_mode Preserve modes from a conflict in `git_index_insert`

a0a1b19a

2015-10-14T19:31:54

odb: Prioritize alternate backends For most real use cases, repositories with alternates use them as main object storage. Checking the alternate for objects before the main repository should result in measurable speedups. Because of this, we're changing the sorting algorithm to prioritize alternates *in cases where two backends have the same priority*. This means that the pack backend for the alternate will be checked before the pack backend for the main repository *but* both of them will be checked before any loose backends.

43820f20

2015-10-14T19:24:07

odb: Be smarter when refreshing backends In the current implementation of ODB backends, each backend is tasked with refreshing itself after a failed lookup. This is standard Git behavior: we want to e.g. reload the packfiles on disk in case they have changed and that's the reason we can't find the object we're looking for. This behavior, however, becomes pathological in repositories where multiple alternates have been loaded. Given that each alternate counts as a separate backend, a miss in the main repository (which can potentially be very frequent in cases where object storage comes from the alternate) will result in refreshing all its packfiles before we move on to the alternate backend where the object will most likely be found. To fix this, the code in `odb.c` has been refactored as to perform the refresh of all the backends externally, once we've verified that the object is nowhere to be found. If the refresh is successful, we then perform the lookup sequentially through all the backends, skipping the ones that we know for sure weren't refreshed (because they have no refresh API). The on-disk pack backend has been adjusted accordingly: it no longer performs refreshes internally.

5ffdea6f

2015-10-14T16:49:01

revwalk: make commit list use 64 bits for time We moved the "main" parsing to use 64 bits for the timestamp, but the quick parsing for the revwalk did not. This means that for large timestamps we fail to parse the time and thus the walk. Move this parser to use 64 bits as well.

ae195a71

2015-09-29T12:46:41

blame: guard xdiff calls for large files

6c014bcc

2015-09-29T12:18:17

diff: don't feed large files to xdiff

e4352066

2015-09-28T18:25:24

merge_file: treat large files as binary xdiff craps the bed on large files. Treat very large files as binary, so that it doesn't even have to try. Refactor our merge binary handling to better match git.git, which looks for a NUL in the first 8000 bytes.

46c0e6e3

2015-09-28T16:34:29

xdiff: convert size variables to size_t

4bc9b74c

2015-09-28T16:24:50

GITERR_CHECK_ALLOC_ADDn: multi-arg adders

d3b29fb9

2015-10-01T00:50:37

refdb and odb backends must provide `free` function As refdb and odb backends can be allocated by client code, libgit2 can’t know whether an alternative memory allocator was used, and thus should not try to call `git__free` on those objects. Instead, odb and refdb backend implementations must always provide their own `free` functions to ensure memory gets freed correctly.

ba1a5553

2015-09-30T17:44:10

Merge pull request #3446 from ethomson/portability portability: use `CHECK_FUNCTION_EXISTS` for checking whether functions exist...

21515f22

2015-09-29T15:49:16

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.

e683d152

2015-09-30T05:49:04

qsort_r/qsort_s: detect their support

8649dfd8

2015-09-29T13:36:37

p_futimes: support using futimens when available

146a96de

2015-09-30T09:41:25

openssl: don't try to teardown an unconnected SSL context SSL_shutdown() does not like it when we pass an unitialized ssl context to it. This means that when we fail to connect to a host, we hide the error message saying so with OpenSSL's indecipherable error message.

72b7c570

2015-09-30T09:17:18

Merge pull request #3411 from spraints/custom-push-headers Include custom HTTP headers

5c5df666

2015-09-27T23:32:20

Plug some leaks

e4b2b919

2015-09-25T10:37:41

Fix binary diffs git expects an empty line after the binary data: literal X ...binary data... <empty_line> The last literal block of the generated patches were not containing the required empty line. Example: diff --git a/binary_file b/binary_file index 3f1b3f9098131cfecea4a50ff8afab349ea66d22..86e5c1008b5ce635d3e3fffa4434c5eccd8f00b6 100644 GIT binary patch literal 8 Pc${NM&PdElPvrst3ey5{ literal 6 Nc${NM%g@i}0ssZ|0lokL diff --git a/binary_file2 b/binary_file2 index 31be99be19470da4af5b28b21e27896a2f2f9ee2..86e5c1008b5ce635d3e3fffa4434c5eccd8f00b6 100644 GIT binary patch literal 8 Pc${NM&PdElPvrst3ey5{ literal 13 Sc${NMEKbZyOexL+Qd|HZV+4u- git apply of that diff results in: error: corrupt binary patch at line 9: diff --git a/binary_file2 b/binary_file2 fatal: patch with only garbage at line 10 The proper formating is: diff --git a/binary_file b/binary_file index 3f1b3f9098131cfecea4a50ff8afab349ea66d22..86e5c1008b5ce635d3e3fffa4434c5eccd8f00b6 100644 GIT binary patch literal 8 Pc${NM&PdElPvrst3ey5{ literal 6 Nc${NM%g@i}0ssZ|0lokL diff --git a/binary_file2 b/binary_file2 index 31be99be19470da4af5b28b21e27896a2f2f9ee2..86e5c1008b5ce635d3e3fffa4434c5eccd8f00b6 100644 GIT binary patch literal 8 Pc${NM&PdElPvrst3ey5{ literal 13 Sc${NMEKbZyOexL+Qd|HZV+4u-

d7375662

2015-09-25T10:16:16

Copy custom_headers insteach of referencing the caller's copy

d16c1b97

2015-09-24T10:30:37

These can be static

e60db3c7

2015-09-24T09:24:10

Revise custom header error messages If the header doesn't look like a header (e.g. if it doesn't have a ":" or if it has newlines), report "custom HTTP header '%s' is malformed". If the header has the same name as a header already set by libgit2 (e.g. "Host"), report "HTTP header '%s' is already set by libgit2".

63cc5723

2015-09-24T09:13:05

Don't null-check

098f1e6e

2015-09-24T09:09:48

Use an array of forbidden custom headers

588e28eb

2015-09-24T13:20:48

Merge pull request #3437 from libgit2/cmn/plug-sm submodule: plug a few leaks

ab8f2c66

2015-09-23T15:09:19

submodule: plug a few leaks

92a47824

2015-09-22T23:10:56

win32: propogate filename too long errors

aebddbe7

2015-09-21T06:01:03

Merge pull request #3434 from ethomson/reservednames Win32 Reserved names: don't reserve names outside the working directory

538dfc88

2015-09-17T18:12:05

repository: only reserve repo dirs in the workdir Check that the repository directory is beneath the workdir before adding it to the list of reserved paths. If it is not, then there is no possibility of checking out files into it, and it should not be a reserved word. This is a particular problem with submodules where the repo directory may be in the super's .git directory.

cd677b8f

2015-09-18T12:28:05

config: buffer comments to match git's variable-adding When there is a comment at the end of a section, git keeps it there, while we write the new variable right at the end. Keep comments buffered and dump them when we're going to output a variable or section, or reach EOF. This puts us in line with the config files which git produces.

9ce2e7b3

2015-09-17T12:48:37

`mkdir`: cope with root path on win32

e164ddb1

2015-09-17T12:23:19

win32: return EACCES in `p_lstat` Don't coalesce all errors into ENOENT. At least identify EACCES. All callers should be handling this case already, as the POSIX `lstat` will return this.

81aaf370

2015-09-17T11:26:38

mkdir: chmod existing paths with `GIT_MKDIR_CHMOD`

e24c60db

2015-09-17T09:42:05

mkdir: find component paths for mkdir_relative `git_futils_mkdir` does not blindly call `git_futils_mkdir_relative`. `git_futils_mkdir_relative` is used when you have some base directory and want to create some path inside of it, potentially removing blocking symlinks and files in the process. This is not suitable for a general recursive mkdir within the filesystem. Instead, when `mkdir` is being recursive, locate the first existent parent directory and use that as the base for `mkdir_relative`.

0862ec2e

2015-09-17T09:58:38

core::mkdir tests: ensure we don't stomp symlinks in mkdir In `mkdir` and `mkdir_r`, ensure that we don't try to remove symlinks that are in our way.

ac2fba0e

2015-09-16T15:07:27

git_futils_mkdir_*: make a relative-to-base mkdir Untangle git_futils_mkdir from git_futils_mkdir_ext - the latter assumes that we own everything beneath the base, as if it were being called with a base of the repository or working directory, and is tailored towards checkout and ensuring that there is no bogosity beneath the base that must be cleaned up. This is (at best) slow and (at worst) unsafe in the larger context of a filesystem where we do not own things and cannot do things like unlink symlinks that are in our way.

eea7c850

2015-09-16T05:44:27

checkout: overwrite files with differing modes When a file exists on disk and we're checking out a file that differs in executableness, remove the old file. This allows us to recreate the new file with p_open, which will take the new mode into account and handle setting the umask properly. Remove any notion of chmod'ing existing files, since it is now handled by the aforementioned removal and was incorrect, as it did not take umask into account.

b0885675

2015-09-13T23:21:14

Merge pull request #3425 from ethomson/diriter_root Handle `git_path_diriter` instances at the drive root on Windows

9d905541

2015-09-13T14:18:08

diriter: don't double '/' on posix The canonical directory path of the root directory of a volume on POSIX already ends in a slash (eg, `/`). This is true only at the root. Do not add a slash to paths in this case.

26d7cf6e

2015-09-11T18:27:04

iterator: loop fs_iterator advance (don't recurse)

5a466bef

2015-09-13T13:59:41

diriter: don't double '/' on Windows The canonical directory path of the root directory of a volume on windows already ends in a slash (eg, `c:/`). This is true only at the volume root. Do not add a slash to paths in this case.

e78aeefa

2015-09-13T19:43:39

Merge pull request #3420 from ethomson/iterator iterator: advance the tree iterator smartly

548cb334

2015-09-13T16:32:24

Don't free config in `git_transaction_commit`. The config is not owned by the transaction, so please don’t free it.

1e80bf27

2015-09-13T06:21:18

Merge branch 'cmn/ignore-dir-check'

657afd35

2015-09-13T06:18:49

ignore: add test and adjust style and comment for dir with wildmatch The previous commit left the comment referencing the earlier state of the code, change it to explain the current logic. While here, change the logic to avoid repeating the copy of the base pattern.

305407e1

2015-09-13T06:03:12

Merge pull request #3370 from libgit2/cmn/submodule-refactor submodule: refactor to be more explicit in the search

8ab4d0e1

2015-09-12T15:32:18

diff: check pathspec on non-files When we're not doing pathspec matching, we let the iterator handle file matching for us. However, we can only trust the iterator to return *files* that match the pattern, because the iterator must return directories that are not strictly in the pathlist, but that are the parents of files that match the pattern, so that diff can later recurse into them. Thus, diff must examine non-files explicitly before including them in the delta list.

220d6f8a

2015-09-11T20:06:14

mempack: expose clear function

707f6537

2015-09-11T16:35:14

Removing memory leak in mempack's free It calls git_mempack_reset which reallocates the object array. git_oidmap_free is now called on it explicitly.

a1859e21

2015-09-11T17:38:28

iterator: advance the tree iterator smartly While advancing the tree iterator, if we advance over things that we aren't interested in, then call `current`. Which may *itself* call advance. While advancing the tree iterator, if we advance over things that we aren't interested in, then call `current`. Which may *itself* call advance. While advancing the tree iterator, if we advance over things that we aren't interested in, then call `current`. Which may *itself* call advance. While advancing the tree iterator, if we advance over things that we aren't interested in, then call `current`. Which may *itself* call advance. While advancing the tree iterator, if we advance over things that we aren't interested in, then call `current`. Which may *itself* call advance. Error: stack overflow.

thodg/libgit2/src

src

Log