|
381caf56
|
2016-04-02T22:19:42
|
|
Merge pull request #3724 from ethomson/submodule_start_supports_silly_slashes
iterator/diff: allow trailing `/` on start/end paths to match submodules
|
|
7018e3b7
|
2016-04-02T16:52:53
|
|
Merge pull request #3723 from libgit2/cmn/ignore-symlink
ignore: don't use realpath to canonicalize path
|
|
|
d47f7e1c
|
2016-04-02T13:03:09
|
|
iterator: support trailing `/` in start for submod
Allow callers to specify a start path with a trailing slash to match
a submodule, instead of just a directory. This is for some legacy
behavior that's sort of dumb, but there it is.
|
|
|
2e0391f4
|
2016-04-02T11:33:00
|
|
diff: test submodules are found with trailing `/`
Test that submodules are found when the are included in a pathspec
but have a trailing slash.
|
|
d364dc8b
|
2016-04-01T14:33:42
|
|
ignore: don't use realpath to canonicalize path
If we're looking for a symlink, realpath will give us the resolved path,
which is not what we're after, but a canonicalized version of the path
the user asked for.
|
|
|
36fc2557
|
2016-04-01T04:09:50
|
|
Merge pull request #3720 from pks-t/pks/merge-driver-memleaks
merge_driver: fix missing `goto done;`
|
|
83c93a7c
|
2016-04-01T09:37:55
|
|
merge_driver: fix missing `goto done;`
The code initializing the merge driver registry accidentally
forgot a `goto done` in case of an error. Because of this the
next line, which registers the global shutdown callback for the
merge drivers, is only called when an error occured.
Fix this by adding the missing `goto done`. This fixes some
memory leaks when the global state is shut down.
|
|
|
1cac688d
|
2016-04-01T00:29:51
|
|
Merge pull request #3719 from libgit2/ethomson/submodule_status
WD iterator: properly identify submodules
|
|
|
4df6ddaa
|
2016-03-31T15:05:34
|
|
iterator: use correct search function
|
|
|
74ab5f2c
|
2016-03-31T17:33:44
|
|
status: test submodules with mixed case
|
|
|
24ecf18e
|
2016-03-31T14:04:43
|
|
Merge pull request #3717 from libgit2/ethomson/leaks
Plug some leaks
|
|
|
c4aa5c04
|
2016-03-31T10:43:57
|
|
leaks: call `xdl_free_classifier`
|
|
|
17442b28
|
2016-03-30T17:47:05
|
|
leaks: fix some leaks in the tests
|
|
|
97054833
|
2016-03-30T17:41:08
|
|
leaks: fix some iterator leaks
|
|
|
f5c874a4
|
2016-03-29T14:47:31
|
|
Plug a few leaks
|
|
|
1694a639
|
2016-03-31T10:04:43
|
|
Merge pull request #3716 from libgit2/cmn/typedef-sizet
Add a no-op size_t typedef for the doc parser
|
|
|
d53cc13e
|
2016-03-31T04:12:46
|
|
Merge pull request #3575 from pmq20/master-13jan16
Remove duplicated calls to git_mwindow_close
|
|
|
bd4ef337
|
2016-03-31T03:50:11
|
|
Merge pull request #3715 from pks-t/pks/xprepare-memleak
xprepare memleaks
|
|
|
98444536
|
2016-03-31T11:35:53
|
|
Add a no-op size_t typedef for the doc parser
Clang's documentation parser, which we use in our documentation system
does not report any comments for functions which use size_t as a type.
The root cause is buried somewhere in libclang but we can work around it
by defining the type ourselves. This typedef makes sure that libclang
sees it and that we do not change its size.
|
|
|
6045afd3
|
2016-03-31T11:32:36
|
|
xdiff/xprepare: fix a memory leak
The xdl_prepare_env() function may initialise an xdlclassifier_t
data structure via xdl_init_classifier(), which allocates memory
to several fields, for example 'rchash', 'rcrecs' and 'ncha'.
If this function later exits due to the failure of xdl_optimize_ctxs(),
then this xdlclassifier_t structure, and the memory allocated to it,
is not cleaned up.
In order to fix the memory leak, insert a call to xdl_free_classifier()
before returning.
This patch was originally written by Ramsay Jones (see commit
87f16258367a3b9a62663b11f898a4a6f3c19d31 in git.git).
|
|
|
1bce1487
|
2016-03-31T11:30:31
|
|
xdiff/xprepare: use the XDF_DIFF_ALG() macro to access flag bits
Commit 307ab20b3 ("xdiff: PATIENCE/HISTOGRAM are not independent option
bits", 19-02-2012) introduced the XDF_DIFF_ALG() macro to access the
flag bits used to represent the diff algorithm requested. In addition,
code which had used explicit manipulation of the flag bits was changed
to use the macros.
However, one example of direct manipulation remains. Update this code to
use the XDF_DIFF_ALG() macro.
This patch was originally written by Ramsay Jones (see commit
5cd6978a9cfef58de061a9525f3678ade479564d in git.git).
|
|
|
2f0450f4
|
2016-03-29T03:26:43
|
|
Merge pull request #3712 from ethomson/config_duplicate_section
config: don't write duplicate section
|
|
|
b085ecbe
|
2016-03-28T13:51:21
|
|
Merge pull request #3703 from libgit2/cmn/multivar-set-locked
config: don't special-case multivars that don't exist yet
|
|
|
76e1a679
|
2016-03-28T08:56:13
|
|
config::write::repeated: init our buffer
|
|
|
e25e1ca1
|
2016-03-28T11:13:51
|
|
config: don't write section header if we're in it
If we hit the EOF while trying to write a new value, it may be that
we're already in the section that we were looking for. If so, do not
write a (duplicate) section header, just write the value.
|
|
|
3e95bd36
|
2016-03-04T14:51:16
|
|
config: show we write a spurious duplicated section header
We should notice that we are in the correct section to add. This is a
cosmetic bug, since replacing any of these settings does work.
|
|
|
e89abec6
|
2016-03-28T09:50:31
|
|
Merge pull request #3708 from sschuberth/master
CMakeLists: Further improve the error messages regarding CMAKE_SIZEOF_VOID_P
|
|
|
7b29be31
|
2016-03-26T05:39:07
|
|
Merge pull request #3691 from ethomson/iterators
Some FANTASTIC iterator refactoring
|
|
09064f15
|
2016-03-22T10:28:50
|
|
iterator: new index-iterator test for pathlist + includings trees
|
|
|
8152a748
|
2016-03-22T10:27:50
|
|
iterator: more pathlist-related tests should test actual paths
|
|
|
9eb9e5fa
|
2016-03-21T17:19:24
|
|
iterator: cleanups
Remove some unused functions, refactor some ugliness.
|
|
|
d6713ec6
|
2016-03-22T10:30:07
|
|
iterator: comment fixed
|
|
|
f4777058
|
2016-03-22T10:29:41
|
|
iterator: unused includes removed
|
|
|
c017c183
|
2016-03-22T10:29:12
|
|
iterator: new workdir-iterator test for pathlist + includings trees
|
|
|
d712c2b2
|
2016-03-21T18:30:21
|
|
iterator: don't run the gunk test by default on CI
(It's slow!)
|
|
|
35877463
|
2016-03-21T17:03:00
|
|
iterator: refactor empty iterator to new style
|
|
|
247e3b43
|
2016-03-21T16:51:45
|
|
iterator: mandate `advance_over`
Since the three iterators implement `advance_over` differently,
mandate it and implement each.
|
|
|
0ef0b71c
|
2016-03-21T12:54:47
|
|
iterator: refactor index iterator
|
|
|
ba6f86eb
|
2016-03-18T17:33:46
|
|
Introduce `git_path_common_dirlen`
|
|
|
82a1aab6
|
2016-03-18T12:59:35
|
|
iterator: move the index into the iterator itself
|
|
|
de034cd2
|
2016-03-18T10:59:38
|
|
iterator: give the tests a proper hierarchy
Iterator tests were split over repo::iterator and diff::iterator,
with duplication between the two. Move them to iterator::index,
iterator::tree, and iterator::workdir.
|
|
|
d4763c98
|
2016-03-24T06:56:25
|
|
Merge pull request #3574 from chescock/buffer-sideband-pack-data
Buffer sideband packet data
|
|
035430b7
|
2016-03-24T14:10:29
|
|
CMakeLists: Further improve the error messages regarding CMAKE_SIZEOF_VOID_P
|
|
df25daef
|
2016-01-04T12:12:24
|
|
Added clar test for #3568
|
|
|
67885532
|
2016-03-17T15:29:21
|
|
diff: stop processing nitem when its removed
When a directory is removed out from underneath us, stop trying to
manipulate it.
|
|
|
0a2e1032
|
2016-03-17T15:19:45
|
|
iterator: drop `advance_into_or_over`
Now that iterators do not return `GIT_ENOTFOUND` when advancing
into an empty directory, we do not need a special `advance_into_or_over`
function.
|
|
|
6cd9573f
|
2016-03-17T15:09:38
|
|
iterator: test that we can `advance_into` empty dirs
Prior iterator implementations returned `GIT_ENOTFOUND` when
trying to advance into empty directories. Ensure that we no longer
do that and simply handle them gracefully.
|
|
b6204260
|
2016-02-10T13:46:14
|
|
Failing test.
|
|
|
ae86aa5a
|
2016-03-16T11:38:02
|
|
iterator: test pathlist handling for directories
tree_iterator was only working properly for a pathlist containing
file paths. In case of directory paths, it didn't match children
which contradicts GIT_DIFF_DISABLE_PATHSPEC_MATCH and
is different from index_iterator and fs_iterator.
As a consequence head-to-index status reporting for a specific
directory did not work properly -- all files have been reported
as added.
Include additional tests.
|
|
|
6bcddf88
|
2016-03-16T17:14:36
|
|
iterator: test `advance_over` with a pathlist
|
|
|
9fb2527f
|
2016-03-16T16:29:38
|
|
iterator: add tests for advance_over
`git_iterator_advance_over` is a gnarly bit of code with no actual
tests.
|
|
|
85541f43
|
2016-03-16T13:31:35
|
|
iterator: test workdir pathlist with deep paths
In the workdir iterator we do some tricky things to step down into
directories to look for things that are in our pathlist. Make sure
that we don't confuse between folders that we're definitely going to
return everything in and folders that we're only stepping down into
to keep looking for matches.
|
|
|
908d8de8
|
2016-03-16T12:15:55
|
|
iterator: workdir tests with submodules
Ensure that when specifying start/end paths, or pathlists, that we
deal correctly with submodules.
|
|
|
c3d195f1
|
2016-03-16T11:45:44
|
|
iterator: expand workdir tests with pathlist
Expand the workdir tests to validate the paths in case sensitive
and insensitive tests.
|
|
|
4c88198a
|
2016-03-16T10:17:20
|
|
iterator: test that we're at the end of iteration
Ensure that we have hit the end of iteration; previously we tested
that we saw all the values that we expected to see. We did not
then ensure that we were at the end of the iteration (and that there
were subsequently values in the iteration that we did *not* expect.)
|
|
|
0e0589fc
|
2016-03-10T00:04:26
|
|
iterator: combine fs+workdir iterators more completely
Drop some of the layers of indirection between the workdir and the
filesystem iterators. This makes the code a little bit easier to
follow, and reduces the number of unnecessary allocations a bit as
well. (Prior to this, when we filter entries, we would allocate them,
filter them and then free them; now we do the filtering before
allocation.)
Also, rename `git_iterator_advance_over_with_status` to just
`git_iterator_advance_over`. Mostly because it's a fucking long-ass
function name otherwise.
|
|
|
d051de24
|
2016-03-10T12:54:33
|
|
iterator: test fs iterator w/ many nested empty dirs
|
|
|
a4f520a6
|
2016-03-10T11:07:13
|
|
iterator: skip unreadable directories in fs iterator
Do not abort iteration in the middle when encountering an unreadable
directory. Instead, skip it, as if it didn't exist.
|
|
|
702b23d7
|
2016-03-11T11:27:58
|
|
checkout: provide internal func to compute target path
Many code paths in checkout need the final, full on-disk path of the
file they're writing. (No surprise). However, they all munge the
`data->path` buffer themselves to get there. Provide a nice helper
method for them.
Plus, drop the use `git_iterator_current_workdir_path` which does the
same thing but different. Checkout is the only caller of this silly
function, which lets us remove it.
|
|
|
be30387e
|
2016-02-25T16:05:18
|
|
iterators: refactored tree iterator
Refactored the tree iterator to never recurse; simply process the
next entry in order in `advance`. Additionally, reduce the number of
allocations and sorting as much as possible to provide a ~30% speedup
on case-sensitive iteration. (The gains for case-insensitive iteration
are less majestic.)
|
|
|
277c85eb
|
2016-03-02T15:38:13
|
|
repo::iterator: don't go out of bounds
|
|
|
f0224772
|
2016-02-17T18:04:19
|
|
git_object_dup: introduce typesafe versions
|
|
|
684b35c4
|
2016-02-25T15:11:14
|
|
iterator: disambiguate reset and reset_range
Disambiguate the reset and reset_range functions. Now reset_range
with a NULL path will clear the start or end; reset will leave the
existing start and end unchanged.
|
|
|
ac05086c
|
2016-02-25T14:51:23
|
|
iterator: drop unused/unimplemented `seek`
|
|
|
8a5a2e2f
|
2016-03-17T00:47:50
|
|
status: update test to include valid OID
|
|
|
63f7b7f9
|
2016-03-23T13:14:04
|
|
Merge pull request #3707 from sschuberth/master
CMakeLists: Show the pointer size for an unsupported architecture
|
|
|
f9601e6f
|
2016-03-23T20:37:39
|
|
CMakeLists: Show the pointer size for an unsupported architecture
Showing the pointer size gives a hint as to why we think this is an
unsupported architecture.
|
|
|
1a2d8bd3
|
2016-03-23T16:51:52
|
|
array: fix search for empty arrays
When the array is empty `cmp` never gets set by the comparison
function. Initialize it so we return ENOTFOUND in those cases.
|
|
|
661db4f4
|
2016-03-23T03:45:53
|
|
Merge pull request #3704 from ethomson/tree-reuse
tree: drop the now-unnecessary entries vector
|
|
|
0a7ce499
|
2016-03-22T14:34:35
|
|
Merge pull request #3502 from libgit2/cmn/createblob-stream
Add ability to write a filtered blob through a stream
|
|
|
6669e3e8
|
2015-11-08T04:28:08
|
|
blob: remove _fromchunks()
The callback mechanism makes it awkward to write data from an IO
source; move to `_fromstream()` which lets the caller remain in control,
in the same vein as we prefer iterators over foreach callbacks.
|
|
|
e2bb9ed3
|
2015-11-04T10:39:55
|
|
CHANGELOG: add a note about _fromstream() and _fromstream_commit()
|
|
|
35e68606
|
2015-11-04T10:36:50
|
|
blob: fix fromchunks iteration counter
By returning when the count goes to zero rather than below it, setting
`howmany` to 7 in fact writes out the string 6 times.
Correct the termination condition to write out the string the amount of
times we specify.
|
|
|
0a5c6028
|
2015-11-04T10:30:48
|
|
blob: introduce creating a blob by writing into a stream
The pair of `git_blob_create_frombuffer()` and
`git_blob_create_frombuffer_commit()` is meant to replace
`git_blob_create_fromchunks()` by providing a way for a user to write a
new blob when they want filtering or they do not know the size.
This approach allows the caller to retain control over when to add data
to this buffer and a more natural fit into higher-level language's own
stream abstractions instead of having to handle IO wait in the callback.
The in-memory buffer size of 2MB is chosen somewhat arbitrarily to be a
round multiple of usual page sizes and a value where most blobs seem
likely to be either going to be way below or way over that size. It's
also a round number of pages.
This implementation re-uses the helper we have from `_fromchunks()` so
we end up writing everything to disk, but hopefully more efficiently
than with a default filebuf. A later optimisation can be to avoid
writing the in-memory contents to disk, with some extra complexity.
|
|
|
3fa764ed
|
2015-11-04T09:20:14
|
|
filebuf: allow using a custom buffer size
Allow setting the buffer size on open in order to use this data
structure more generally as a spill buffer, with larger buffer sizes for
specific use-cases.
|
|
|
e2e4bae9
|
2016-03-22T00:18:44
|
|
tree: drop the now-unnecessary entries vector
Remove the now-unnecessary entries vector. Add `git_array_search`
to binary search through an array to accomplish this.
|
|
|
e50a49ee
|
2016-03-22T01:54:49
|
|
Merge pull request #3559 from yongthecoder/master
Add a sanity check in git_indexer_commit to avoid subtraction overflow.
|
|
|
cec320fe
|
2016-03-22T00:44:05
|
|
Merge pull request #3701 from jfultz/fix-0.24.0-changelog
Fix some errors I found in the changelog for 0.24.0
|
|
|
7adca53e
|
2016-03-21T21:29:33
|
|
Merge pull request #3702 from libgit2/cmn/tree-reuse
Reuse a tree's buffer and allocate constant-sized entries in an array
|
|
|
6f09911c
|
2016-03-21T21:10:26
|
|
config: don't special-case multivars that don't exist yet
This special-casing ignores that we might have a locked file, so the
hashtable does not represent the contents of the file we want to
write. This causes multivar writes to overwrite entries instead of add
to them when under lock.
There is no need for this as the normal code-path will write to the file
just fine, so simply get rid of it.
|
|
|
4ed9e939
|
2016-03-20T12:01:45
|
|
tree: store the entries in a growable array
Take advantage of the constant size of tree-owned arrays and store them
in an array instead of a pool. This still lets us free them all at once
but lets the system allocator do the work of fitting them in.
|
|
|
60a194aa
|
2016-03-20T11:00:12
|
|
tree: re-use the id and filename in the odb object
Instead of copying over the data into the individual entries, point to
the originals, which are already in a format we can use.
|
|
|
a177756b
|
2016-03-18T13:00:27
|
|
win32: free thread-local data on thread exit
|
|
0b24855e
|
2016-03-18T15:03:08
|
|
Fix some errors I found in the changelog for 0.24.0
|
|
|
ec5a43b6
|
2016-03-18T06:37:41
|
|
Merge pull request #3699 from libgit2/cmn/win32-free-tls
win32: free thread-local data on thread exit
|
|
|
3a43677e
|
2016-03-18T06:37:04
|
|
Merge pull request #3660 from mstrap/mingw
MinGW builds should optionally create DLLs without "lib" prefix
|
|
|
e18df18b
|
2016-03-17T18:01:37
|
|
Merge pull request #3564 from ethomson/merge_drivers
Custom merge drivers and proper gitattributes `merge` handling
|
|
|
e02acbb3
|
2016-03-17T17:25:49
|
|
Merge pull request #3695 from ethomson/contributing
CONTRIBUTING: document the optional tests
|
|
|
1308059d
|
2016-03-17T12:01:37
|
|
CONTRIBUTING: document the optional tests
|
|
|
d953c450
|
2016-02-28T21:30:00
|
|
merge drivers: handle configured but not found driver
|
|
|
6d8b2cdb
|
2016-02-28T09:34:11
|
|
merge driver: remove `check` callback
Since the `apply` callback can defer, the `check` callback is not
necessary. Removing the `check` callback further makes the `payload`
unnecessary along with the `cleanup` callback.
|
|
|
3f7d3df1
|
2016-02-27T16:57:12
|
|
merge driver: improve inline documentation
|
|
|
967e073d
|
2016-02-27T16:42:02
|
|
merge driver: correct global initialization
|
|
|
7a3ab14f
|
2016-02-07T15:58:34
|
|
merge driver: get a pointer to favor
|
|
|
46625836
|
2016-02-07T15:19:43
|
|
merge driver: correct indentation
|
|
58d33126
|
2015-12-26T19:47:17
|
|
merge driver: tests for set and unset merge attribute
Ensure that setting the merge attribute forces the built-in default
`text` driver and does *not* honor the `merge.default` configuration
option. Further ensure that unsetting the merge attribute forces
a conflict (the `binary` driver).
|
|
|
d3f0875a
|
2015-12-25T00:34:39
|
|
merge driver: tests for custom default merge drivers
|
|
|
30a94ab7
|
2015-12-24T22:52:23
|
|
merge driver: allow custom default driver
Allow merge users to configure a custom default merge driver via
`git_merge_options`. Similarly, honor the `merge.default` configuration
option.
|
|
|
7d307c1e
|
2015-12-23T23:52:02
|
|
merge driver: test GIT_EMERGECONFLICT
When a `check` or `apply` callback function returns `GIT_EMERGECONFLICT`
stop and product a conflict.
|
|
|
59f29314
|
2015-12-23T23:44:58
|
|
merge driver: test GIT_PASSTHROUGH
When a `check` or `apply` callback function returns `GIT_PASSTHROUGH`,
move on to the default merge driver.
|