|
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.
|
|
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.
|
|
|
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.
|
|
|
306475eb
|
2014-05-20T09:55:26
|
|
remote: expose the remote's symref mappings
Add a symref_target field to git_remote_head to expose the symref
mappings to the user.
|
|
|
8156835d
|
2014-05-20T09:29:39
|
|
smart: store reported symrefs
The protocol has a capability which allows the server to tell us which
refs are symrefs, so we can e.g. know which is the default branch.
This capability is different from the ones we already support, as it's
not setting a flag to true, but requires us to store a list of
refspec-formatted mappings.
This commit does not yet expose the information in the reference
listing.
|
|
|
58532ed0
|
2014-05-21T12:09:52
|
|
Merge pull request #2373 from kitbellew/fix-clone-into-mirror
Minor fix for cmn/clone-into-mirror.
|
|
60cdf495
|
2014-05-19T09:13:45
|
|
Minor fix for cmn/clone-into-mirror.
A recently added check might skip initialization of old_fetchhead and go
directly to cleanup. So, destruct in the opposite order of construction.
|
|
|
430866d2
|
2014-05-20T08:29:51
|
|
Fix a leak in the tests
|
|
|
ac11219b
|
2014-05-19T16:54:19
|
|
smart: send a flush when we disconnect
The git server wants to hear a flush from us when we disconnect,
particularly when we want to perform a fetch but are up to date.
|
|
c094197b
|
2014-05-19T15:05:39
|
|
Just don't CRLF filter if there are no CRs
|
|
|
16798d08
|
2014-05-19T14:57:09
|
|
Make core.safecrlf work on LF-ending platforms
If you enabled core.safecrlf on an LF-ending platform, we would
error even for files with all LFs. We should only be warning on
irreversible mappings, I think.
|
|
|
588a43af
|
2014-05-19T15:43:13
|
|
Merge pull request #2371 from martinwoodward/attrib_fnmatch
Restore attributions for fnmatch
|
|
213a269a
|
2014-05-19T14:39:45
|
|
Restore attributions for fnmatch
|
|
|
124a45ea
|
2014-05-19T15:00:50
|
|
Merge pull request #2354 from libgit2/cmn/clone-into-mirror
Allow mirror-clone via `git_clone_into()`
|
|
|
32332fcc
|
2014-05-19T14:15:40
|
|
clone: don't error out if the branch already exists
We set up the current branch after we fetch from the remote. This means
that the user's refspec may have already created this reference. It is
therefore not an error if we cannot create the branch because it already
exists.
This allows for the user to replicate git-clone's --mirror option.
|
|
|
3c607685
|
2014-05-19T13:36:00
|
|
clone: duplicate the remote
Instead of changing the user-provided remote, duplicate it so we can add
the extra refspec without having to worry about unsetting it before
returning.
|
|
|
b2067248
|
2014-05-15T09:03:30
|
|
clone: add failing test for a mirror-clone with clone_into
Show a failure to perform a mirror-clone from a repository, both local
and remote.
|
|
|
52b597b6
|
2014-05-19T12:21:37
|
|
Merge pull request #2364 from libgit2/cmn/comment-char
message: don't assume the comment char
|
|
|
138af337
|
2014-05-19T12:20:31
|
|
Merge pull request #2303 from jacquesg/mingw-lseek
WIP: Windows fixes
|
|
b2a4be1d
|
2014-05-18T12:22:21
|
|
Merge pull request #2365 from kitbellew/fix-indexer-mmap
Fix warning on uninitialized variable.
|
|
|
9c4feef9
|
2014-05-17T12:44:21
|
|
Fix warning on uninitialized variable.
|
|
|
49e369b2
|
2014-05-18T10:06:49
|
|
message: don't assume the comment char
The comment char is configurable and we need to provide a way for the
user to specify which comment char they chose for their message.
|
|
|
d7a29463
|
2014-05-17T16:58:09
|
|
Fix a bug in the pack::packbuilder suite
|
|
|
4c9ffdff
|
2014-05-17T12:45:34
|
|
Fix printf format string from previous commit
|
|
|
c6320bec
|
2014-05-17T12:19:32
|
|
print_binary_hunk: Treat types with respect
|
|
|
bf6a5b61
|
2014-05-17T11:38:03
|
|
Merge remote-tracking branch 'upstream/cmn/indexer-mmap' into development
|
|
|
191ff936
|
2014-05-17T02:37:13
|
|
Merge pull request #2362 from libgit2/rb/update-4k-to-8k
Test and fix Git diff binary detection compatibility
|
|
|
0731a5b4
|
2014-05-14T19:12:48
|
|
indexer: mmap fixes for Windows
Windows has its own ftruncate() called _chsize_s().
p_mkstemp() is changed to use p_open() so we can make sure we open for
writing; the addition of exclusive create is a good thing to do
regardless, as we want a temporary path for ourselves.
Lastly, MSVC doesn't quite know how to add two numbers if one of them is a
void pointer, so let's alias it to unsigned char.C
|
|
|
f7310540
|
2014-05-13T02:41:48
|
|
indexer: use mmap for writing
Some OSs cannot keep their ideas about file content straight when mixing
standard IO with file mapping. As we use mmap for reading from the
packfile, let's make writing to the pack file use mmap.
|
|
|
8af4966d
|
2014-05-16T16:30:58
|
|
Git binary check compat tests
A variety of data patterns for diffs verified to match the
behavior of binary detection with Git on the command line.
|
|
|
d0f00de4
|
2014-05-16T11:08:19
|
|
Increase binary detection len to 8k
|
|
|
adebcb16
|
2014-05-16T10:42:17
|
|
Merge pull request #2360 from phkelley/noinherit
Win32: Supply _O_NOINHERIT when calling _wopen
|
|
|
f0b820dd
|
2014-05-16T12:38:56
|
|
Win32: Supply _O_NOINHERIT when calling _wopen
|
|
|
bafaf790
|
2014-05-16T08:09:20
|
|
Fixed permissions on template directories.
|
|
|
228272ef
|
2014-05-16T11:56:37
|
|
Merge pull request #2313 from libgit2/cmn/remote-delete
Remote deletion
|
|
|
ec8a949a
|
2014-04-30T09:20:03
|
|
remote: remove remote-tracking branches on delete
When we delete a remote, we also need to go through its fetch refspecs
and remove the references they create locally.
|
|
|
8e1b5a8d
|
2014-05-15T15:31:13
|
|
Merge pull request #2357 from libgit2/cmn/pack-cache-init
pack: init the cache on packfile alloc
|
|
|
88b1b36d
|
2014-05-15T20:25:54
|
|
Merge pull request #2356 from libgit2/rb/restore-search-paths
Better global search path sandboxing in tests
|
|
|
649214be
|
2014-05-15T19:59:05
|
|
pack: init the cache on packfile alloc
When running multithreaded, it is not enough to check for the offmap
allocation. Move the call to cache_init() to packfile allocation so we
can be sure it is always allocated free of races.
This fixes #2355.
|
|
|
8487e237
|
2014-05-15T10:56:28
|
|
Better search path sandboxing
There are a number of tests that modify the global or system
search paths during the tests. This adds a helper function to
make it easier to restore those paths and makes sure that they
are getting restored in a manner that preserves test isolation.
|
|
|
4af0ef96
|
2014-05-15T11:09:49
|
|
Fix mutex init/free in config_file.c
|
|
|
7851e595
|
2014-05-14T16:05:23
|
|
Merge pull request #2351 from linquize/init-var
Initialize local variable
|
|
|
2bcc1afd
|
2014-05-14T12:20:24
|
|
Merge pull request #2349 from libgit2/rb/coverity-fixes
Increase config snapshot usage
|
|
|
a8af3e02
|
2014-05-14T12:18:57
|
|
Merge pull request #2348 from stewid/add-link-R-bindings
Add R bindings to the README
|
|
|
2b52a0bf
|
2014-05-13T16:32:27
|
|
Increase use of config snapshots
And decrease extra reload checks of config data.
|
|
|
a37aa82e
|
2014-05-13T15:54:23
|
|
Some coverity inspired cleanups
|
|
562516ec
|
2014-05-13T22:43:59
|
|
Add R bindings to the README
|
|
b3f27c43
|
2014-05-13T21:08:50
|
|
Initialize local variable
|
|
|
03fcef18
|
2014-05-13T12:40:13
|
|
Merge pull request #2328 from libgit2/rb/how-broken-can-ignores-be
Improve checks for ignore containment
|
|
|
bcf9792f
|
2014-05-13T12:36:51
|
|
Merge pull request #2330 from libgit2/cmn/pack-unpack-loop
Make pack object lookup use loops
|
|
|
e1619626
|
2014-05-13T12:35:56
|
|
Merge pull request #2346 from kitbellew/fix2300
Minor fix for previously merged netops code.
|
|
|
7c57cd97
|
2014-05-12T20:25:44
|
|
Win32 fix for #2300.
The code doesn't use SSL and a test requires it.
|
|
|
c968ce2c
|
2014-05-12T02:01:05
|
|
pack: don't forget to cache the base object
The base object is a good cache candidate, so we shouldn't forget to add
it to the cache.
|
|
|
15bcced2
|
2014-05-11T05:31:22
|
|
pack: use stack allocation for smaller delta chains
This avoid allocating the array on the heap for relatively small
chains. The expected performance increase is sadly not really
noticeable.
|
|
|
a3ffbf23
|
2014-05-11T03:50:34
|
|
pack: expose a cached delta base directly
Instead of going through a special entry in the chain, let's pass it as
an output parameter.
|
|
|
df341926
|
2014-05-12T10:51:56
|
|
Merge pull request #2336 from libgit2/rb/unicode-branch-names
Pass unconverted Unicode path data when iconv doesn't like it
|
|
|
af567e88
|
2014-05-12T10:44:13
|
|
Merge pull request #2334 from libgit2/rb/fix-2333
Be more careful with user-supplied buffers
|
|
|
ce3b71d9
|
2014-05-12T10:28:45
|
|
Don't scale diff stat when not needed
|
|
|
b1914c36
|
2014-05-12T10:24:46
|
|
Minor fixes for warnings and error propagation
|
|
|
7bcced44
|
2014-05-12T10:15:30
|
|
Merge pull request #2300 from libgit2/cmn/match-host-tests
Some improvements to the cert checking
|
|
|
d2c4d1c6
|
2014-05-12T10:04:52
|
|
Merge pull request #2188 from libgit2/cmn/config-snapshot
Configuration snapshotting
|
|
|
9dbd150f
|
2014-05-09T09:36:09
|
|
pack: simplify delta chain code
The switch makes the loop somewhat unwieldy. Let's assume it's fine and
perform the check when we're accessing the data.
This makes our code look a lot more like git's.
|
|
|
b2559f47
|
2014-05-08T17:14:59
|
|
pack: preallocate a 64-element chain
Dependency chains are often large and require a few
reallocations. Allocate a 64-element chain before doing anything else to
avoid allocations during the loop.
This value comes from the stack-allocated one git uses. We still
allocate this on the heap, but it does help performance a little bit.
|
|
|
e6d10c58
|
2014-05-08T16:24:54
|
|
pack: make sure not to leak the dep chain
|
|
|
a332e91c
|
2014-05-06T23:37:28
|
|
pack: use a cache for delta bases when unpacking
Bring back the use of the delta base cache for unpacking objects. When
generating the delta chain, we stop when we find a delta base in the
pack's cache and use that as the starting point.
|
|
|
2acdf4b8
|
2014-05-06T19:20:33
|
|
pack: unpack using a loop
We currently make use of recursive function calls to unpack an object,
resolving the deltas as we come back down the chain. This means that we
have unbounded stack growth as we look up objects in a pack.
This is now done in two steps: first we figure out what the dependency
chain is by looking up the delta bases until we reach a non-delta
object, pushing the information we need onto a stack and then we pop
from that stack and apply the deltas until there are no more left.
This version of the code does not make use of the delta base cache so it
is slower than what's in the mainline. A later commit will reintroduce
it.
|
|
|
ae081739
|
2014-05-06T21:21:04
|
|
pack: do not repeat the same error message four times
Repeating this error message makes it harder to find out where we
actually are finding the error, and they don't really describe what
we're trying to do.
|
|
|
86d5810b
|
2014-05-06T16:20:14
|
|
pack: remove misleading comment
|
|
|
e18d5e52
|
2014-05-09T08:59:59
|
|
Merge pull request #2331 from libgit2/rb/dont-stop-diff-on-safecrlf
Add filter options and ALLOW_UNSAFE
|
|
|
bb45e390
|
2014-05-08T15:01:07
|
|
Disable threads::refdb::edit_while_iterate test
It seems that with the various recent changes to reference updating
and reflog writing, that the thread safety of refdb updates has
been reduced (either that or it was never thread safe and the
window for error has increased). Either way, this test is now
sometimes segfaulting which is no good, so let's disable the test
for now. We don't really make any public promises about thread
safety for this type of operation, so I think this is acceptable,
at least in the short term.
|
|
|
8a2ef218
|
2014-05-08T14:48:27
|
|
Don't always test composed-insensitive lookups
Only on a filesystem that is composed/decomposed insensitive,
should be testing that a branch can be looked up by the opposite
form and still work correctly.
|
|
|
be20ac5a
|
2014-05-08T14:33:37
|
|
Allow cl_repo_get_bool to work with missing key
One of the test helpers provides a quick way for looking up a
boolean key. But if the key way missing completely, the check
would actually raise an error. Given the way we use this helper,
if the key is missing, this should just return false, I think.
|
|
|
4df53a64
|
2014-05-08T23:16:21
|
|
Merge pull request #2335 from libgit2/cmn/indexer-vector-handling
indexer: avoid memory moves
|
|
|
43a04135
|
2014-05-08T13:52:46
|
|
Pass unconverted data when iconv doesn't like it
When using Iconv to convert unicode data and iconv doesn't like
the source data (because it thinks that it's not actual UTF-8),
instead of stopping the operation, just use the unconverted data.
This will generally do the right thing on the filesystem, since
that is the source of the non-UTF-8 path data anyhow.
This adds some tests for creating and looking up branches with
messy Unicode names. Also, this takes the helper function that
was previously internal to `git_repository_init` and makes it
into `git_path_does_fs_decompose_unicode` which is a useful in
tests to understand what the expected results should be.
|
|
|
2dde1e0c
|
2014-05-08T22:31:59
|
|
indexer: avoid memory moves
Our vector does a move of the rest of the array when we remove an
item. Doing this repeatedly can be expensive, and we do this a lot in
the indexer. Instead, set the value to NULL and skip those entries.
perf reported around 30% of `index-pack` time was going into
memmove. With this change, that goes away and we spent most of the time
hashing and inflating data.
|
|
|
5ebe18b7
|
2014-05-08T13:29:09
|
|
Merge pull request #2332 from libgit2/peff/iconv
iconv debugging aids
|
|
56ec2256
|
2014-05-08T01:06:38
|
|
examples: add a basic for-each-ref example
This is quite close to running "git for-each-ref" except:
1. It does not take any formatting or selection options at
all.
2. The output is not sorted.
I wrote it to look at debugging some issues with ref
iteration, but there's no reason it can't live on as an
example command.
|