Commit Graph

3935 Commits

Author SHA1 Message Date
Ben Straub
57f5d8dca5 Remove placeholder files during tests 2012-12-14 14:15:42 -08:00
Ben Straub
1164acde96 Rebase fixup 2012-12-14 14:00:35 -08:00
Ben Straub
b524fe1a3c Local Only ignore ENOTFOUNDs when adding corrupted refs 2012-12-14 13:58:44 -08:00
Ben Straub
850b1edfe8 Allow clone to handle empty repos 2012-12-14 13:58:44 -08:00
Vicent Martí
be5869fce0 Merge pull request #1143 from ben/clone-options
Options structure for git_clone
2012-12-14 13:53:50 -08:00
Ben Straub
b9e7e2b4e1 Move non-options back out of options struct 2012-12-14 13:46:45 -08:00
Ben Straub
0015b5875e Deploy git_clone_options to network sample 2012-12-14 13:18:06 -08:00
Ben Straub
18b2d560d3 Deploy git_clone_options; remove git_clone_bare 2012-12-14 13:03:59 -08:00
Ben Straub
7e61044019 Introduce git_clone_options 2012-12-14 12:30:57 -08:00
Carlos Martín Nieto
37ac44366b travis: update the apt-get db 2012-12-14 03:12:03 +01:00
Vicent Marti
2d466b7dcb tests: Fix unused temp repo 2012-12-14 02:49:11 +01:00
Vicent Marti
509216a5b2 test: Fix clone tests 2012-12-14 02:49:01 +01:00
Vicent Marti
b0b9fd3245 Merge remote-tracking branch 'origin/clone-auth' into development 2012-12-14 02:41:53 +01:00
Vicent Marti
44f5f777ae Merge remote-tracking branch 'jamill/transport_localpaths' into development 2012-12-14 00:16:03 +01:00
Jameson Miller
f0a2def5e4 Fix comment so it doesn't go over 100 chars 2012-12-13 18:08:45 -05:00
Jameson Miller
8a8820d89f Add test to clone with absolute path 2012-12-13 17:58:12 -05:00
Ben Straub
2b10a2b0e8 Enable authenticated clones in network sample 2012-12-13 11:47:14 -08:00
Jameson Miller
cb2ace69f4 Transport resolution on Win32 should handle absolute local paths 2012-12-13 14:42:40 -05:00
Ben Straub
24393ea6d3 Stop premature remote freeing when cloning 2012-12-13 09:14:56 -08:00
Ben Straub
34c8c75433 Fix network example 2012-12-13 08:54:23 -08:00
Ben Straub
7c353afd0e Define constant for default fetch spec 2012-12-13 08:47:29 -08:00
Ben Straub
ae0ddc6f02 Merge pull request #1139 from ethomson/index_bugfix
don't walk off the end of the index
2012-12-12 19:53:05 -08:00
Ben Straub
44f36f6e3b Convert clone to use dangling remotes 2012-12-12 19:48:44 -08:00
Edward Thomson
e759b07217 don't walk off the end of the index 2012-12-12 17:54:12 -06:00
Ben Straub
b914e17d82 API to set a dangling remote's repository 2012-12-12 12:23:24 -08:00
Ben Straub
a71c27ccda Allow creation of dangling remotes 2012-12-12 12:15:25 -08:00
Vicent Martí
6cacd44bd0 Merge pull request #1136 from pclouds/tree-cache-counts
tree cache: loosen negative entry count check
2012-12-12 06:47:50 -08:00
Nguyễn Thái Ngọc Duy
08f3d6caf4 tree cache: loosen negative entry count check
While C Git has been writing entry count -1 (ie. never other negative
numbers) as invalid since day 1, it accepts all negative entry counts
as invalid. JGit follows the same rule. libgit2 should also follow, or
the index that works with C Git or JGit may someday be rejected by
libgit2.

Other reimplementations like dulwich and grit have not bothered with
parsing or writing tree cache.
2012-12-12 19:23:05 +07:00
Vicent Martí
8d13035e0d Merge pull request #1135 from ymendel/patch-1
ignore mkmf.log
2012-12-11 15:10:25 -08:00
Yossef Mendelssohn
640716176b ignore mkmf.log
no build artifacts
no parents
2012-12-11 15:08:08 -08:00
Vicent Martí
55325efa1d Merge pull request #1133 from arrbee/more-iterator-cleanup
More iterator cleanup
2012-12-10 15:54:15 -08:00
Russell Belfer
91e7d26303 Fix iterator reset and add reset ranges
The `git_iterator_reset` command has not been working in all cases
particularly when there is a start and end range.  This fixes it
and adds tests for it, and also extends it with the ability to
update the start/end range strings when an iterator is reset.
2012-12-10 15:38:41 -08:00
Russell Belfer
9950d27ab6 Clean up iterator APIs
This removes the need to explicitly pass the repo into iterators
where the repo is implied by the other parameters.  This moves
the repo to be owned by the parent struct.  Also, this has some
iterator related updates to the internal diff API to lay the
groundwork for checkout improvements.
2012-12-10 15:38:28 -08:00
Ben Straub
4cbe9a1be1 Add git_cred_acquire_cb payload to winhttp transport 2012-12-10 11:48:20 -08:00
Vicent Martí
a72a8f34d3 Merge pull request #1132 from ben/cred-acquire-payload
Add a payload param to git_cred_acquire_cb
2012-12-10 11:40:49 -08:00
Ben Straub
59bccf33c4 Add a payload param to git_cred_acquire_cb
Fixes #1128.
2012-12-10 11:11:01 -08:00
Ben Straub
72629a10e3 Clean up GCC build warnings 2012-12-10 10:05:31 -08:00
Vicent Martí
22bcf86c5a Merge pull request #1126 from carlosmn/indexer-buffer
indexer: move the temporary buffers into the indexer object
2012-12-10 06:55:59 -08:00
Vicent Martí
cbad0270ca Merge pull request #1127 from libgit2/fix-mwindow-threading
Fix mwindow mutex initialization and error checking
2012-12-10 06:55:13 -08:00
Scott J. Goldman
7d26c410bf Fix a bunch of leaks, error handling cases 2012-12-09 21:55:51 -08:00
Scott J. Goldman
e51c8b99be Fix mark_parents() to account for bad luck traversals
If commit timestamps are off, we're more likely to hit a traversal
where the first path ends up traversing past the root commit of the tree.
If that happens, it's possible that the loop will complete before the second
path marks some of those final parents. This fix keeps track of the root
nodes that are encountered in the traversal, and verify that they are
properly marked.

In the best case, with accurate timestamps, the traversal will continue
to terminate when all the commits are STALE (parents of a merge-base), as
it did before. In the worst case, where one path makes a complete traversal
past a root commit, we will continue the loop until the root commit itself
is marked.
2012-12-09 21:24:47 -08:00
Scott J. Goldman
b337814e70 Fix no_common_ancestor test for ahead_behind count
Ahead-behind count is still a valid operation, even if the two
commits don't have a common merge-base. The old implementation was
buggy, so it returned ENOTFOUND. Fixed now.
2012-12-09 21:04:32 -08:00
Scott J. Goldman
9c2a4e8c47 Morph copy of git_merge__bases_many() -> mark_parents()
Integrate mark_parents() with the ahead_behind() code.
2012-12-09 21:01:46 -08:00
Scott J. Goldman
a3a81ae542 Copy git_merge__bases_many() for new ahead-behind code
To be used as a basis for a function which marks nodes with parents
up to the merge base.
2012-12-09 20:43:26 -08:00
Justin Spahr-Summers
1d00960334 orite C89 2012-12-09 02:40:16 -08:00
Justin Spahr-Summers
2bb1c7aa26 Treat git_mutex_lock as successful when threads are disabled 2012-12-09 02:37:33 -08:00
Justin Spahr-Summers
a35b386458 Always check the result of git_mutex_lock 2012-12-09 02:31:39 -08:00
Justin Spahr-Summers
c3320aca76 git__mwindow_mutex needs to be initialized even with pthreads
This could also use PTHREAD_MUTEX_INITIALIZER, but a dynamic initializer seems like a more portable concept, and we won't need another #define on top of git_mutex_init()
2012-12-09 02:22:50 -08:00
Carlos Martín Nieto
6481a68d49 indexer: move the temporary buffers into the indexer object
Storing 4kB or 8kB in the stack is not very gentle. As this part has
to be linear, put the buffer into the indexer object so we allocate it
once in the heap.
2012-12-07 19:24:55 +01:00
Vicent Martí
0249a5032e Merge pull request #1091 from carlosmn/stream-object
Indexer speedup with large objects
2012-12-07 09:40:21 -08:00