Log

Author Commit Date CI Message
Vicent Martí 586f71ef 2013-01-22T23:03:53 Merge pull request #1273 from sba1/example-diff-fix Don't clear the opt instance in the diff example.
Sebastian Bauer 75a0a800 2013-01-23T07:47:40 Don't clear the opt instance in the diff example. The version field is overwritten otherwise. The opt instance is already initialized properly.
Vicent Martí b101fbf9 2013-01-22T18:55:56 Merge pull request #1271 from libgit2/global-settings Global options setter
Vicent Marti 59853eff 2013-01-23T02:58:58 Global options setter
Russell Belfer 8958fad7 2013-01-22T16:02:43 Merge pull request #1270 from libgit2/packed-peeled-objects-fix Allow peeled references without trailing newline at end of file
Scott J. Goldman 5c7b77c4 2013-01-22T16:01:03 Seperate out a new test that verifies packed-refs with no trailing newline as per @vmg's request
Scott J. Goldman cb35094b 2013-01-22T15:49:51 Allow peeled references without trailing newline at end of file Also ammends one of the tag tests to make sure it's working.
Vicent Martí f0f073b7 2013-01-22T15:31:44 Merge pull request #1269 from arrbee/tree-iterator-case-sensitivity-bug Fix case sensitivity bug with tree iterators
Russell Belfer cce548e3 2013-01-22T15:28:25 Fix case sensitivity bug with tree iterators With the new code to make tree iterators support ignore_case, there is a bug in setting the start entry for range bounded iterators where memcmp was being used instead of strncasecmp. This fixes that and expands the tree iterator test to cover the cases that were broken.
Scott J. Goldman 2a707d0e 2013-01-22T14:08:50 Revert "Handle packed peeled objects without trailing newlines" This reverts commit 28b1cdf3a1bdcd37cf9d550c92b8c19b1782ea6b. //cc #1262 #1267
Vicent Martí 148c786c 2013-01-22T09:20:09 Merge pull request #1268 from phkelley/development A simple perf optimization in pack-objects.c
Philip Kelley 47fc2642 2013-01-22T09:25:15 Fix gen_pktline format specifier for Win32
Philip Kelley f4b86126 2013-01-22T08:21:08 A simple perf optimization in pack-objects.c
Vicent Martí fad251ae 2013-01-21T15:09:38 Merge pull request #1267 from libgit2/no-newline Handle packed peeled objects without trailing newlines
Scott J. Goldman 28b1cdf3 2013-01-21T14:45:43 Handle packed peeled objects without trailing newlines Fixes #1262
Vicent Martí 4c723a32 2013-01-21T13:41:35 Merge pull request #1266 from arrbee/update-clar Update clar to a80e7f30
Russell Belfer e8a92fe1 2013-01-21T13:39:53 Update clar to a80e7f30
Vicent Martí 1bf7bee3 2013-01-21T13:23:13 Merge pull request #1265 from arrbee/parse-commit-time-as-uint64 Parse commit time as uint64_t to avoid overflow
Russell Belfer 965e4e2d 2013-01-21T13:19:41 Parse commit time as uint64_t to avoid overflow The commit time is already stored as a git_time_t, but we were parsing is as a uint32_t. This just switches the parser to use uint64_t which will handle dates further in the future (and adds some tests of those future dates).
Carlos Martín Nieto d47c6aab 2013-01-20T04:20:09 commit: don't include the LF in the header field value When the encoding header changed to be treated as an additional header, the EOL pointer started to point to the byte after the LF, making the git__strndup call copy the LF into the value. Increase the EOL pointer value after copying the data to keep the rest of the semantics but avoid copying LF.
Carlos Martín Nieto 7a2cf780 2013-01-20T01:57:32 Fix compilation on OpenBSD
Philip Kelley d77f80d8 2013-01-18T12:05:10 Merge pull request #1260 from phkelley/development Fix really bad error handling in git_smart__negotiate_fetch
Philip Kelley 77844988 2013-01-18T14:51:46 Fix really bad error handling in git_smart__negotiate_fetch
Vicent Martí 537abd4a 2013-01-17T22:09:57 Merge pull request #1258 from zcbenz/fix_index_remove_test Fix linking error caused by ddcb28a41f3774e26fc6ae0a7174a5565e4749ce.
Zhao Cheng c55c6244 2013-01-18T13:22:55 Fix linking error caused by ddcb28a41f3774e26fc6ae0a7174a5565e4749ce.
Vicent Martí ddcb28a4 2013-01-17T16:56:57 Merge pull request #1239 from ethomson/index_remove add an index_remove_bypath that removes conflicts
Vicent Martí 3a93ab90 2013-01-17T16:33:40 Merge pull request #1256 from arrbee/asciify-test-data Move all non-ascii test data to raw hex
Vicent Martí 214bf53b 2013-01-17T16:32:46 Merge pull request #1257 from ethomson/crlf_test_fix add a git config, don't run crlf tests on non-win32
Edward Thomson 271680d7 2013-01-17T18:18:44 add a git config, don't run crlf tests on non-win32
Russell Belfer f63d0ee9 2013-01-17T15:47:10 Move all non-ascii test data to raw hex This takes all of the characters in core::env and makes them use hex sequences instead of keeping tricky character data inline in the test.
Vicent Martí 75f49ae4 2013-01-17T13:45:52 Merge pull request #1244 from carlosmn/pack-evict A comparison of eviction algorithms for the delta base cache
Ben Straub c49fa037 2013-01-17T13:37:32 Merge pull request #1247 from sba1/dont-segfault-if-transport-doesnt-support-push Don't segfault if transport doesn't support push.
Vicent Martí 5c8901ab 2013-01-17T13:36:33 Merge pull request #1255 from arrbee/fix-signed-commit-header-parsing Add skipping of unknown commit headers
Vicent Martí 56af285c 2013-01-17T13:34:20 Merge pull request #1254 from ethomson/index_filtered_size cache should contain on-disk (filtered) file size
Sebastian Bauer b90eb84f 2013-01-17T22:27:04 Test that pushs properly fail for transports that don't provide a push implementation.
Russell Belfer 291090a0 2013-01-17T13:19:09 Add skipping of unknown commit headers This moves the check for the "encoding" header into a loop which is just scanning for non-required headers at the end of a commit header. That loop will skip unrecognized lines (including header continuation lines) until a terminating completely blank line is found, and only then does it move to reading the commit message.
Edward Thomson 6e959708 2013-01-17T13:11:57 cache should contain on-disk (filtered) file size
Sebastian Bauer 9bf56c7b 2013-01-15T21:39:37 Don't segfault if transport doesn't support push. Instead, set an more informative error message.
Vicent Martí 34a4ad46 2013-01-16T15:52:58 Merge pull request #1211 from arrbee/fix-icase-status-file Fix case insensitivity issues in git_status_file
Vicent Martí 4b45675d 2013-01-16T14:20:41 Merge pull request #1248 from sba1/doc-fix Some doc improvements in transport.h
Vicent Martí 365485e3 2013-01-16T14:17:48 Merge pull request #1245 from nulltoken/topic/git_branch_tracking_name Introduce git_branch_tracking_name()
nulltoken bf031581 2013-01-14T14:22:11 branch: Introduce git_branch_tracking_name()
nulltoken 28cbd2e2 2013-01-14T12:09:10 Fix indentations
Sebastian Bauer 62d4fa23 2013-01-16T12:25:28 Some doc improvements
Russell Belfer fffe429a 2013-01-10T11:11:42 Shortcut spool and sort for empty iterator
Russell Belfer 25423d03 2013-01-09T16:07:54 Support case insensitive tree iterators and status This makes tree iterators directly support case insensitivity by using a secondary index that can be sorted by icase. Also, this fixes the ambiguity check in the git_status_file API to also be case insensitive. Lastly, this adds new test cases for case insensitive range boundary checking for all types of iterators. With this change, it should be possible to deprecate the spool and sort iterator, but I haven't done that yet.
Russell Belfer 98527b5b 2013-01-09T16:03:35 Add git_tree_entry_cmp and git_tree_entry_icmp This adds a new external API git_tree_entry_cmp and a new internal API git_tree_entry_icmp for sorting tree entries. The case insensitive one is internal only because general users should never be seeing case-insensitively sorted trees.
Russell Belfer 23594c1d 2013-01-09T16:02:42 Add git_path_icmp to case-insensitive path cmp This adds git_path_icmp to complement git_path_cmp.
Russell Belfer 851ad650 2013-01-09T16:00:16 Add payload "_r" versions of bsearch and tsort git__bsearch and git__tsort did not pass a payload through to the comparison function. This makes it impossible to implement sorted lists where the sort order depends on external data (e.g. building a secondary sort order for the entries in a tree). This commit adds git__bsearch_r and git__tsort_r versions that pass a third parameter to the cmp function of a user payload.
Russell Belfer a49340c3 2013-01-08T15:56:11 Test for ignore_case ranges on workdir iterator This adds a test that confirms that the working directory iterator can actually correctly process ranges of files case insensitively with proper sorting and proper boundaries.
Russell Belfer 134d8c91 2013-01-08T15:53:13 Update iterator API with flags for ignore_case This changes the iterator API so that flags can be passed in to the constructor functions to control the ignore_case behavior. At this point, the flags are not supported on tree iterators (i.e. there is no functional change over the old API), but the API changes are all made to accomodate this. By the way, I went with a flags parameter because in the future I have a couple of other ideas for iterator flags that will make it easier to fix some diff/status/checkout bugs.
Russell Belfer 5c8bb98c 2013-01-08T13:45:06 Fix err msg for ambiguous path in git_status_file Returning GIT_EAMBIGUOUS from inside the status callback gets overridden with GIT_EUSER. `git_status_file` accounted for this via the callback payload, but was allowing the error message to be cleared. Move the `giterr_set` call outside the callback to where the EUSER case was being dealt with.
Russell Belfer 4b181037 2013-01-08T13:39:15 Minor iterator API cleanups In preparation for further iterator changes, this cleans up a few small things in the iterator API: * removed the git_iterator_for_repo_index_range API * made git_iterator_free not be inlined * minor param name and test function name tweaks
Russell Belfer facc0650 2013-01-08T13:27:25 Simplify git_diff__paired_foreach icase handling
nulltoken bcbb1e20 2013-01-05T20:58:25 status: Enhance git_status_file() test coverage
Russell Belfer 230010d1 2013-01-15T09:46:50 Merge pull request #1238 from nulltoken/fix/checkout-index checkout: Teach checkout to cope with orphaned Head
Russell Belfer 848d77dc 2013-01-14T10:05:35 Merge pull request #1242 from sba1/init-with-template-fix Some fixes for external template support
Carlos Martín Nieto 9c62aaab 2013-01-14T17:42:12 pack: evict all of the pages at once Somewhat surprisingly, this can increase the speed considerably, as we don't bother trying to decide what to evict, and the most used entries are quickly back into the cache.
Carlos Martín Nieto ed6648ba 2013-01-14T16:39:22 pack: evict objects from the cache in groups of eight This drops the cache eviction below libcrypto and zlib in the perf output. The number has been chosen empirically.
Sebastian Bauer 72719e73 2013-01-13T12:21:52 Altered the description of the template. Before, it was identical to the default template making it difficult to check, if the proper template was copied an external template test.
Sebastian Bauer 5885ba11 2013-01-13T12:23:30 Now checks in the template test whether the description file has been properly copied. This is a minimal effort to test whether the template really has been used when creating an repo with external templates.
Sebastian Bauer 85f40312 2013-01-13T11:30:05 Do not use GIT_CPDIR_CHMOD flag when copying the template. This is an intermin solution. While this essentially disables the --shared flag feature, previously external templates did not work at all. This change fixes the previously corrected, and since then failing, repo_init__extended_with_template() test. The problem is now documented in the source code comments.
nulltoken 5b524d69 2013-01-12T19:37:14 Fix Travis compilation warnings
nulltoken 2a3b3e03 2013-01-12T19:27:31 checkout: Teach checkout to cope with orphaned Head Fix #1236
Edward Thomson 25743bd7 2013-01-12T13:47:56 add an index_remove_bypath that removes conflicts, renamed add_from_workdir to match
Sebastian Bauer b7b1acfd 2013-01-12T20:02:00 Clear local error variable after invoking giterr_clear().
Carlos Martín Nieto 09e29e47 2013-01-12T19:31:07 pack: fixes to the cache The offset should be git_off_t, and we should check the return value of the mutex lock function.
Carlos Martín Nieto 0b3aa7be 2013-01-12T19:01:45 tests: plug leaks
Carlos Martín Nieto 96c9b9f0 2013-01-12T18:38:19 indexer: properly free the packfile resources The indexer needs to call the packfile's free function so it takes care of freeing the caches. We still need to close the mwf descriptor manually so we can rename the packfile into its final name on Windows.
Sebastian Bauer 4a4aee11 2013-01-12T18:44:50 Added flag GIT_REPOSITORY_INIT_EXTERNAL_TEMPLATE to test_repo_init__extended_with_template(). Otherwise the template functionallity is not tested (as a TODO we also shall test that the specified template really got copied).
Vicent Martí e2d2c6e5 2013-01-12T02:14:14 Merge pull request #1222 from scunz/clone_branch Switch to specified branch during clone
Sascha Cunz f31cae8b 2013-01-12T05:51:00 Default git_clone_options' checkout strategy to GIT_CHECKOUT_SAFE_CREATE
Ben Straub 3874f2d5 2013-01-11T20:23:46 Kill vestigal dangling-remote code Fixes #1232
Philip Kelley 359316b5 2013-01-11T17:16:55 Merge pull request #1215 from phkelley/binaryunicode Add a failing test for CRLF filters
Philip Kelley dd6367e3 2013-01-11T19:00:19 Fix up binaryunicode test repo
Vicent Marti 355dddbf 2013-01-12T01:40:35 buf: Is this the function you were looking for?
Sascha Cunz f1d4a35e 2013-01-12T00:08:48 Tests: Add test for check out of given branch during clone
Sascha Cunz b5b28120 2013-01-12T00:07:44 Test: Cleanup some cleaning code
Russell Belfer ad10db2a 2013-01-10T15:59:36 Check for binary blobs in checkout This adds a git_buf_text_is_binary check to blobs before applying filters when the blob data is being written to disk.
Vicent Martí 160e4fb7 2013-01-11T11:35:09 Merge pull request #1230 from arrbee/match-core-git-diff-binary-detection Match binary file check of core git in diff
Vicent Martí 6e19edaa 2013-01-11T11:34:13 Merge pull request #1229 from arrbee/fix-diff-patch-line-numbers Fix diff patch line number calculation
Russell Belfer 0d65acad 2013-01-11T11:24:26 Match binary file check of core git in diff Core git just looks for NUL bytes in files when deciding about is-binary inside diff (although it uses a better algorithm in checkout, when deciding if CRLF conversion should be done). Libgit2 was using the better algorithm in both places, but that is causing some confusion. For now, this makes diff just look for NUL bytes to decide if a file is binary by content in diff.
Russell Belfer 805c476c 2013-01-11T11:20:44 Fix diff patch line number calculation This was just wrong. Added a test that verifying patch line numbers even for hunks further into a file and then fixed the algorithm. I needed to add a little extra state into the patch so that I could track old and new file numbers independently, but it should be okay.
Carlos Martín Nieto 80d647ad 2013-01-11T20:15:06 Revert "pack: packfile_free -> git_packfile_free and use it in the indexers" This reverts commit f289f886cb81bb570bed747053d5ebf8aba6bef7, which makes the tests fail on Windows. Revert until we can figure out a solution.
Vicent Martí 3f4437e7 2013-01-11T10:59:31 Merge pull request #1227 from nulltoken/topic/emergeconflict Introduce EMERGECONFLICT
nulltoken f3738eba 2013-01-11T15:39:14 Fix MSVC Clar compilation warnings
nulltoken 090d5e1f 2013-01-11T14:40:09 Fix MSVC compilation warnings
nulltoken 4a0ac175 2013-01-10T23:27:13 checkout: Deploy EMERGECONFLICT usage
nulltoken 635c235c 2013-01-10T12:11:49 errors: Introduce EMERGECONFLICT error code
nulltoken cce2f16b 2013-01-10T12:32:20 Fix indentations
Vicent Marti d0b14cea 2013-01-11T18:21:09 pack: That declaration
Vicent Marti 6e237de6 2013-01-11T18:19:52 regex: Proper define for this thing
Vicent Martí 32b33d62 2013-01-11T09:12:21 Merge pull request #1228 from carlosmn/delta-base Introduce a delta base cache
Vicent Martí e87f0514 2013-01-11T08:52:31 Merge pull request #1224 from sba1/some-regex-warning-fixes Some regex warning fixes
Carlos Martín Nieto f289f886 2013-01-11T17:24:52 pack: packfile_free -> git_packfile_free and use it in the indexers It turns out the indexers have been ignoring the pack's free function and leaking data. Plug that.
Carlos Martín Nieto 0ed75620 2012-12-21T13:46:48 pack: limit the amount of memory the base delta cache can use Currently limited to 16MB (like git) and to objects up to 1MB in size.
Carlos Martín Nieto c8f79c2b 2012-12-21T10:59:10 pack: abstract out the cache into its own functions
Vicent Martí 8ace4165 2013-01-11T08:26:26 Merge pull request #1226 from nulltoken/fix/refspec_free refspec: prevent git_refspec__free() from segfaulting
Carlos Martín Nieto 525d961c 2012-12-20T07:55:51 pack: refcount entries and add a mutex around cache access
Carlos Martín Nieto c0f4a011 2012-12-19T16:48:12 pack: introduce a delta base cache Many delta bases are re-used. Cache them to avoid inflating the same data repeatedly. This version doesn't limit the amount of entries to store, so it can end up using a considerable amound of memory.