|
53ca45ee
|
2014-10-27T17:27:25
|
|
revert tests: always use core.autocrlf=false in tests
|
|
7647f449
|
2014-10-27T12:19:42
|
|
Merge pull request #2659 from swisspol/static_analysis
Fixed the most obvious Clang static analyzer warnings
|
|
ea66215d
|
2014-10-26T10:29:19
|
|
Removed some useless variable assignments
|
|
|
64bcf567
|
2014-10-26T10:30:05
|
|
Fixed potential crash with uninitialized variables
|
|
|
116a19d4
|
2014-10-27T06:33:11
|
|
Merge pull request #2666 from libgit2/cmn/threadsafe-on
Flip THREADSAFE's default to ON
|
|
177a29d8
|
2014-10-27T10:39:45
|
|
Merge commit 'refs/pull/2366/head' of github.com:libgit2/libgit2
|
|
|
79b0ae4e
|
2014-10-27T10:30:57
|
|
Flip THREADSAFE's default to ON
Threads are here to stay; and for a while now, users have had to call
the initialization function which sets up threads and crypto regardless
of whether the library was built threadsafe or not.
|
|
|
aabe1e5a
|
2014-10-26T23:36:15
|
|
Merge branch 'csware/cleanup'
|
|
334a0696
|
2014-10-26T17:36:14
|
|
Minor cleanup: Use defined no_check_cert_flags instead of C&P them again
Signed-off-by: Sven Strickroth <email@cs-ware.de>
|
|
|
b07db1eb
|
2014-10-26T20:18:04
|
|
Merge pull request #2482 from libgit2/ed/rebase
Rebase (merge)
|
|
|
67917281
|
2014-10-26T22:37:01
|
|
rebase: add information to the CHANGELOG
|
|
|
979645a7
|
2014-10-04T20:17:26
|
|
rebase: updates based on PR comments
|
|
|
18b00406
|
2014-10-03T19:02:29
|
|
s/git_merge_head/git_annotated_commit
Rename git_merge_head to git_annotated_commit, as it becomes used
in more operations than just merge.
|
|
|
796b03bd
|
2014-10-03T20:47:48
|
|
rebase: clean up some warnings and memory leaks
|
|
|
e69737d7
|
2014-09-11T16:46:46
|
|
rebase: oid member of operation should be const
|
|
|
ed2c06a6
|
2014-09-11T16:47:20
|
|
git_rebase: iterators for operations
|
|
|
f152f8ac
|
2014-08-26T16:18:46
|
|
rebase: preload all operations
|
|
|
b6b636a7
|
2014-08-25T13:29:50
|
|
rebase: init/open a git_rebase object
|
|
|
18b439b9
|
2014-08-23T18:19:34
|
|
git_rebase_next: provide info about the operation
|
|
|
5ae9d296
|
2014-07-21T12:25:03
|
|
git_rebase_finish: rewrite notes when finishing rebase
|
|
|
bad4937e
|
2014-07-21T10:47:01
|
|
Introduce `git_note_author`, `git_note_committer`
|
|
|
a612a25f
|
2014-07-18T18:22:54
|
|
git_rebase_commit: write HEAD's reflog appropriately
|
|
|
517644cc
|
2014-07-18T17:19:10
|
|
Introduce git_rebase_finish to complete a rebase
|
|
|
14864fbf
|
2014-07-18T15:37:42
|
|
git_rebase_next: test that we return GIT_ITEROVER
|
|
|
93a7004c
|
2014-07-18T14:50:06
|
|
git_rebase_commit: drop already-picked commits
Already cherry-picked commits should not be re-included. If all changes
included in a commit exist in the upstream, then we should error with
GIT_EAPPLIED.
|
|
|
a35a9890
|
2014-07-17T18:25:03
|
|
Introduce git_rebase_commit
Commit the current patch of a rebase process.
|
|
|
443d5674
|
2014-07-17T11:59:01
|
|
git_rebase_next: write conflicts nicely during rebase
|
|
|
950a7091
|
2014-07-15T10:23:10
|
|
Introduce git_rebase_next
`git_rebase_next` will apply the next patch (or cherry-pick)
operation, leaving the results checked out in the index / working
directory so that consumers can resolve any conflicts, as appropriate.
|
|
|
4fe84d62
|
2014-07-14T15:19:19
|
|
Introduce git_rebase_abort
Abort an in-progress rebase and move the working directory and
repository back to the ORIG_HEAD state.
|
|
|
daf395b7
|
2014-07-18T17:40:07
|
|
git_reset: const the git_signature arg
|
|
|
867a36f3
|
2014-07-14T14:35:01
|
|
Introduce git_rebase to set up a rebase session
Introduce `git_rebase` to set up a rebase session that can
then be continued. Immediately, only merge-type rebase is
supported.
|
|
|
9e44289c
|
2014-10-26T19:58:24
|
|
Merge pull request #2612 from ethomson/warnings
Clean up some warnings
|
|
|
5b0c6306
|
2014-10-26T22:38:30
|
|
Remove unused warning on non-win32
|
|
|
5a7cd1bc
|
2014-10-25T19:53:53
|
|
iterator: free paths when skipping them
|
|
|
4b1b2bd9
|
2014-10-25T19:53:27
|
|
revwalk::mergebase test: free memory
|
|
|
8c8ca730
|
2014-10-25T19:53:07
|
|
mwindow: clean up pack map at shutdown
|
|
|
e4985fe3
|
2014-10-25T19:52:52
|
|
submodule test: free submodule
|
|
|
50aae000
|
2014-10-25T19:52:11
|
|
global: clean up openssl_locks on shutdown
|
|
|
16288d2d
|
2014-10-25T19:51:46
|
|
clone::local test: isalpha -> git__isalpha
|
|
|
90aa2bf3
|
2014-10-25T19:51:12
|
|
config test: clean up memory leak
|
|
|
bc42479a
|
2014-10-13T15:43:03
|
|
Cleanup memory leak in ssh transport
|
|
|
cdd71711
|
2014-10-13T14:34:32
|
|
Clean up some memory leaks
|
|
|
369b0217
|
2014-10-13T13:34:15
|
|
Clean up various compiler warnings
|
|
|
70f7e2c6
|
2014-10-27T01:48:37
|
|
Merge from 2660
|
|
|
fad0aea9
|
2014-10-27T01:47:40
|
|
tests: fix leak
|
|
9223f288
|
2014-10-27T01:06:28
|
|
Fix test repo dir not deleted after running
|
|
|
d09458f3
|
2014-10-24T16:52:39
|
|
Merge pull request #2638 from libgit2/cmn/config-refresh-remove
config: remove the refresh function and backend field
|
|
|
725cd5f2
|
2014-10-24T16:44:07
|
|
Merge pull request #2646 from libgit2/cmn/remote-rename
remote: accept a repo and name for renaming
|
|
|
b8041215
|
2014-10-24T14:02:53
|
|
Merge pull request #2649 from swisspol/2630
Fixed memory leak in git_tag_delete()
|
|
|
a747ea49
|
2014-10-24T14:01:13
|
|
Merge pull request #2647 from ethomson/clar_tmpname
clar: use a custom temp directory name
|
|
|
cdfd2b62
|
2014-10-24T08:27:38
|
|
Merge pull request #2645 from libgit2/cmn/common-crypto
[RFC] Use CommonCrypto for hashing
|
|
|
1ad15540
|
2014-10-24T08:23:14
|
|
Fixed memory leak in git_tag_delete()
|
|
|
29eed1c7
|
2014-10-24T10:50:57
|
|
clar: use a custom temp directory name
|
|
|
27372263
|
2014-10-24T07:39:10
|
|
Merge pull request #2644 from libgit2/cmn/remove-supported-url
remote: delete git_remote_supported_url()
|
|
|
46c8f7f8
|
2014-10-24T16:25:59
|
|
remote: accept a repo and name for renaming
Remote objects are not meant to be changed from under the user. We did
this in rename, but only the name and left the refspecs, such that a
save would save the wrong refspecs (and a fetch and anything else would
use the wrong refspecs).
Instead, let's simply take a name and not change any loaded remote from
under the user.
|
|
|
0862f617
|
2014-10-24T12:19:13
|
|
remote: delete git_remote_supported_url()
This function does not in fact tell us anything, as almost anything with
a colon in it is a valid rsync-style SSH path; it can not tell us that
we do not support ftp or afp or similar as those are still valid SSH
paths and we do support that.
|
|
|
d9c0dbb0
|
2014-10-24T13:29:11
|
|
hash: use CommonCrypto on OSX for SHA-1
OSX has its own cryptographic library, let's make use of it instead of
calling out to OpenSSL.
|
|
|
55cb4999
|
2014-10-23T19:05:02
|
|
config: remove the refresh function and backend field
We have been refreshing on read and write for a while now, so
git_config_refresh() is at best a no-op, and might just end up wasting
cycles.
|
|
|
4bb6ffb6
|
2014-10-23T18:58:39
|
|
Merge pull request #2622 from libgit2/refresh-config-snapshot
Refresh git configuration before looking for the tracking branch redux.
|
|
|
d676af43
|
2014-10-23T08:27:13
|
|
Merge pull request #2625 from libgit2/cmn/ssl-tls
ssl: dump the SSL ciphers in favour of TLS
|
|
|
f0f97370
|
2014-10-18T15:52:10
|
|
ssl: dump the SSL ciphers in favour of TLS
All versions of SSL are considered deprecated now, so let's ask OpenSSl
to only use TLSv1. We still ask it to load those ciphers for
compatibility with servers which want to use an older hello but will use
TLS for encryption.
For good measure we also disable compression, which can be exploitable,
if the OpenSSL version supports it.
|
|
ad5adacb
|
2014-10-21T09:29:45
|
|
Patch from @carlosmn to refresh the parent config before snapshotting.
|
|
|
1e2fe921
|
2014-10-21T09:29:17
|
|
Change the length of the file so that the change is picked up.
|
|
|
5490c9d4
|
2014-10-16T13:52:55
|
|
Add a test to make sure a new snapshot has the new value.
|
|
|
943fde7f
|
2014-10-22T20:48:04
|
|
Merge pull request #2617 from linquize/describe-example
describe: add example
|
|
|
196f3b1a
|
2014-10-22T20:38:59
|
|
Merge pull request #2619 from ethomson/remotes_with_unc
Remote paths: canonicalize UNC paths on Win32
|
|
|
12f32d91
|
2014-10-14T16:31:55
|
|
Remote paths: canonicalize UNC paths on Win32
Git for Windows will handle UNC paths only when in forward-slash
format, eg "//server/path". When given a UNC path as a remote,
rewrite standard format ("\\server\path") into this ridiculous
format.
|
|
|
89244e7f
|
2014-10-22T14:45:36
|
|
Merge pull request #2634 from libgit2/cmn/tree-cache-count
tree-cache: correct the entry_count calculation
|
|
|
bb0757d5
|
2014-10-22T21:09:31
|
|
tree-cache: correct the entry_count calculation
The entry_count field is the amount of index entries covered by a
particular cache entry, that is how many files are there (recursively)
under a particular directory.
The current code that attemps to do this is severely defincient and is
trying to count the amount of children, which always comes up to zero.
We don't even need to recount, since we have the information during the
cache creation. We can take that number and keep it, as we only ever
invalidate or replace.
|
|
|
12e18031
|
2014-10-17T22:22:59
|
|
Update some documentation
|
|
|
c51aa74e
|
2014-10-17T22:09:54
|
|
PROJECTS: remove two completed tasks
|
|
|
e0383fa3
|
2014-10-13T16:59:56
|
|
Merge pull request #2609 from linquize/describe-opts
Handle describe options better
|
|
|
c6e26210
|
2014-10-13T16:52:44
|
|
Merge pull request #2615 from ethomson/mount_points
Mount points
|
|
|
c0c8570c
|
2014-10-13T16:51:40
|
|
Merge pull request #2616 from ethomson/index_crlf
Apply filters when writing index
|
|
|
6a26488f
|
2014-10-11T21:38:22
|
|
Don't copy buffer in checkout unless needed
|
|
5e2cf2ca
|
2014-10-10T13:22:11
|
|
Ensure filters (i.e. CRLF) are applied when checking out conflict content
|
|
|
8d3b2ee3
|
2014-10-11T20:56:50
|
|
Introduce failing test for conflict filtering in index
|
|
|
24deacb7
|
2014-10-13T11:01:52
|
|
Merge pull request #2618 from csware/msvc-no-z-prefix
There is no "z" size specifier on MSVC
|
|
|
969b6a47
|
2014-10-11T11:23:34
|
|
is_empty_dir (wi32): cope with empty mount points
FindFirstFile will fail with INVALID_HANDLE_VALUE if there are no
children to the given path, which can happen if the given path is a
file (and obviously has no children) or if the given path is an empty
mount point. (Most directories have at least directory entries '.'
and '..', but ridiculously another volume mounted in another drive
letter's path space do not, and thus have nothing to enumerate.)
If FindFirstFile fails, check if this is a directory-like thing
(a mount point).
|
|
|
8d45b469
|
2014-10-11T14:34:24
|
|
p_lstat win32: don't canonicalize volume mounts
A reparse point that is an IO_REPARSE_TAG_MOUNT_POINT could be
a junction or an actual filesystem mount point. (Who knew?)
If it's the latter, its reparse point will report the actual
volume information \??\Volume{GUID}\ and we should not attempt
to dereference that further, instead readlink should report
EINVAL since it's not a symlink / junction and its original
path was canonical.
Yes, really.
|
|
|
cf1013a8
|
2014-10-12T17:21:17
|
|
There is no "z" size specifier on MSVC
See http://msdn.microsoft.com/en-us/library/tcxf1dw6.aspx and https://stackoverflow.com/questions/6655410/why-doesnt-zd-printf-format-work-in-vs2010
Signed-off-by: Sven Strickroth <email@cs-ware.de>
|
|
|
d6bbcefc
|
2014-10-12T15:52:53
|
|
describe: add example
|
|
|
9e49cb7a
|
2014-10-11T14:48:57
|
|
Merge pull request #2613 from libgit2/rb/minor-cleanups
Minor cleanups for master
|
|
|
59186d9b
|
2014-10-10T23:37:20
|
|
describe: Initialize options for git_describe_format() if null
|
|
|
0494a7c9
|
2014-10-10T21:48:46
|
|
describe: Do not crash if pass null option to git_describe_commit()
|
|
85fe63bc
|
2014-10-10T15:17:27
|
|
Don't use cl_git_pass for POSIX functions
If there is a failure then cl_git_pass tries to get the libgit2
error, but p_... functions don't set that.
Also - trailing whitespace cleanup.
|
|
|
babbff34
|
2014-10-10T15:17:05
|
|
Move un-namespaced constant to internal header
FLAG_BITS only seems to be used internally
|
|
|
fd0f6d38
|
2014-10-10T14:06:14
|
|
Merge pull request #2470 from libgit2/cmn/read-tree-cache
Fill the tree cache when reading in a tree into an index
|
|
|
1b63af51
|
2014-09-29T09:21:57
|
|
Update CHANGELOG and PROJECTS with the tree cache changes
|
|
|
7465e873
|
2014-09-29T09:07:41
|
|
index: fill the tree cache on write-tree
An obvious place to fill the tree cache is on write-tree, as we're
guaranteed to be able to fill in the whole tree cache.
The way this commit does this is not the most efficient, as we read the
root tree from the odb instead of filling in the cache as we go along,
but it fills the cache such that successive operations (and persisting
the index to disk) will be able to take advantage of the cache, and it
reuses the code we already have for filling the cache.
Filling in the cache as we create the trees would require some
reallocation of the children vector, which is currently not possible
with out pool implementation. A different data structure would likely
allow us to perform this operation at a later date.
|
|
|
795d8e93
|
2014-09-29T08:03:22
|
|
index: make sure to write cached subtrees if parent is invalidated
If e.g. the root tree is invalidated, we still want to write out
its children, since those may still have valid cache entries.
|
|
|
c2f8b215
|
2014-09-28T07:00:49
|
|
index: write out the tree cache extension
Keeping the cache around after read-tree is only one part of the
optimisation opportunities. In order to share the cache between program
instances, we need to write the TREE extension to the index.
Do so, taking the opportunity to rename 'entries' to 'entry_count' to
match the name given in the format description. The included test is
rather trivial, but works as a sanity check.
|
|
|
46bb0067
|
2014-07-11T11:52:38
|
|
tree-cache: remove the parent pointer
This wasn't used. We invalidate based on the full path, so we always go
down the tree, never up.
|
|
|
ee4db1c1
|
2014-07-11T11:48:51
|
|
index: add tests for the tree cache
These test that we invalidate at the right levels and that we remove the
tree cache when clearing the index.
|
|
|
6843cebe
|
2014-07-10T14:10:39
|
|
index: fill the tree cache when reading from a tree
When reading from a tree, we know what every tree is going to look like,
so we can fill in the tree cache completely, making use of the index for
modification of trees a lot quicker.
|
|
|
19c88310
|
2014-07-10T13:48:13
|
|
tree-cache: move to use a pool allocator
This simplifies freeing the entries quite a bit; though there aren't
that many failure paths right now, introducing filling the cache from a
tree will introduce more. This makes sure not to leak memory on errors.
|
|
|
d091a9db
|
2014-07-10T12:21:28
|
|
tree-cache: extract the allocation
|
|
|
a6ed1fcb
|
2014-10-10T12:21:28
|
|
Merge pull request #2593 from libgit2/cmn/remote-delete-name
remote: accept a repository and remote name for deletion
|
|
|
bab92a8d
|
2014-10-10T18:06:36
|
|
Merge pull request #2575 from cirosantilli/factor-struct-typedef
[factor] Join typedef and struct definitions in single file.
|
|
|
942a7b39
|
2014-10-10T18:03:09
|
|
Fix test build
Some PRs have fallen out of sync with the changes in signatures, so we
need to take a few extra parameters into account.
|