summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* blob: introduce git_blob_is_binary()nulltoken2012-12-173-0/+37
|
* Fix MSVC compilation warningsnulltoken2012-12-172-4/+3
|
* Merge pull request #1145 from esc/feature/mailmapVicent Martí2012-12-151-0/+3
|\ | | | | adding .mailmap file
| * adding .mailmap fileValentin Haenel2012-12-151-0/+3
|/ | | | Help clarify who are the top commiters when using 'shortlog -sn'.
* Merge pull request #1143 from ben/clone-optionsVicent Martí2012-12-147-104/+111
|\ | | | | Options structure for git_clone
| * Move non-options back out of options structBen Straub2012-12-147-58/+60
| |
| * Deploy git_clone_options to network sampleBen Straub2012-12-141-5/+10
| |
| * Deploy git_clone_options; remove git_clone_bareBen Straub2012-12-146-121/+88
| |
| * Introduce git_clone_optionsBen Straub2012-12-141-0/+33
|/
* travis: update the apt-get dbCarlos Martín Nieto2012-12-141-1/+2
|
* tests: Fix unused temp repoVicent Marti2012-12-141-5/+0
|
* test: Fix clone testsVicent Marti2012-12-141-2/+5
|
* Merge remote-tracking branch 'origin/clone-auth' into developmentVicent Marti2012-12-1410-80/+199
|\
| * Enable authenticated clones in network sampleBen Straub2012-12-131-1/+17
| |
| * Stop premature remote freeing when cloningBen Straub2012-12-134-3/+13
| |
| * Fix network exampleBen Straub2012-12-131-2/+11
| |
| * Define constant for default fetch specBen Straub2012-12-136-7/+15
| |
| * Convert clone to use dangling remotesBen Straub2012-12-127-39/+66
| |
| * API to set a dangling remote's repositoryBen Straub2012-12-123-2/+29
| |
| * Allow creation of dangling remotesBen Straub2012-12-123-38/+60
| |
* | Merge remote-tracking branch 'jamill/transport_localpaths' into developmentVicent Marti2012-12-142-9/+34
|\ \
| * | Fix comment so it doesn't go over 100 charsJameson Miller2012-12-131-4/+6
| | |
| * | Add test to clone with absolute pathJameson Miller2012-12-131-0/+8
| | |
| * | Transport resolution on Win32 should handle absolute local pathsJameson Miller2012-12-131-9/+24
|/ /
* | Merge pull request #1139 from ethomson/index_bugfixBen Straub2012-12-121-4/+5
|\ \ | |/ |/| don't walk off the end of the index
| * don't walk off the end of the indexEdward Thomson2012-12-121-4/+5
|/
* Merge pull request #1136 from pclouds/tree-cache-countsVicent Martí2012-12-121-1/+1
|\ | | | | tree cache: loosen negative entry count check
| * tree cache: loosen negative entry count checkNguyễn Thái Ngọc Duy2012-12-121-1/+1
|/ | | | | | | | | | | 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.
* Merge pull request #1135 from ymendel/patch-1Vicent Martí2012-12-111-0/+1
|\ | | | | ignore mkmf.log
| * ignore mkmf.logYossef Mendelssohn2012-12-111-0/+1
|/ | | | no build artifacts no parents
* Merge pull request #1133 from arrbee/more-iterator-cleanupVicent Martí2012-12-1015-154/+311
|\ | | | | More iterator cleanup
| * Fix iterator reset and add reset rangesRussell Belfer2012-12-108-119/+253
| | | | | | | | | | | | | | 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.
| * Clean up iterator APIsRussell Belfer2012-12-1011-35/+58
|/ | | | | | | | 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.
* Add git_cred_acquire_cb payload to winhttp transportBen Straub2012-12-101-1/+1
|
* Merge pull request #1132 from ben/cred-acquire-payloadVicent Martí2012-12-1010-10/+25
|\ | | | | Add a payload param to git_cred_acquire_cb
| * Add a payload param to git_cred_acquire_cbBen Straub2012-12-1010-10/+25
|/ | | Fixes #1128.
* Clean up GCC build warningsBen Straub2012-12-102-3/+2
|
* Merge pull request #1126 from carlosmn/indexer-bufferVicent Martí2012-12-101-10/+9
|\ | | | | indexer: move the temporary buffers into the indexer object
| * indexer: move the temporary buffers into the indexer objectCarlos Martín Nieto2012-12-071-10/+9
| | | | | | | | | | | | 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.
* | Merge pull request #1127 from libgit2/fix-mwindow-threadingVicent Martí2012-12-105-15/+54
|\ \ | |/ |/| Fix mwindow mutex initialization and error checking
| * orite C89Justin Spahr-Summers2012-12-091-2/+2
| |
| * Treat git_mutex_lock as successful when threads are disabledJustin Spahr-Summers2012-12-091-1/+1
| |
| * Always check the result of git_mutex_lockJustin Spahr-Summers2012-12-093-14/+51
| |
| * git__mwindow_mutex needs to be initialized even with pthreadsJustin Spahr-Summers2012-12-091-0/+2
|/ | | | 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()
* Merge pull request #1091 from carlosmn/stream-objectVicent Martí2012-12-075-59/+282
|\ | | | | Indexer speedup with large objects
| * indexer: correctly deal with objects larger than the window sizeCarlos Martín Nieto2012-11-301-19/+26
| | | | | | | | | | | | | | | | A mmap-window is not guaranteed to give you the whole object, but the indexer currently assumes so. Loop asking for more data until we've successfully CRC'd all of the packed data.
| * indexer: make use of streaming also for deltasCarlos Martín Nieto2012-11-301-49/+78
| | | | | | | | | | | | | | | | | | | | | | | | Up to now, deltas needed to be enterily in the packfile, and we tried to decompress then in their entirety over and over again. Adjust the logic so we read them as they come, just as we do for full objects. This also allows us to simplify the logic and have less nested code. The delta resolving phase still needs to decompress the whole object into memory, as there is not yet any streaming delta-apply support, but it helps in speeding up the downloading process and reduces the amount of memory allocations we need to do.
| * indexer: use the packfile streaming APICarlos Martín Nieto2012-11-303-30/+137
| | | | | | | | | | | | | | | | | | | | | | | | | | The new API allows us to read the object bit by bit from the packfile, instead of needing it all at once in the packfile. This also allows us to hash the object as it comes in from the network instead of having to try to read it all and failing repeatedly for larger objects. This is only the first step, but it already shows huge improvements when dealing with objects over a few megabytes in size. It reduces the memory needs in some cases, but delta objects still need to be completely in memory and the old inefficent method is still used for that.
| * pack: introduce a streaming API for raw objectsCarlos Martín Nieto2012-11-302-0/+80
| | | | | | | | | | This allows us to take objects from the packfile as a stream instead of having to keep it all in memory.
* | Merge pull request #1123 from carlosmn/lax-treeVicent Martí2012-12-073-36/+48
|\ \ | | | | | | tree: relax the filemode parser
View Lorry Controller Status