Log

Author Commit Date CI Message
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
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 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 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
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.
Carlos Martín Nieto 2086e1ba 2013-01-11T16:54:57 tests: plug a couple of leaks
nulltoken a379e652 2013-01-11T16:14:17 refspec: prevent git_refspec__free() from segfaulting Fix libgit2/libgit2sharp#247
Sebastian Bauer 976d9e13 2013-01-11T10:47:44 regex: Fixed warnings about unused parameter values. There are different solutions to the problem. In this change, we define an UNUSED macro that maps to __attribute__((unused)) when compiling with gcc. Otherwise it is a NOOP. We apply this macro in all function headers for each parameter value that is not used within the function body. The change is local to regex.
Sebastian Bauer d2f14df8 2013-01-11T10:25:51 regex: Fixed several warnings about signed/unsigned conversions.
Sascha Cunz 1265b51f 2013-01-11T03:07:50 Add missing git_buf_free
Sascha Cunz 88aef766 2013-01-11T02:45:55 Implement analog for 'git checkout --branch xxx ...'
Sascha Cunz 132c2db6 2013-01-11T02:18:27 Fix possible free'ing of unitialized pointer in error case
Vicent Martí 3a5e8fae 2013-01-10T15:18:49 Merge pull request #1221 from arrbee/checkout-without-pathspec-match Add GIT_CHECKOUT_DISABLE_PATHSPEC_MATCH
Russell Belfer 40342bd2 2013-01-10T15:15:37 Add GIT_CHECKOUT_DISABLE_PATHSPEC_MATCH This adds an option to checkout a la the diff option to turn off fnmatch evaluation for pathspec entries. This can be useful to make sure your "pattern" in really interpretted as an exact file match only.
Vicent Martí 404880b1 2013-01-10T11:24:09 Merge pull request #1206 from ben/stock-auth Expose stock user/pass credential utility
Vicent Martí 48de3061 2013-01-10T10:04:53 Merge pull request #1220 from ethomson/reuc_empty_sides REUC needs to handle empty sides
Edward Thomson eb3c247a 2013-01-10T11:56:02 REUC needs to handle empty sides
Vicent Martí 7bacc2c8 2013-01-10T08:15:10 Merge pull request #1182 from libgit2/odb-file-refresh Sane refresh logic for #1180
Vicent Martí 3f31ce8d 2013-01-10T08:13:02 Merge pull request #1218 from sba1/amiga.2 Libgit2 for AmigaOS4
Vicent Marti 8fe6bc5c 2013-01-10T15:43:08 odb: Refresh on `exists` query too
Vicent Marti 891a4681 2013-01-04T17:42:41 dat errorcode
Vicent Marti 4a863c06 2013-01-03T20:36:26 Sane refresh logic All the ODB backends have a specific refresh interface. When reading an object, first we attempt every single backend: if the read fails, then we refresh all the backends and retry the read one more time to see if the object has appeared.
Vicent Martí a22ad9fd 2013-01-10T06:01:00 Merge pull request #1219 from sba1/fetch-example-return-fix Don't call pthread_exit() in the callback of the fetch example
Sebastian Bauer cea994b9 2013-01-10T12:39:17 Don't call pthread_exit() in the callback. Compilers that are not aware that pthread_exit() does not return issue a warning when compiling the present code. This change exchanges the call to pthread_exit() with a simple return statement. According to the pthread specification this is equivalent.
Sebastian Bauer ccd298bb 2013-01-04T23:49:28 Ignore build-amiga
Sebastian Bauer b41e24a6 2013-01-04T13:02:47 Add -fPIC only if BUILD_SHARED_LIBS is ON
Sebastian Bauer 707ede86 2013-01-04T03:25:05 Compile regexp dependency when AMIGA is defined. Before it was compiled when CMake was actually run on AmigaOS.
Sebastian Bauer c57c4af3 2012-12-29T23:27:14 Disable SSL when compiling for AmigaOS for now.
Sebastian Bauer e9bb730c 2012-11-09T06:02:30 Added missing curly brackets and fixed compiler warnings.
Ben Straub 520dcc1c 2013-01-08T19:55:59 Move credential helpers to their own (optional) header
Ben Straub ffb02b16 2013-01-08T12:58:20 Expose stock user/pass credential utility
Philip Kelley fcc48d1f 2013-01-09T12:37:22 Add a failing test for autocrlf filters
Vicent Martí 252b2404 2013-01-09T08:43:19 Merge pull request #1214 from schu/push-handle-tags push: properly handle tags
Michael Schubert abeefbbe 2012-12-26T19:16:23 push: properly handle tags Currently, push doesn't really handle tags when queueing objects. Fix it.
Michael Schubert f85b6284 2012-12-25T14:50:29 tests-clar/network: remove unused CREATE_BLOB
Jameson Miller 087f64d3 2012-12-17T18:48:26 Relax refspecs accepted by push
Vicent Martí 11fccddc 2013-01-08T17:16:47 Merge pull request #1212 from arrbee/fix-diff-empty-file Resolve crash with diff against empty file
Russell Belfer de590550 2013-01-08T17:11:11 Resolve crash with diff against empty file It is not legal inside our `p_mmap` function to mmap a zero length file. This adds a test that exercises that case inside diff and fixes the code path where we would try to do that. The fix turns out not to be a lot of code since our default file content is already initialized to "" which works in this case. Fixes #1210
Vicent Martí f7e4a7c2 2013-01-08T15:34:55 Merge pull request #1209 from ethomson/update_copyright update copyrights
Edward Thomson 359fc2d2 2013-01-08T17:07:25 update copyrights
Vicent Martí d63dc61d 2013-01-08T15:04:05 Merge pull request #1208 from ethomson/ppc_sha1_asm_deadness remove ppc sha1 asm
Edward Thomson 8f09f464 2013-01-08T16:54:44 remove ppc sha1 asm
Vicent Martí d4df288d 2013-01-08T14:41:25 Merge pull request #1207 from ethomson/cmake_comment_len_sanity keep comments at < 80 chars
Edward Thomson d335e73a 2013-01-08T16:37:19 keep comments at < 80 chars
Vicent Martí 368a2b4e 2013-01-07T18:33:50 Merge pull request #1204 from arrbee/diff-blob-to-buffer Have diff blob to buffer share code (and add tests)
Russell Belfer f2b7f7a6 2013-01-07T15:44:22 Share git_diff_blobs/git_diff_blob_to_buffer code This moves the implementation of these two APIs into common code that will be shared between the two. Also, this adds tests for the `git_diff_blob_to_buffer` API. Lastly, this adds some extra `const` to a few places that can use it.
Ignacio Casal Quinteiro f6234cd9 2012-12-21T20:57:43 Introduce git_diff_blob_to_buffer
Vicent Martí 7dfc5c3c 2013-01-07T07:34:34 Merge pull request #1203 from phkelley/reverse_dak Revert changes from git/git diff-delta.c by dak@gnu.org, proski@gnu.org
Philip Kelley 8e89839d 2013-01-07T07:06:18 Merge pull request #1202 from martinwoodward/add-florian Add Florian Forster to hall of fame
Philip Kelley f6ed5e2d 2013-01-07T09:53:43 Revert changes from git/git diff-delta.c by dak@gnu.org, proski@gnu.org
Martin Woodward 32f59bfb 2013-01-07T14:52:42 Add Florian Forster to hall of fame Permission recieved from Florian Forster on Jan 07 2013 to include any changes of his from core Git into LibGit2.
Vicent Martí 05e9fc58 2013-01-06T18:56:40 Merge pull request #1200 from ethomson/merge_cleanup merge cleanup should actually cleanup and the test should actually test
Edward Thomson c31ae146 2013-01-06T18:38:29 merge cleanup should actually cleanup and the test should actually test
Kevin Sawicki 7eb222fc 2013-01-06T10:39:35 Correct typos in documentation
Kevin Sawicki e5562e18 2013-01-06T10:12:05 Revert "Tab align value of GIT_FILEMODE_BLOB_EXECUTABLE" This reverts commit 47fbcbb5a8d4aad87371a381ebdadd04cde3fb2b.
Kevin Sawicki 47fbcbb5 2013-01-06T10:02:37 Tab align value of GIT_FILEMODE_BLOB_EXECUTABLE
Vicent Martí 8b107c67 2013-01-06T09:12:02 Merge pull request #1198 from nulltoken/travis/run-valgrind-on-success travis: Only run Valgrind when all tests pass
nulltoken ced8eff1 2013-01-06T17:21:37 travis: Only run Valgrind when all tests pass
Vicent Martí 5df7ad3e 2013-01-06T07:56:45 Merge pull request #1196 from scunz/allow_clone_without_master_branch Allow to clone repositories that don't have a `master` branch
Vicent Martí 74f880a6 2013-01-06T07:56:08 Merge pull request #1197 from nulltoken/travis/run-online-tests travis: Include the online suite when running against Travis
nulltoken d01fe380 2013-01-06T15:26:54 reset: Fix a memory leak
nulltoken b97fabfa 2013-01-06T15:18:00 tests: Fix some memory leaks
nulltoken d1aee477 2013-01-06T15:09:27 clone: Fix a memory leak