|
b294f97e
|
2013-09-25T01:41:17
|
|
Merge pull request #1873 from mikeando/doc_cleanup
Cleaned up some tables in checkout-internals doc
|
|
|
a955412e
|
2013-09-25T01:40:43
|
|
Merge pull request #1874 from mikeando/doc_cleanup2
Fixed formatting of diff-internals.md
|
|
6918d81e
|
2013-09-25T11:14:06
|
|
Fixed formatting of diff-internals.md
Indentation for lists was not working correctly.
|
|
|
53e0636c
|
2013-09-24T16:43:06
|
|
Cleaned up some tables in checkout-internals doc
The markdown wasn't rendering correctly.
|
|
|
d8de5c42
|
2013-09-24T15:55:51
|
|
Merge pull request #1872 from libgit2/config-isolate-xdg
Make tests pass if XDG config exists
|
|
1c8de380
|
2013-09-20T16:58:04
|
|
Make tests pass if XDG config exists
|
|
|
4dbdbf64
|
2013-09-24T15:21:44
|
|
Merge pull request #1871 from libgit2/cross-protocol-redirects-alt
Alternative fix for cross protocol redirects
|
|
|
46fbc88e
|
2013-09-24T14:50:06
|
|
Prevent HTTPS to HTTP redirect
|
|
|
eb0ff130
|
2013-09-24T14:07:08
|
|
Disconnect path string to preserve after redirect
The subtransport path was relying on pointing to data owned by
the remote which meant that after a redirect, the updated path
was getting lost for future requests. This updates the http
transport to strdup the path and maintain its own lifetime.
This also pulls responsibility for parsing the URL back into the
http transport and isolates the functions that parse and free that
connection data so that they can be reused between the initial
parsing and the redirect parsing.
|
|
|
95bff9d4
|
2013-09-24T12:01:24
|
|
Merge pull request #1869 from ethomson/fs_iterator_race_2
Ignore files that disappear while iterating
|
|
5c3b8ef4
|
2013-09-24T14:52:58
|
|
Ignore files that disappear while iterating
On occasion, files can disappear while we're iterating the
filesystem, between calls to readdir and stat. Let's pretend
those didn't exist in the first place.
|
|
c9144405
|
2013-09-23T11:37:35
|
|
Properly parse urls that include protocol://
|
|
|
210d5325
|
2013-09-23T12:09:23
|
|
Allow redirects to use same host
|
|
|
4a1b4015
|
2013-09-24T10:32:40
|
|
Merge pull request #1865 from arrbee/various-cleanups
Various warning cleanup and minor fixes
|
|
|
5dc8513b
|
2013-09-24T10:30:43
|
|
Merge pull request #1864 from libgit2/minimize-regex-usage
Minimize regex usage
|
|
|
d005885f
|
2013-09-24T10:20:16
|
|
Fix up filebuf tests a bit
|
|
|
634f10f6
|
2013-09-24T10:11:20
|
|
Fix incorrect return code in crlf filter
The git_buf_text_gather_stats call returns a boolean indicating if
the file looks like binary data. That shouldn't be an error; it
should be used to skip CRLF processing though.
|
|
|
d89b8b60
|
2013-09-24T09:30:02
|
|
Merge pull request #1867 from ethomson/remove_not_delete
'del' instead of 'delete' for the poor C++ users
|
|
|
e3f3868a
|
2013-09-24T11:04:14
|
|
'del' instead of 'delete' for the poor C++ users
|
|
|
a3c2d916
|
2013-09-23T21:59:32
|
|
Fix warnings in Makefile.embed
|
|
|
00e85927
|
2013-09-23T21:52:42
|
|
Clean up unnecessary git_buf_printf calls
This replaces some git_buf_printf calls with simple calls to
git_buf_put instead. Also, it fixes a missing va_end inside
the git_buf_vprintf implementation.
|
|
|
71379313
|
2013-09-23T13:40:23
|
|
Fix warnings on Windows 64-bit build
|
|
|
1ca3e49f
|
2013-09-23T13:34:01
|
|
Clean up newly introduced warnings
The attempt to "clean up warnings" seems to have introduced some
new warnings on compliant compilers. This fixes those in a way
that I suspect will also be okay for the non-compliant compilers.
Also this fixes what appears to be an extra semicolon in the
repo initialization template dir handling (and as part of that
fix, handles the case where an error occurs correctly).
|
|
|
106c12f1
|
2013-09-23T13:31:15
|
|
Remove regex usage from places that don't need it
In revwalk, we are doing a very simple check to see if a string
contains wildcard characters, so a full regular expression match
is not needed.
In remote listing, now that we have git_config_foreach_match with
full regular expression matching, we can take advantage of that
and eliminate the regex here, replacing it with much simpler string
manipulation.
|
|
|
10edb7a9
|
2013-09-22T13:46:39
|
|
Merge pull request #1863 from linquize/typo
Fix typo in documentation
|
|
07fb67f9
|
2013-09-22T05:55:39
|
|
merge: reverse array and length parameter order
Make it pair up with the one for commits. This fixes #1691.
|
|
1b57699a
|
2013-09-22T09:11:43
|
|
Fix typo in documentation
|
|
|
92d19d16
|
2013-09-21T09:34:03
|
|
Merge pull request #1840 from linquize/warning
Fix warning
|
|
|
daef29ea
|
2013-09-20T09:41:49
|
|
Merge pull request #1861 from ben/molo-valgrind
OSX 10.8 + Valgrind
|
|
|
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
|
|
|
32b247d5
|
2013-09-19T10:30:43
|
|
Suppress noise from running Valgrind on OSX 10.8
|
|
|
66566516
|
2013-09-08T17:15:42
|
|
Fix warning
|
|
|
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
|
|
|
bb371b62
|
2013-09-17T09:57:55
|
|
Merge pull request #1847 from libgit2/filters-alternative
Alternative proposal for filter API
|
|
|
f60ed4e6
|
2013-09-16T15:08:35
|
|
Update clar and recreate cl_assert_equal_sz
This updates clar to the version without cl_assert_equal_sz and
then adds a new version of that macro the clar_libgit2.h. The new
version works around a strange issue that seemed to be arising on
release builds with VS 10 64-bit builds.
|
|
|
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.
|
|
|
155fa234
|
2013-09-05T15:06:42
|
|
Add clar helper to create new commit from index
There were a lot of places in the test code base that were creating
a commit from the index on the current branch. This just adds a
helper to handle that case pretty easily. There was only one test
where this change ended up tweaking the test data, so pretty easy
and mostly just a cleanup.
|
|
|
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.
|
|
|
fa9cc148
|
2013-09-13T13:41:33
|
|
Fix cleanup issues with new tests
|
|
|
8427757f
|
2013-09-13T12:32:45
|
|
Fixing up some win32 issues with autocrlf
|
|
|
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.
|
|
|
ad7417d7
|
2013-09-13T09:44:30
|
|
Make filter tests somewhat more robust
The global and system config could interfere with the filter
tests by imposing CRLF filtering where it was not anticipated.
This better isolates the tests from the system settings.
|
|
|
d5b1866c
|
2013-09-13T09:26:26
|
|
Rearrange clar submodule cleanup code
|
|
|
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.
|
|
|
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
|
|
|
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.
|
|
|
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
|
|
|
570ba25c
|
2013-08-30T16:02:07
|
|
Make git_filter_source opaque
|
|
|
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
|
|
|
92457cad
|
2013-09-17T08:00:44
|
|
Merge pull request #1857 from linquize/find-git-path-win32
Fix failure in win32 git path guessing
|
|
|
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
|
|
|
8821c9aa
|
2013-09-15T17:50:03
|
|
Merge pull request #1850 from linquize/git-clone-init-options
git_clone supports init_options
|
|
|
f2df503b
|
2013-09-14T18:22:16
|
|
git_clone supports optional init_options
|
|
|
e580afd8
|
2013-09-13T14:33:26
|
|
Add tests for git_tree_walk
This tests the fixes for issues from #1849
|
|
|
236945a5
|
2013-09-13T14:31:26
|
|
Merge pull request #1849 from whavinga/treewalker
Treewalker
|
|
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
|
|
|
25803c63
|
2013-09-12T06:42:06
|
|
Merge pull request #1848 from libgit2/ntk/fix/cl_assert_equal_sz
Fix cl_assert_equal_sz error message formating
|
|
6f200361
|
2013-09-12T13:50:35
|
|
clar: Move cl_assert_equal_sz() definition to clar.h
|
|
|
273ddc54
|
2013-09-12T13:50:00
|
|
clar: Fix clar__assert_equal error message formating
|
|
|
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
|
|
|
7301cd60
|
2013-09-11T13:14:42
|
|
Merge pull request #1846 from libgit2/ntk/fix/format
errors: Fix format of some error messages
|
|
|
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
|
|
|
68642bce
|
2013-09-10T16:54:37
|
|
Merge pull request #1841 from libgit2/ntk/fix/loose_ambiguous
Make odb_loose return EAMBIGUOUS when required
|
|
|
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.
|
|
|
38859f29
|
2013-09-09T11:11:39
|
|
Merge pull request #1843 from uh-sem-blee/development
fixing headers with bad values for objective-c
|
|
|
0c52b204
|
2013-09-09T11:07:17
|
|
Make work if built with threading enabled
|
|
b2395a82
|
2013-09-04T18:49:10
|
|
Only use callbacks when -n or -v in add example.
|
|
|
04fd2665
|
2013-09-04T18:44:12
|
|
Move statement after declarations in add example.
|