|
2c9ed02e
|
2013-09-20T09:22:19
|
|
Merge pull request #1859 from linquize/init.templatedir
Make init.templatedir work
|
|
417472e3
|
2013-09-20T09:02:58
|
|
Check error value from git_futils_find_template_dir
|
|
|
0cd1c3bb
|
2013-09-18T23:06:10
|
|
Make init.templatedir work
|
|
5a284edc
|
2013-09-18T03:54:17
|
|
msvc: No void* arithmetic on Windows
|
|
|
4cf9323b
|
2013-09-17T18:49:47
|
|
Merge pull request #1860 from libgit2/cmn/indexer-hash
indexer: check the packfile trailer
|
|
e0aa6fc1
|
2013-09-18T02:20:17
|
|
indexer: don't reiterate the class in the message
|
|
|
98eb2c59
|
2013-09-17T17:44:05
|
|
indexer: check the packfile trailer for correctness
The packfile trailer gets sent over and we should check whether it's
correct as part of our sanity checks of the packfile.
|
|
|
3d4f1698
|
2013-09-17T10:21:22
|
|
Merge pull request #1858 from linquize/win32-template-dir
Configurable template dir for Win32
|
|
13f36ffb
|
2013-09-13T16:30:21
|
|
Add clar helpers for testing file equality
These are a couple of new clar helpers for testing that a file
has expected contents that I extracted from the checkout code.
Actually wrote this as part of an abandoned earlier attempt at a
new filters API, but it will be useful now for some of the tests
I'm going to write.
|
|
|
e399c7ee
|
2013-09-13T09:50:05
|
|
Fix win32 warnings
I wish MSVC understood that "const char **" is not a const ptr,
but it a non-const pointer to an array of const ptrs. Does that
seem like too much to ask.
|
|
|
eefc32d5
|
2013-09-16T12:54:40
|
|
Bug fixes and cleanups
This contains a few bug fixes and some header and API cleanups.
The main API change is that filters should now use GIT_PASSTHROUGH
to indicate that they wish to skip processing a file instead of
GIT_ENOTFOUND.
The bug fixes include a possible out-of-range buffer access in
the ident filter, a filter ordering problem I introduced into the
custom filter tests on Windows, and a filter buf NUL termination
issue that was coming up on Linux.
|
|
|
eab3746b
|
2013-09-15T22:23:39
|
|
More filtering tests including order
This adds more tests of filters, including the ident filter when
mixed with custom filters. I was able to combine with the reverse
filter and demonstrate that the order of filter application with
the default priority constants matches the order of core Git.
Also, this fixes two issues in the ident filter: preventing ident
expansion on binary files and avoiding a NULL dereference when
dollar sign characters are found without Id.
|
|
|
37f9e409
|
2013-09-13T21:43:00
|
|
Some tests with ident and crlf filters
Fixed the filter order to match core Git, too.
This test demonstrates an interesting behavior of core Git (which
is totally reasonable and which libgit2 matches, although mostly
by coincidence). If you use the ident filter and commit a file
with a garbage ident in it, like '$Id: this is just garbage$' and
then immediately do a 'git checkout-index' with the new file, Git
will not consider the file out of date and will not overwrite the
file with an updated $Id$. Libgit2 has the same behavior. If you
remove the file and then do a checkout-index, it will be replaced
with a filtered version that has injected the OID correctly.
|
|
|
b47349b8
|
2013-09-12T14:48:24
|
|
Port tests from PR 1683
This ports over some of the tests from
https://github.com/libgit2/libgit2/pull/1683
by @yorah and @ethomson
|
|
|
0e32635f
|
2013-09-12T14:47:15
|
|
Move binary check to CRLF filter itself
Checkout should not reject binary files from filters, as a filter
may actually wish to operate on binary files. The CRLF filter should
reject binary files itself if it wishes to. Moreover, the CRLF
filter requires this logic so that users can emulate the checkout
data in their odb -> workdir filtering.
Conflicts:
src/checkout.c
src/crlf.c
|
|
|
a9f51e43
|
2013-09-11T22:00:36
|
|
Merge git_buf and git_buffer
This makes the git_buf struct that was used internally into an
externally available structure and eliminates the git_buffer.
As part of that, some of the special cases that arose with the
externally used git_buffer were blended into the git_buf, such as
being careful about git_buf objects that may have a NULL ptr and
allowing for bufs with a valid ptr and size but zero asize as a
way of referring to externally owned data.
|
|
|
4b11f25a
|
2013-09-11T16:38:33
|
|
Add ident filter
This adds the ident filter (that knows how to replace $Id$) and
tweaks the filter APIs and code so that git_filter_source objects
actually have the updated OID of the object being filtered when
it is a known value.
|
|
|
40cb40fa
|
2013-09-11T14:23:39
|
|
Add functions to manipulate filter lists
Extend the git2/sys/filter API with functions to look up a filter
and add it manually to a filter list. This requires some trickery
because the regular attribute lookups and checks are bypassed when
this happens, but in the right hands, it will allow a user to have
granular control over applying filters.
|
|
|
0646634e
|
2013-09-11T12:45:37
|
|
Update filter registry code
This updates the git filter registry to be a little cleaner and
plugs some memory leaks.
|
|
|
a3aa5f4d
|
2013-09-11T12:45:20
|
|
Add simple global shutdown hooks
Increasingly there are a number of components that want to do some
cleanup at global shutdown time (at least if there are not going
to be memory leaks). This creates a very simple system of shutdown
hooks that will be invoked by git_threads_shutdown. Right now, the
maximum number of hooks is hardcoded, but since adding a hook is
not a public API, it should be fine and I thought it was better to
start off with really simple code.
|
|
|
2a7d224f
|
2013-09-10T16:33:32
|
|
Extend public filter api with filter lists
This moves the git_filter_list into the public API so that users
can create, apply, and dispose of filter lists. This allows more
granular application of filters to user data outside of libgit2
internals.
This also converts all the internal usage of filters to the public
APIs along with a few small tweaks to make it easier to use the
public git_buffer stuff alongside the internal git_buf.
|
|
|
974774c7
|
2013-09-09T16:57:34
|
|
Add attributes to filters and fix registry
The filter registry as implemented was too primitive to actually
work once multiple filters were coming into play. This expands
the implementation of the registry to handle multiple prioritized
filters correctly.
Additionally, this adds an "attributes" field to a filter that
makes it really really easy to implement filters that are based
on one or more attribute values. The lookup and even simple value
checking can all happen automatically without custom filter code.
Lastly, with the registry improvements, this fills out the filter
lifecycle callbacks, with initialize and shutdown callbacks that
will be called before the filter is first used and after it is
last invoked. This allows for system-wide initialization and
cleanup by the filter.
|
|
|
e7d0ced2
|
2013-09-11T12:38:06
|
|
Fix longstanding valgrind warning
There was a possible circumstance that could result in reading
past the end of a buffer. This check fixes that.
|
|
|
29e92d38
|
2013-09-10T16:53:09
|
|
Hook up filter initialize callback
I knew I forgot something
|
|
|
570ba25c
|
2013-08-30T16:02:07
|
|
Make git_filter_source opaque
|
|
|
85d54812
|
2013-08-28T16:44:04
|
|
Create public filter object and use it
This creates include/sys/filter.h with a basic definition of a
git_filter and then converts the internal code to use it. There
are related internal objects (git_filter_list) that we will want
to publish at some point, but this is a first step.
|
|
|
0cf77103
|
2013-08-26T23:17:07
|
|
Start of filter API + git_blob_filtered_content
This begins the process of exposing git_filter objects to the
public API. This includes:
* new public type and API for `git_buffer` through which an
allocated buffer can be passed to the user
* new API `git_blob_filtered_content`
* make the git_filter type and GIT_FILTER_TO_... constants public
|
|
|
a025907e
|
2013-09-17T23:55:11
|
|
Can load default template directory
|
|
|
b99b10f2
|
2013-09-17T23:38:52
|
|
Can git_libgit2_opts() with GIT_OPT_GET_TEMPLATE_PATH and GIT_OPT_SET_TEMPLATE_PATH
|
|
|
7e8934bb
|
2013-09-17T23:29:02
|
|
Can guess win32 git template dir
|
|
|
f84bc388
|
2013-09-17T23:24:44
|
|
Refactor git_win32__find_system_dirs() to extract "etc\\" as subpath parameter
|
|
|
4581f9d8
|
2013-09-17T08:09:57
|
|
Merge pull request #1833 from libgit2/cmn/config-include
Support config includes
|
|
|
89095fbd
|
2013-09-17T22:57:30
|
|
Fix failure in win32_find_git_in_registry() when UAC is turned on
Demand read only access to registry key instead of full access.
This might happen in Windows Vista and later.
|
|
|
ffbd337a
|
2013-09-17T22:57:06
|
|
Fix failure in win32_find_git_in_registry()
The buffer size 0 was definitely not enough so it failed
|
|
|
efc9e670
|
2013-09-17T03:45:35
|
|
Merge pull request #1856 from libgit2/cmn/no-orphans
No such thing as an orphan branch
|
|
|
38fba837
|
2013-09-17T03:40:50
|
|
Merge pull request #1851 from tiennou/libssh2-errors
Provide libssh2 error message
|
|
|
605da51a
|
2013-09-17T09:50:30
|
|
No such thing as an orphan branch
Unfortunately git-core uses the term "unborn branch" and "orphan
branch" interchangeably. However, "orphan" is only really there for
the checkout command, which has the `--orphan` option so it doesn't
actually create the branch.
Branches never have parents, so the distinction of a branch with no
parents is odd to begin with. Crucially, the error messages deal with
unborn branches, so let's use that.
|
|
eec4dcc3
|
2013-08-09T13:14:19
|
|
Whitespace.
|
|
|
b622aabe
|
2013-08-09T13:14:06
|
|
Add a wrapper to provide the libssh2 error message
|
|
|
c62b5ca5
|
2013-09-16T22:23:05
|
|
clone: Anal as fuck
|
|
|
f2df503b
|
2013-09-14T18:22:16
|
|
git_clone supports optional init_options
|
|
d7fc2eb2
|
2013-09-13T21:36:39
|
|
Fix memory leak in git_tree_walk on error or when stopping the walk from the supplied callback
|
|
|
4e01e302
|
2013-09-13T21:21:33
|
|
Prevent git_tree_walk 'skip entry' callback return code from leaking through as the return value of git_tree_walk
|
|
|
a6ee1661
|
2013-09-11T16:46:39
|
|
Merge pull request #1839 from isaac/ssh-repository-invalid
SSH: Clone fails with errors: ERROR: Repository invalid & Early EOF
|
|
8cf80525
|
2013-09-11T20:13:59
|
|
errors: Fix format of some error messages
|
|
|
6c38e60a
|
2013-09-10T16:55:58
|
|
Merge pull request #1838 from libgit2/cmn/first-parent
revwalk: allow simplifying by first-parent
|
|
|
209f9b67
|
2013-09-08T18:25:17
|
|
odb: Teach loose backend to return EAMBIGUOUS
|
|
|
d0cd6c42
|
2013-09-08T18:22:28
|
|
path: Make direach() return EUSER on callback error
|
|
|
15f7b9b8
|
2013-09-08T00:52:26
|
|
revwalk: allow simplifying by first-parent
When enabled, only the first parent of each commit will be queued,
enabling a simple way of using first-parent simplification.
|
|
b345026b
|
2013-09-10T05:16:52
|
|
Test for repo before removing leading colon
|
|
|
fbabe855
|
2013-09-08T14:11:08
|
|
Trim leading colon from ssh repository path
|
|
|
031f3f80
|
2013-09-07T22:39:05
|
|
odb: Error when streaming in too [few|many] bytes
|
|
|
53ea0513
|
2013-09-07T19:07:39
|
|
config: handle realloc issues from larger depths
As the include depth increases, the chance of a realloc
increases. This means that whenever we run git_array_alloc() or call
config_parse(), we need to remember what our reader's index is so we
can look it up again.
|
|
|
69789922
|
2013-09-07T18:50:35
|
|
config: return an error when reaching the maximum include depth
|
|
|
73fc5e01
|
2013-09-06T21:12:26
|
|
config: fix variable overriding
When two or more variables of the same name exist and the user asks
for a scalar, we must return the latest value assign to it.
|
|
|
a9fb7989
|
2013-09-06T20:51:35
|
|
config: refresh included files
We need to refresh the variables from the included files if they are
changed, so loop over all included files and re-parse the files if any
of them has changed.
|
|
|
19be0692
|
2013-09-06T20:34:02
|
|
config: keep a list of included files
When refreshing we need to refresh if any of the files have been
touched, so we need to keep the list.
|
|
|
d8d25acb
|
2013-09-05T19:24:20
|
|
config: add support for include directives
Relative, absolute and home-relative paths are supported. The
recursion limit it set at 10, just like in git.
|
|
|
1634df8c
|
2013-09-07T17:31:30
|
|
revparse: Simplify error handling
|
|
|
a8d67afe
|
2013-09-07T17:21:41
|
|
revparse: Prevent unnecessary odb backend calls
|
|
|
32e49929
|
2013-09-06T14:20:51
|
|
Merge pull request #1791 from libgit2/cmn/revwalk-recursive
revwalk: make mark_unintersting use a loop
|
|
|
4047950f
|
2013-08-29T14:19:34
|
|
odb: Prevent stream_finalize_write() from overwriting
Now that #1785 is merged, git_odb_stream_finalize_write() calculates the object id before invoking the odb backend.
This commit gives a chance to the backend to check if it already knows this object.
|
|
|
fb23d05f
|
2013-08-17T07:58:55
|
|
revwalk: make mark_unintersting use a loop
Using a recursive function can blow the stack when dealing with long
histories. Use a loop instead to limit the call chain depth.
This fixes #1223.
|
|
|
366bd2f4
|
2013-09-05T16:56:21
|
|
Merge pull request #1829 from libgit2/fix-umask-fragility
Fix umask fragility
|
|
|
a7fcc44d
|
2013-09-05T16:14:32
|
|
Better macro name for is-exec-bit-set test
|
|
|
af22dabb
|
2013-09-05T12:01:17
|
|
GIT_MODE_TYPE should exclude setgid bits
The GIT_MODE_TYPE macro was looking at all bits above the
permissions, but it should really just look at the top bits so
that it will give the right results for a setgid or setuid entry.
Since we're now using these macros in the tests, this was causing
a test failure on platforms that don't support setgid.
|
|
|
f240acce
|
2013-09-05T11:20:12
|
|
Add more file mode permissions macros
This adds some more macros for some standard operations on file
modes, particularly related to permissions, and then updates a
number of places around the code base to use the new macros.
|
|
|
d209cc47
|
2013-09-05T18:06:12
|
|
config: decouple the backend from the reader at the low level
In order to support config includes, we must differentiate between the
backend's main file and the file we are currently parsing.
This lays the groundwork for includes, keeping the current behaviours.
|
|
|
cca9bea4
|
2013-09-05T06:30:08
|
|
Merge pull request #1831 from linquize/version.h-warning
Fix warning in src/win32/version.h
|
|
|
21753d48
|
2013-09-05T20:42:47
|
|
Fix warning in src/win32/version.h
|
|
f42d546c
|
2013-09-04T13:07:42
|
|
Provide better errors for push on non-bare local remotes
|
|
|
e9853592
|
2013-09-04T06:20:36
|
|
Merge pull request #1817 from libgit2/ntk/fix/backend/honor_refresh_capabilities
Of backends and refreshers...
|
|
|
74b38d19
|
2013-09-04T13:16:57
|
|
Backport @peff's fix for duplicates in sha1_lookup
|
|
|
b1a6c316
|
2013-08-30T17:36:00
|
|
odb: Move the auto refresh logic to the pack backend
Previously, `git_object_read()`, `git_object_read_prefix()` and
`git_object_exists()` were implementing an auto refresh logic. When the
expected object couldn't be found in any backend, a call to
`git_odb_refresh()` was triggered and the lookup was once again performed
against all backends.
This commit removes this auto-refresh logic from the odb layer and pushes
it down into the pack-backend (as it's the only one currently exposing
a `refresh()` endpoint).
|
|
|
cae52938
|
2013-09-03T14:00:27
|
|
Fix resolving relative windows network paths
|
|
|
6208bd49
|
2013-09-03T12:29:18
|
|
Merge pull request #1804 from ethomson/rewrites
Minor changes for rewrites
|
|
|
37fc44dd
|
2013-09-03T12:27:56
|
|
Merge pull request #1825 from nvloff/resolve_relative
path: properly resolve relative paths
|
|
6d9a6c5c
|
2013-09-03T07:58:21
|
|
path: properly resolve relative paths
|
|
|
b595b385
|
2013-09-03T04:11:07
|
|
Merge pull request #1814 from libgit2/is-empty-fix
Fix incorrect precedence within git_repository_is_empty()
|
|
b1447ede
|
2013-09-01T18:47:56
|
|
Use git__insertsort_r on Android too.
|
|
|
d45e9480
|
2013-08-31T18:22:50
|
|
oid: git_oid_shorten_add() sets GITERR_INVALID when OID set is full
|
|
|
9b4ed214
|
2013-08-30T17:07:41
|
|
odb: Code beautification
|
|
|
a12e069a
|
2013-08-30T16:31:52
|
|
odb: Honor the non refreshing capability of a backend
|
|
|
42181836
|
2013-08-29T10:27:01
|
|
Treat detached HEAD as non-empty repo
This simplifies the git_repository_is_empty a bit so that a
detached HEAD is just taken to mean the repo is not empty, since
a newly initialized repo will not have a detached HEAD.
|
|
|
8b2f230c
|
2013-08-29T13:27:37
|
|
repository: Make the is_empty check more explicit
|
|
4ab6a759
|
2013-08-28T22:51:44
|
|
Fix incorrect precedence within git_repository_is_empty()
Reverts part of 9146f1e57ec4f2b6fa293c78d54f1383464ff5be.
|
|
|
19b9a092
|
2013-08-28T11:20:47
|
|
Add stddef include for sortedcache
All use of sortedcache will need this header, so put it in the
definition of the sortedcache API.
|
|
|
dbecec37
|
2013-08-28T09:38:14
|
|
Merge pull request #1805 from libgit2/threading-packed-load
Thread safety for the refdb_fs
|
|
17c7fbf6
|
2013-08-21T14:07:53
|
|
Split rewrites, status doesn't return rewrites
Ensure that we apply splits to rewrites, even if we're not
interested in examining it closely for rename/copy detection.
In keeping with core git, status should not display rewrites,
it should simply show files as "modified".
|
|
|
1ef05e3f
|
2013-08-28T06:05:50
|
|
Merge pull request #1803 from libgit2/ntk/topic/even_more_lenient_remote_parsing
Even more lenient remote parsing
|
|
|
d07cc8a2
|
2013-08-28T06:05:07
|
|
Merge pull request #1808 from frasertweedale/fix/freebsd-dup-include
netops: remove duplicate include
|
|
|
b8b22d77
|
2013-08-28T06:04:51
|
|
Merge pull request #1772 from libgit2/config-iter
Configuration iterators redux
|
|
|
1ff3a094
|
2013-08-27T19:41:44
|
|
Improve win32 version check, no ipv6 tests on XP
|
|
|
f087bc24
|
2013-08-27T12:08:55
|
|
Convert to our own SRWLOCK type on Win32
|
|
|
aec87f71
|
2013-08-27T19:14:18
|
|
remote: Make git_remote_list() detect pushurl
|
|
|
191adce8
|
2013-08-27T20:00:28
|
|
vector: Teach git_vector_uniq() to free while deduplicating
|
|
|
c9ffa84b
|
2013-08-21T16:04:25
|
|
remote: Relax the parsing logic even more
In order to be loaded, a remote needs to be configured with at least a `url` or a `pushurl`.
ENOTFOUND will be returned when trying to git_remote_load() a remote with neither of these entries defined.
|
|
|
ece24ef7
|
2013-08-21T13:37:21
|
|
remote: Don't parse missing urls as empty strings
|
|
|
44bc0c6a
|
2013-08-21T13:20:17
|
|
remote: Warn the user when connecting with no url
|
|
|
b83c92dd
|
2013-08-21T13:16:17
|
|
remote: Assert proper GIT_DIRECTION_XXXX values
|