Log

Author Commit Date CI Message
Ben Straub b7bb086b 2013-11-04T15:25:26 Standardize layout of blame sample
Vicent Martí 0e1115d2 2013-11-04T12:16:14 Merge pull request #1939 from ethomson/readwrite_odb Allow backend consumers to specify file mode
Edward Thomson dd64c71c 2013-11-04T14:50:25 Allow backend consumers to specify file mode
Russell Belfer fb6b0e01 2013-11-04T10:44:59 Merge pull request #1317 from libgit2/blame Blame Canada
Vicent Martí a605bbd9 2013-11-04T10:14:22 Merge pull request #1934 from libgit2/relicense-examples Relicense examples under CC0
Vicent Martí 44acdd1f 2013-11-04T08:09:58 Merge pull request #1937 from scunz/checkout_assert Don't assert in git_checkout_tree
Vicent Martí 5a0b8803 2013-11-04T08:05:55 Merge pull request #1929 from libgit2/rb/misc-diff-fixes Fix some observed problems with incorrect diffs
Carlos Martín Nieto becb13c0 2013-11-03T13:46:07 examples: doc update Update the explanation to reflect our use of git_status_list_new() and make the breaks in rocco more meaningful. Clarify why GIT_STATUS_CURRENT and index_to_workdir don't always imply each other. Fixes #1740.
Carlos Martín Nieto a7a64d2c 2013-11-02T18:36:34 remote: don't write too much when dealing with multivars We used to move `data_start` forward, which is wrong as that needs to point to the beginning of the buffer in order to perform size calculations. Introduce a `write_start` variable which indicates where we should start writing from, which is what the `data_start` was being wrongly reused to be.
Carlos Martín Nieto 187009e2 2013-11-02T18:34:51 Fix a leak in the diff tests
Ben Straub 6cb831bd 2013-11-02T05:33:26 Replace copyright topmatter in example files
Sascha Cunz 7b3959b2 2013-11-02T03:45:32 Checkout: git_checkout_head is git_checkout_tree without a treeish The last commit taught git_checkout_tree to actually do something meaningfull, when treeish was NULL. This lets us rewrite git_checkout_head to simply call git_checkout_tree without giving it a treeish.
Sascha Cunz 35221441 2013-11-02T03:43:34 Checkout: Don't assert if treeish is NULL In git_checkout_tree, the first check tests if either repo or treeish is NULL and says that eithor of them has to have a valid value. But there is no code to handle the treeish == NULL case. So, do something meaningful in that case: use HEAD instead.
Sascha Cunz 10749f6c 2013-11-02T03:20:05 Checkout: Unifiy const-ness of `opts` parameter Since all 3 checkout APIs perform the same operation with the options, all of them should use the same const-ness.
Vicent Martí 7f13edfd 2013-11-01T15:25:28 Merge pull request #1935 from ethomson/winerrs preserve windows error numbers as well
Edward Thomson c2408a69 2013-11-01T17:03:01 preserve windows error numbers as well
Russell Belfer 3e57069e 2013-11-01T13:49:43 Fix --assume-unchanged support This was never really working right because we were checking the wrong flag and not checking it in all the places that we need to be checking it. I finally got around to writing a test and adding actual support for it.
Russell Belfer e7c85120 2013-11-01T11:39:37 More tests and fixed for merging reversed diffs There were a lot more cases to deal with to make sure that our merged (i.e. workdir-to-tree-to-index) diffs were matching the output of core Git.
Ben Straub dcfdb977 2013-11-01T10:51:12 Relicense examples under CC0
Russell Belfer a5c16f3c 2013-11-01T10:18:03 Add git_diff_options_init helper Sometimes the static initializer for git_diff_options cannot be used and since setting them to all zeroes doesn't actually work quite right, this adds a new helper for that situation. This also adds an explicit new value to the submodule settings options to be used when those enums need static initialization.
Russell Belfer 8e5a8ef8 2013-11-01T09:51:01 Convert git_index_read to have a "force" flag This is a little more intuitive than the turned-around option that I originally wrote.
Russell Belfer 4bf630b6 2013-10-31T14:36:52 Make diff and status perform soft index reload This changes `git_index_read` to have two modes - a hard index reload that always resets the index to match the on-disk data (which was the old behavior) and a soft index reload that uses the timestamp / file size information and only replaces the index data if the file on disk has been modified. This then updates the git_status code to do a soft reload unless the new GIT_STATUS_OPT_NO_REFRESH flag is passed in. This also changes the behavior of the git_diff functions that use the index so that when an index is not explicitly passed in (i.e. when the functions call git_repository_index for you), they will also do a soft reload for you. This intentionally breaks the file signature of git_index_read because there has been some confusion about the behavior previously and it seems like all existing uses of the API should probably be examined to select the desired behavior.
Russell Belfer 3940310e 2013-10-30T13:56:42 Fix some of the glaring errors in GIT_DIFF_REVERSE These changes fix the basic problem with GIT_DIFF_REVERSE being broken for text diffs. The reversed diff entries were getting added to the git_diff correctly, but some of the metadata was kept incorrectly in a way that prevented the text diffs from being generated correctly. Once I fixed that, it became clear that it was not possible to merge reversed diffs correctly. This has a first pass at fixing that problem. We probably need more tests to make sure that is really fixed thoroughly.
Vicent Martí 567649f2 2013-11-01T09:38:34 Merge pull request #1916 from libgit2/simplify-examples Fix examples to make the important stuff more obvious
Russell Belfer 948f00b4 2013-11-01T09:38:03 Merge pull request #1933 from libgit2/vmg/gcc-warnings Warnings for Windows x64 (MSVC) and GCC on Linux
Vicent Marti d3ed2106 2013-11-01T17:08:32 clar: Fix warnings in GCC/Linux
Vicent Marti 0bfa7323 2013-11-01T17:07:44 iconv: Do not fake an API when iconv is not available
Vicent Marti 95352b70 2013-11-01T16:55:20 checkout: Remove unused vector
Vicent Marti 73342386 2013-11-01T16:55:01 array: Wrap `array_alloc` as a single statement
Vicent Marti 51a3dfb5 2013-11-01T16:31:02 pack: `__object_header` always returns unsigned values
Linquize 3343b5ff 2013-10-31T22:59:42 Fix warning on win64
Vicent Martí ac5e507c 2013-11-01T09:31:52 Merge pull request #1918 from libgit2/cmn/indexer-naming indexer: remove the stream infix
Vicent Marti b22593fb 2013-11-01T17:28:59 config_file: Style fixes
Vicent Marti 653ec420 2013-11-01T17:25:32 Merge remote-tracking branch 'drodriguez/fix-remote-save' into development
Ben Straub 4f62d559 2013-11-01T05:39:21 Fix typos
Vicent Martí ab44c62e 2013-11-01T04:22:12 Merge pull request #1928 from libgit2/parse-bad-urls Improve bad URL handling
Carlos Martín Nieto c44820c6 2013-10-31T23:42:50 A few formatting changes for rocco I'm not too happy about manually inserting < and > but those get output as html tags otherwise.
Daniel Rodríguez Troitiño 376454d0 2013-10-31T23:42:04 Set new multivar values using unmatcheable regexp. Seems that regexp in Mac OS X and Linux were behaving differently: while in OS X the empty string didn't match any value, in Linux it was matching all of them, so the the second fetch refspec was overwritting the first one, instead of creating a new one. Using an unmatcheable regular expression solves the problem (and seems to be portable).
Daniel Rodríguez Troitiño a71331eb 2013-10-31T23:41:48 Fix memory leaks.
Daniel Rodríguez Troitiño 3793fa9b 2013-10-31T01:08:50 Fix saving remotes with several fetch/push ref specs. At some moment git_config_delete_entry lost the ability to delete one entry of a multivar configuration. The moment you had more than one fetch or push ref spec for a remote you will not be able to save that remote anymore. The changes in network::remote::remotes::save show that problem. I needed to create a new git_config_delete_multivar because I was not able to remove one or several entries of a multivar config with the current API. Several tries modifying how git_config_set_multivar(..., NULL) behaved were not successful. git_config_delete_multivar is very similar to git_config_set_multivar, and delegates into config_delete_multivar of config_file. This function search for the cvar_t that will be deleted, storing them in a temporal array, and rebuilding the linked list. After calling config_write to delete the entries, the cvar_t stored in the temporal array are freed. There is a little fix in config_write, it avoids an infinite loop when using a regular expression (case for the multivars). This error was found by the test network::remote::remotes::tagopt.
Russell Belfer 76120863 2013-10-31T14:48:41 Update examples/README.md
Ben Straub 85c6730c 2013-10-31T14:35:32 Format comments for use with docco
Ben Straub 048f837b 2013-10-31T13:30:22 Prevent another segfault from bad URL
Ben Straub 887df99f 2013-10-31T13:29:16 Test another bad URL
Ben Straub 151b3218 2013-10-31T13:16:04 Prevent segfault with a badly-formed URL
Ben Straub 7be5104d 2013-10-31T13:15:49 Add tests for badly-formed URLs
Vicent Martí f93f3790 2013-10-31T06:35:01 Merge pull request #1924 from linquize/gmtime Use gmtime() instead of gmtime_t()
Linquize 864e7271 2013-10-31T20:58:00 Use gmtime() instead of gmtime_t() The latter is not available on Windows
Ben Straub ff0ef88c 2013-10-30T18:54:39 Test more kinds of bad url
Ben Straub 29b77446 2013-10-30T15:38:52 Initialize variables
Ben Straub dbdb22b3 2013-10-30T13:20:08 Clean up showindex sample
Ben Straub b9d02460 2013-10-30T13:07:58 Reorganize rev-parse example
Ben Straub 784b3abb 2013-10-30T12:34:03 rev-list.c example: use common utils, reorganize
Vicent Martí cc745341 2013-10-30T09:27:36 Merge pull request #1919 from libgit2/cmn/multi-ack-detailed protocol: basic support for multi_ack_detailed
Carlos Martín Nieto 1d37da33 2013-10-30T16:25:49 merge: any non-zero return from the user is an error This fixes #1703.
Carlos Martín Nieto 2f8c481c 2013-10-08T16:22:21 protocol: basic support for multi_ack_detailed This tells the server that we speak it, but we don't make use of its extra information to determine if there's a better place to stop negotiating. In a somewhat-related change, reorder the capabilities so we ask for them in the same order as git does. Also take this opportunity to factor out a fairly-indented portion of the negotiation logic.
Ben Straub 9d83d368 2013-10-30T07:21:36 cat-file.c example: deploy helpers, reorg
Ben Straub dbfd2833 2013-10-30T07:21:12 add.c: proper frontmatter
Carlos Martín Nieto 97d32abb 2013-10-30T15:09:32 Remove leftover function declaration
Carlos Martín Nieto a6154f21 2013-10-30T15:00:05 indexer: remove the stream infix It was there to keep it apart from the one which read in from a file on disk. This other indexer does not exist anymore, so there is no need for anything other than git_indexer to refer to it. While here, rename _add() function to _append() and _finalize() to _commit(). The former change is cosmetic, while the latter avoids talking about "finalizing", which OO languages use to mean something completely different.
Ben Straub 7cc3c9bf 2013-10-30T06:09:08 init.c example: deploy more helpers
Ben Straub e568bedf 2013-10-30T06:08:54 add.c example: deploy helpers, reorg
Vicent Marti 04e0c2b2 2013-10-30T14:00:44 pack-objects: Depth can be negative
Ben Straub a8422f92 2013-10-30T05:38:12 init example: deploy helpers, reorg
Russell Belfer 66902d47 2013-10-29T18:30:49 Extract common example helpers and reorg examples This reorganizes a few of the examples so that the main function comes first with the argument parsing extracted into a helper that can come at the end of the file (so the example focuses more on the use of libgit2 instead of command line support). This also creates a shared examples/common.[ch] so that useful helper funcs can be shared across examples instead of repeated.
Ben Straub 7dcb1c45 2013-10-28T11:21:23 Adjust for diff API changes
Ben Straub 42c8f8f8 2013-10-28T11:04:58 Merge remote-tracking branch 'libgit2/development' into blame
Vicent Martí 5c50f22a 2013-10-28T09:25:44 Merge pull request #1891 from libgit2/cmn/fix-thin-packs Add support for thin packs
Vicent Martí 064e6e81 2013-10-28T07:05:13 Merge pull request #1912 from ethomson/push_err_messages Test for failure, but don't test the error message
Vicent Martí 5565f3cd 2013-10-28T07:04:58 Merge pull request #1904 from libgit2/cmn/ssh-naming Rename the ssh credentials
Ben Straub 8f4a8b09 2013-10-28T06:20:28 Merge pull request #1802 from libgit2/cmn/reflog-backend Make reflog part of refdb
Ben Straub a7d28f40 2013-10-28T05:22:37 :heart: bool
Ben Straub 7f6db0ad 2013-10-28T05:19:30 Mmmm, GIT_FLEX_ARRAY
Ben Straub ba02079f 2013-10-28T05:01:33 Avoid temporary object in lookup routine
Vicent Martí a1efa596 2013-10-28T04:38:08 Merge pull request #1915 from zcbenz/common-h-before-config-h The "common.h" should be included before "config.h".
Cheng Zhao 157cef10 2013-10-28T12:57:15 The "common.h" should be included before "config.h". When building libgit2 for ia32 architecture on a x64 machine, including "config.h" without a "common.h" would result the following error: C:\Program Files\Microsoft SDKs\Windows\v7.1\include\winbase.h(2288): error C2373: 'InterlockedIncrement' : redefinition; different type modifiers [C:\cygwin\home\zcbenz\codes\git-utils\build\libgit2.vcxproj] C:\Program Files\Microsoft SDKs\Windows\v7.1\include\winbase.h(2295): error C2373: 'InterlockedDecrement' : redefinition; different type modifiers [C:\cygwin\home\zcbenz\codes\git-utils\build\libgit2.vcxproj] C:\Program Files\Microsoft SDKs\Windows\v7.1\include\winbase.h(2303): error C2373: 'InterlockedExchange' : redefinition; different type modifiers [C:\cygwin\home\zcbenz\codes\git-utils\build\libgit2.vcxproj] C:\Program Files\Microsoft SDKs\Windows\v7.1\include\winbase.h(2314): error C2373: 'InterlockedExchangeAdd' : redefinition; different type modifiers [C:\cygwin\home\zcbenz\codes\git-utils\build\libgit2.vcxproj]
Vicent Martí d4831b71 2013-10-26T04:34:23 Merge pull request #1913 from nvloff/remove_fedora_spec remove rpm spec file and readme
Nikolai Vladimirov dbc45b88 2013-10-26T09:13:29 remove rpm spec Fedora provides a rpm package for libgit2 - https://apps.fedoraproject.org/packages/libgit2.
Edward Thomson 9d41984c 2013-10-25T14:14:22 Test for failure, but don't test the error message
Vicent Martí 8607286b 2013-10-25T10:38:30 Merge pull request #1910 from ethomson/disable_winhttp Allow -DWINHTTP=OFF to disable WinHTTP
Vicent Martí 8f2fe55e 2013-10-25T10:37:37 Merge pull request #1911 from ethomson/http_headers Use two calls to set two headers
Edward Thomson df9fc82e 2013-10-25T13:33:42 Use two calls to set two headers
Edward Thomson 1bfe7133 2013-10-25T13:23:46 Allow -DWINHTTP=OFF to disable WinHTTP
Vicent Martí fd5d80d2 2013-10-24T07:45:54 Merge pull request #1907 from nikai3d/patch-1 fix typos in README.md
Nicolas Kaiser 63d1fad4 2013-10-24T15:30:31 fix typos in README.md
Carlos Martín Nieto 474c8cf8 2013-10-23T22:49:52 Really fix the pc file It turns out that variables have function scope by default. Let's really set -liconv and add a few libraries that were forgotten in the previous commit. We also need to special-case OSX, as they ship zlib but do not provide a pkg-config file for it.
Vicent Martí 3fcb1d83 2013-10-23T08:18:56 Merge pull request #1905 from libgit2/cmn/list-deps Be explicit about dependencies
Vicent Martí 9a5f2118 2013-10-23T08:17:56 Merge pull request #1906 from libgit2/cmn/net-cb-errors transport: let the progress output return an error
Carlos Martín Nieto 5cb13670 2013-10-23T15:45:29 transport: let the progress output return an error There are any number of issues that can come up in the progress callback, and we should let the user cancel at that point as well.
Carlos Martín Nieto ab46b1d8 2013-10-23T15:08:18 indexer: include the delta stats The user is unable to derive the number of deltas in the pack, as that would require them to capture the stats exactly in the moment between download and final processing, which is abstracted away in the fetch. Capture these numbers for the user and expose them in the progress struct. The clone and fetch examples now also present this information to the user.
Carlos Martín Nieto ebbd48f0 2013-10-23T14:22:44 examples: show used local objects in fetch Show how many local objects were used to fix the thin pack in our fetch example.
Carlos Martín Nieto 2baee9f8 2013-10-23T13:17:51 README: add a note about the optional dependencies
Carlos Martín Nieto 1ecda61e 2013-10-23T12:58:56 Set the correct dependencies in the pkg-config file When linking statically, the including project needs to know what the current library build depends on so they can link to it. Store this information in the pkg-config file. While here, remove claims that users need to link to zlib or libcrypto.
Carlos Martín Nieto 70a8c78f 2013-10-23T12:08:54 Rename the ssh credentials The names from libssh2 are somewhat obtuse for us. We can simplify the usual key/passphrase credential's name, as well as make clearer what the custom signature function is.
Vicent Martí 1c74686e 2013-10-22T11:55:54 Merge pull request #1897 from libgit2/split-patch-from-diff RFC: Proposed reworking of diff APIs
Russell Belfer 7ce60099 2013-10-22T11:12:44 Fix typo
Vicent Marti 98fec8a9 2013-10-22T16:05:47 Implement `git_odb_object_dup`
Russell Belfer 5de4ec81 2013-10-21T15:36:38 Implement patience and minimal diff flags It seems that to implement these options, we just have to pass the appropriate flags through to the libxdiff code taken from core git. So let's do it (and add a test).
Russell Belfer 623460ab 2013-10-21T14:16:53 Fix warnings for win64
Russell Belfer 3b5f7954 2013-10-21T13:42:42 Create git_diff_line and extend git_diff_hunk Instead of having functions with so very many parameters to pass hunk and line data, this takes the existing git_diff_hunk struct and extends it with more hunk data, plus adds a git_diff_line. Those structs are used to pass back hunk and line data instead of the old APIs that took tons of parameters. Some work that was previously only being done for git_diff_patch creation (scanning the diff content for exact line counts) is now done for all callbacks, but the performance difference should not be noticable.