|
b42ff7c0
|
2014-06-11T18:22:46
|
|
zlib: disable warning 4142 on MSVC
This is about benign redefinition of types. We're not interested in it.
|
|
|
4f8ac216
|
2014-06-11T18:15:04
|
|
zlib: get rid of compress.c and uncompr.c
|
|
|
2bc76050
|
2014-06-11T18:10:04
|
|
zlib: get rid of gz*
|
|
|
a9185589
|
2014-06-11T18:03:37
|
|
zlib: add a few missing defines
|
|
|
bb54fad0
|
2014-06-11T16:36:34
|
|
Merge branch 'cmn/zlib-update' into cmn/update-zlib
|
|
|
7cead31e
|
2014-06-11T16:36:08
|
|
Merge branch 'cmn/zlib-128' into cmn/zlib-update
Conflicts:
deps/zlib/crc32.c
deps/zlib/crc32.h
deps/zlib/zconf.h
|
|
|
4ca2d7e4
|
2014-06-11T16:10:00
|
|
Update zlib to 1.2.8
|
|
7064cdaf
|
2014-06-10T12:56:11
|
|
Merge pull request #2416 from libgit2/cmn/treebuilder-insert-sorted
treebuilder: insert sorted
|
|
|
17fbf852
|
2014-06-10T03:53:26
|
|
pathspec: use C guards in header
|
|
|
2c11d2ee
|
2014-06-09T23:23:53
|
|
treebuilder: insert sorted
By inserting in the right position, we can keep the vector sorted,
making entry insertion almost twice as fast.
|
|
|
281da004
|
2014-06-09T19:35:41
|
|
remote: fix rename docs
|
|
|
47fae920
|
2014-06-08T20:01:45
|
|
Merge branch 'cmn/soversion' into development
|
|
|
4fb32a44
|
2014-06-08T20:01:02
|
|
Bump version to 0.21.0
Bump library version to 0.21.0 and SONAME to 21
|
|
|
99807672
|
2014-06-08T19:42:54
|
|
Change SOVERSION at API breaks
Since the SOVERSION doesn't need to follow the library's version and
simply needs to be monotonically increasing whenever we release
something that breaks the ABI, we can set some number and allow multiple
versions of the library to be installed side-by-side.
We start here with the minor version as that's what we release for now,
and it allows to backport this change to earlier versions.
|
|
|
ce5e6617
|
2014-06-08T16:44:32
|
|
Merge pull request #2407 from libgit2/cmn/remote-rename-more
More remote rename fixes
|
|
|
9560203d
|
2014-06-08T16:44:14
|
|
Merge pull request #2409 from phkelley/win32_thread_fixes
Win32: Fix object::cache::threadmania test on x64
|
|
1b4e29b7
|
2014-06-07T13:56:39
|
|
React to review feedback
|
|
|
fb591767
|
2014-06-07T12:51:48
|
|
Win32: Fix object::cache::threadmania test on x64
|
|
df192198
|
2014-06-07T12:37:49
|
|
Merge pull request #2408 from phkelley/win32_test_fixes
Win32 test fixes
|
|
|
daf2a648
|
2014-06-07T12:18:56
|
|
Win32: Fix diff::workdir::submodules test #2361
|
|
|
6d1b0438
|
2014-06-07T12:18:24
|
|
Win32: Fix failing clone_mirror test
|
|
|
231f350d
|
2014-06-06T22:55:34
|
|
remote: don't free the remote on delete
This was a bad idea. Don't free except in the free function.
|
|
|
d1544564
|
2014-06-06T22:38:26
|
|
remote: handle symrefs when renaming
A symref inside the namespace gets renamed, we should make it point to
the target's new name.
This is for the origin/HEAD -> origin/master type of situations.
|
|
|
eb6aa791
|
2014-06-06T22:01:35
|
|
remote: failing test for renaming with a symref
|
|
|
72bca13e
|
2014-06-06T16:33:54
|
|
remote: return problem refspecs instead of using a callback
There is no reason why we need to use a callback here. A string array
fits better with the usage, as this is not an event and we don't need
anything from the user.
|
|
|
61dcfe14
|
2014-06-06T15:57:37
|
|
remote: make sure the name stays valid on rename
We must make sure that the name pointer remains valid, so make sure to
allocate the new one before freeing the old one and swap them so the
user never sees an invalid pointer.
|
|
|
5a49ff9f
|
2014-06-06T15:54:42
|
|
remote: remove rename code for anonymous remotes
We don't allow renames of anonymous remotes, so there's no need to
handle them.
A remote is always associated with a repository, so there's no need to
check for that.
|
|
|
716e20b4
|
2014-06-06T13:37:22
|
|
Merge pull request #2404 from libgit2/cmn/remote-rename-fixes
Remote rename fixes
|
|
|
c073184e
|
2014-06-06T13:35:29
|
|
Merge pull request #2405 from arthurschreiber/patch-4
Update AUTHORS
|
|
05554d83
|
2014-06-06T11:01:20
|
|
Update AUTHORS
Add me. :)
|
|
|
a52ab4b8
|
2014-06-06T01:09:49
|
|
remote: tighten up reference renaming
Tighten up which references we consider for renaming so we don't try to
rename unrelated ones and end up with unexplained references.
If there is a reference on the target namespace, git overwrites it, so
let's do the same.
|
|
|
fe3b9d07
|
2014-06-06T00:54:11
|
|
remote: failing test for rename
When there is a reference in the target namespace, we should overwrite
it. Instead it gets a different name under the current code.
|
|
|
90befde4
|
2014-06-03T22:10:34
|
|
Merge pull request #2399 from libgit2/cmn/path-to-path
clone: re-use the local transport's path resolution
|
|
dfcba09e
|
2014-06-03T13:05:20
|
|
Merge pull request #2395 from libgit2/cmn/ref-iter-concurrent
Concurrent ref iterator access
|
|
|
18d7896c
|
2014-06-03T21:47:53
|
|
clone: re-use the local transport's path resolution
Whe already worked out the kinks with the function used in the local
transport. Expose it and make use of it in the local clone method
instead of trying to work it out again.
|
|
|
bccb36eb
|
2014-06-03T17:25:59
|
|
Merge pull request #2389 from arthurschreiber/arthur/set-error-when-no-remote-found
Remote: Set an error when a remote cannot be found.
|
|
|
eb27d296
|
2014-06-03T17:23:43
|
|
Merge pull request #2396 from libgit2/cmn/docstuff
Documentation formatting fixes
|
|
|
69a1a691
|
2014-06-03T16:18:08
|
|
Plug a leak in the tests
|
|
|
dedfc734
|
2014-06-02T19:21:24
|
|
index: split GIT_IDXENTRY into two flag enums
The documentation has shown this as a single enum for a long time. These
should in fact be two enums. One with the bits for the flags and another
with the bits for the extended flags.
|
|
|
11e2665e
|
2014-06-02T18:53:32
|
|
Formatting fixes for the docs
These are some issues I found while playing around with the new parser
for docurium.
|
|
|
2d945f82
|
2014-06-02T17:44:51
|
|
refs: copy the packed refs on iteration
This lets us work without worrying about what's happening but work on a
snapshot.
|
|
|
4ee2543c
|
2014-06-02T16:46:47
|
|
refs: failing test for concurrent ref access
If we remove a reference while we're iterating through the packed refs,
the position in the iterator will be off.
|
|
|
2f6f6ebc
|
2014-06-01T16:26:44
|
|
Merge pull request #2392 from libgit2/cmn/remote-delete
remote: build up the list of refs to remove
|
|
|
8a9419aa
|
2014-06-01T02:16:07
|
|
remote: build up the list of refs to remove
When removing the remote-tracking branches, build up the list and remove
in two steps, working around an issue with the iterator. Removing while
we're iterating over the refs can cause us to miss references.
|
|
|
9bc2813b
|
2014-05-31T19:59:41
|
|
Merge pull request #2391 from libgit2/rb/clean-up-diff-binary-print
Minor fixes to binary diff code
|
|
|
bc81220d
|
2014-05-31T10:19:55
|
|
minor cleanups
|
|
|
947a58c1
|
2014-05-30T13:19:49
|
|
Clean up the handling of large binary diffs
|
|
d723dbed
|
2014-05-30T19:26:49
|
|
Remote: Set an error when a remote cannot be found.
Inside `git_remote_load`, the calls to `get_optional_config` use
`giterr_clear` to unset any errors that are set due to missing config
keys. If neither a fetch nor a push url config was found for a remote,
we should set an error again.
|
|
|
4cf82685
|
2014-05-30T19:07:59
|
|
Merge pull request #2388 from ethomson/safecrlf_ignore_warn
Ignore core.safecrlf=warn until we have a warn infrastructure
|
|
49837fd4
|
2014-05-30T11:30:53
|
|
Ignore core.safecrlf=warn until we have a warn infrastructure
|
|
|
58eea5eb
|
2014-05-30T15:28:05
|
|
Merge pull request #2358 from arthurschreiber/arthur/normalize-ref-names-on-creation
Respect core.precomposeunicode = true in more cases.
|
|
|
9d6c3d28
|
2014-05-30T15:15:54
|
|
Refs: Extend unicode test for branch creation.
This adds another assertion to ensure that the reference name inside
the git_reference struct returned by `git_branch_create` is returned as
precomposed if `core.precomposeunicode` is enabled.
|
|
|
1a90b1e3
|
2014-05-30T14:53:28
|
|
Refs: Add a unicode test for git_branch_move.
This tests that decomposed branch names are correctly precomposed when
passed to `git_branch_move` and `core.precomposeunicode` is enabled.
|
|
|
824f755f
|
2014-05-20T17:31:53
|
|
Refs: Introduce `git_refname_t`.
|
|
|
68f9d6b2
|
2014-05-15T22:44:50
|
|
Refs: Fix some issue when core.precomposeunicode = true.
This fixes two issues I found when core.precomposeunicode is enabled:
* When creating a reference with a NFD string, the returned
git_reference would return this NFD string as the reference’s
name. But when looking up the reference later, the name would
then be returned as NFC string.
* Renaming a reference would not honor the core.precomposeunicode and
apply no normalization to the new reference name.
|
|
|
5f0527ae
|
2014-05-30T13:06:34
|
|
config: initialize the error
The error would be uninitialized if we take a snapshot of a config with
no backends.
|
|
|
19d77ce1
|
2014-05-29T14:51:25
|
|
Merge pull request #2381 from ecoffey/example_log_author_filter
Add support for --author flag in example log implementation
|
|
|
31c55152
|
2014-05-29T14:50:57
|
|
Merge pull request #2011 from libgit2/cmn/clone-local
Local clone
|
|
|
bc9f67fa
|
2014-05-29T10:03:04
|
|
clone: more explicit local tests
Assert the exact amount of links we expect. While there, check that a
plain git_clone() automatically chooses to link.
|
|
|
065a00e2
|
2014-05-28T14:51:22
|
|
Merge pull request #2386 from Therzok/patch-2
[Blob] Update documentation for is_binary.
|
|
fda73bc5
|
2014-05-28T22:57:21
|
|
[Blob] Update documentation for is_binary.
filter.h tells me that we check the first 8000 bytes.
|
|
33bf1b1a
|
2014-05-28T09:40:08
|
|
examples/log.c: invert filtering impl and conditional
|
|
|
2614819c
|
2014-05-28T11:28:57
|
|
clone: allow for linking in local clone
If requested, git_clone_local_into() will try to link the object files
instead of copying them.
This only works on non-Windows (since it doesn't have this) when both
are on the same filesystem (which are unix semantics).
|
|
|
94f742ba
|
2014-05-28T10:18:05
|
|
fileops: allow linking files when copying directory structures
When passed the LINK_FILES flag, the recursive copy will hardlink files
instead of copying them.
|
|
|
c1dbfcbb
|
2014-05-28T10:07:23
|
|
clone: add flag not to link
|
|
|
121b2673
|
2013-12-23T11:12:31
|
|
clone: add flags to override whether to perform a local clone
|
|
|
a0b5f785
|
2013-12-22T15:39:54
|
|
clone: store the realpath when given a relative one
A call like git_clone("./foo", "./foo1") writes origin's url as './foo',
which makes it unusable, as they're relative to different things.
Go with git's behaviour and store the realpath as the url.
|
|
|
4386d80b
|
2013-12-21T17:18:21
|
|
clone: perform a "local clone" when given a local path
When git is given such a path, it will perform a "local clone",
bypassing the git-aware protocol and simply copying over all objects
that exist in the source.
Copy this behaviour when given a local path.
|
|
|
5d91bea2
|
2014-05-28T13:55:57
|
|
Merge pull request #2380 from libgit2/cmn/index-add-modes
index: check for valid filemodes on add
|
|
|
a470a5c7
|
2014-05-28T13:51:42
|
|
Merge pull request #2377 from libgit2/cmn/dual-os
travis: build on osx too
|
|
|
07c0eacd
|
2014-05-28T13:50:58
|
|
Merge pull request #2359 from e45lee/chmod-fix
Fixed permissions on template directories.
|
|
|
ab882e21
|
2014-05-28T13:49:38
|
|
Merge pull request #2385 from karipe/development
Fix compile error on Visual Studio
|
|
|
63e8c3fd
|
2014-05-28T13:47:55
|
|
Merge pull request #2337 from ethomson/merge_ff
Introduce GIT_MERGE_CONFIG_* for merge.ff settings
|
|
|
eff531e1
|
2014-05-27T20:58:20
|
|
Modify GIT_MERGE_CONFIG -> GIT_MERGE_PREFERENCE
|
|
|
de3f851e
|
2014-05-21T09:44:05
|
|
Staticify `merge_config`
|
|
|
22ab8881
|
2014-05-20T22:07:15
|
|
Use a config snapshot
|
|
|
a3622ba6
|
2014-05-16T13:54:40
|
|
Move GIT_MERGE_CONFIG_* to its own enum
|
|
|
d362093f
|
2014-05-08T15:41:36
|
|
Introduce GIT_MERGE_CONFIG_* for merge.ff settings
git_merge_analysis will now return GIT_MERGE_CONFIG_NO_FASTFORWARD
when merge.ff=false and GIT_MERGE_CONFIG_FASTFORWARD_ONLY when
merge.ff=true
|
|
3ac1ff42
|
2014-05-27T23:32:38
|
|
Fix compile error on Visual Studio
|
|
|
433ba614
|
2014-05-26T08:38:39
|
|
Merge pull request #2382 from mikeando/doc_fixes
Fixed miscellaneous documentation errors.
|
|
517341c5
|
2014-05-23T22:41:35
|
|
Address style concerns in setting mkdir/copy flags.
|
|
|
87493bca
|
2014-05-23T13:00:30
|
|
Remove simple --author, --committer, and --grep from PROJECTS
|
|
|
26cce321
|
2014-05-23T12:59:19
|
|
Add support for --grep
|
|
|
161e6dc1
|
2014-05-23T12:27:16
|
|
Add --committer option, and break out helper function
|
|
31b0cb51
|
2014-05-22T17:16:21
|
|
Fixed miscellaneous documentation errors.
|
|
|
530594c0
|
2014-05-23T05:53:41
|
|
odb: clear backend errors on successful read
We go through the different backends in order, so it's not an error if
at least one of the backends has the data we want.
|
|
|
97fc71ab
|
2014-05-22T16:01:45
|
|
Add support for --author flag in example log implementation
|
|
|
052a2ffd
|
2014-05-22T16:01:02
|
|
index: check for valid filemodes on add
|
|
|
9331f98a
|
2014-05-22T12:52:31
|
|
smart: initialize the error variable
|
|
|
4c4408c3
|
2014-05-22T12:28:39
|
|
Plug leaks and fix a C99-ism
We have too many places where we repeat free code, so when adding the
new free to the generic code, it didn't take for the local transport.
While there, fix a C99-ism that sneaked through.
|
|
|
a5982644
|
2014-05-22T02:28:42
|
|
Merge pull request #2376 from libgit2/cmn/remote-symref
Add support for the symref extension
|
|
|
7ee233a9
|
2014-05-22T02:27:33
|
|
Merge pull request #2375 from libgit2/rb/safecrlf-on-lf-platform
Make core.safecrlf not generate an error on LF-ending platforms
|
|
|
ff9fb448
|
2014-05-22T02:26:56
|
|
Merge pull request #2379 from ethomson/status_win32
Include windows.h on win32 for Sleep
|
|
|
ead9c591
|
2014-05-21T17:25:00
|
|
Include windows.h on win32 for Sleep
|
|
|
72303307
|
2014-05-21T12:45:22
|
|
travis: build on osx too
|
|
|
2bc36fac
|
2014-05-21T13:07:45
|
|
Merge pull request #2372 from libgit2/cmn/fetch-terminate
smart: send a flush when we disconnect
|
|
|
2a597116
|
2014-05-21T11:54:10
|
|
clone: get rid of head_info
Since we no longer need to push data to callbacks, there's no need for
this truct.
|
|
|
cdb8a608
|
2014-05-21T11:51:33
|
|
clone: make use of the remote's default branch guessing
Let's use the remote's default branch guessing instead of reinventing
one ourselves with callbacks.
|
|
|
d22db24f
|
2014-05-21T09:32:35
|
|
remote: add api to guess the remote's default branch
If the remote supports the symref protocol extension, then we return
that, otherwise we guess with git's rules.
|
|
|
04865aa0
|
2014-05-21T10:01:44
|
|
local transport: expose the symref data
When using the local transport, we always have the symbolic information
available, so fill it.
|