Log

Author Commit Date CI Message
Edward Thomson 93b96ea7 2014-01-26T06:38:02 Merge pull request #2076 from xtao/fix-zstream Fix write_object.
Edward Thomson 58582cd0 2014-01-26T06:31:38 Merge pull request #2057 from GrahamDennis/local-file-url-push-fix Fix local push to file:// URL.
XTao 1cb5a811 2014-01-26T17:07:39 Fix write_object.
Vicent Marti ca55fc63 2014-01-23T08:03:29 Merge pull request #2074 from linquize/pack-filename-sha1 Drop parsing pack filename SHA1 part
Linquize 8610487c 2014-01-23T23:28:28 Drop parsing pack filename SHA1 part, no one cares the filename
Vicent Marti ac8949ed 2014-01-22T15:41:25 Merge pull request #2073 from ethomson/zerobytes Sometimes a zero byte file is just a zero byte file
Edward Thomson 410a8e6f 2014-01-22T18:31:25 Sometimes a zero byte file is just a zero byte file Don't go to the ODB to resolve zero byte files in the workdir
Ben Straub ab4bcc03 2014-01-22T14:14:37 Plug a small memory leak
Vicent Marti e82b6d13 2014-01-22T11:50:43 Merge pull request #2072 from ethomson/commit_summary Summarize empty messages
Edward Thomson 238e8149 2014-01-22T14:41:04 Summarize empty messages
Vicent Marti 2b678ce5 2014-01-22T10:34:25 Merge pull request #2070 from ethomson/checkout_filemode Preserve tree filemode in index during checkout
Edward Thomson e8b81c69 2014-01-22T13:24:32 Preserve tree filemode in index during checkout Don't try to determine whether the system supports file modes when putting the tree data in the index during checkout. The tree's mode is canonical and did not come from stat(2) in the first place.
Vicent Marti ec088fec 2014-01-22T09:35:25 Merge pull request #2069 from isilkor/patch_to_buf Expose patch serialization to git_buf
Nicolas Hake c05cd792 2014-01-22T17:51:32 Drop git_patch_to_str It's hard or even impossible to correctly free the string buffer allocated by git_patch_to_str in some circumstances. Drop the function so people have to use git_patch_to_buf instead - git_buf has a dedicated destructor.
Nicolas Hake 450e8e9e 2014-01-22T13:22:15 Expose patch serialization to git_buf Returning library-allocated strings from libgit2 works fine on Linux, but may cause problems on Windows because there is no one C Runtime that everything links against. With libgit2 not exposing its own allocator, freeing the string is a gamble. git_patch_to_str already serializes to a buffer, then returns the underlying memory. Expose the functionality directly, so callers can use the git_buf_free function to free the memory later.
Vicent Marti af2b969b 2014-01-20T16:26:04 Merge pull request #2061 from ethomson/merge_improvements Merge improvements
Edward Thomson 0ef19fe1 2014-01-20T17:13:55 Merge submodules
Edward Thomson db3462ce 2014-01-19T22:36:50 Support union merges
Edward Thomson 0e1ba46c 2014-01-19T20:03:13 Remove the "merge none" flag The "merge none" (don't automerge) flag was only to aide in merge trivial tests. We can easily determine whether merge trivial resulted in a trivial merge or an automerge by examining the REUC after automerge has completed.
Edward Thomson 6891a862 2014-01-19T18:12:22 Load merge.conflictstyle setting from config
Edward Thomson e651e8e2 2014-01-19T15:05:08 Introduce diff3 mode for checking out conflicts
Edward Thomson 6b92c99b 2014-01-19T01:20:25 Don't try to merge binary files
Edward Thomson c1d648c5 2014-01-08T18:29:42 merge_file should use more aggressive levels The default merge_file level was XDL_MERGE_MINIMAL, which will produce conflicts where there should not be in the case where both sides were changed identically. Change the defaults to be more aggressive (XDL_MERGE_ZEALOUS) which will more aggressively compress non-conflicts. This matches git.git's defaults. Increase testing around reverting a previously reverted commit to illustrate this problem.
Vicent Marti e49c98e6 2014-01-20T14:12:41 Merge pull request #2065 from ethomson/submodule_unmodified "Uninitialized" submodules are "unmodified"
Edward Thomson b554ca5d 2014-01-20T15:12:06 "Uninitialized" submodules are "unmodified" Extend the "unmodified" submodule workdir test to include uninitialized submodules, to prevent reporting submodules as modified when they're not in the workdir at all.
Russell Belfer d62bf0bf 2014-01-20T10:15:05 Merge pull request #2063 from linquize/reflog-msg-null git_reflog_entry_message can be null
Russell Belfer fb62dc90 2014-01-20T10:04:20 Merge pull request #2064 from piki/piki/buffer-corner-cases Fix a couple of corner cases and an undefined behavior
Patrick Reynolds abdaf936 2014-01-20T11:42:12 add unit tests for git_buf_join corner cases
Patrick Reynolds 7cbc6241 2014-01-20T11:41:21 fix corner cases and an undefined behavior
Linquize e7c66fc8 2014-01-20T23:32:18 git_reflog_entry_message can be null
Graham Dennis 8bf476ac 2014-01-19T16:24:58 Factor out code to convert local "url" into a path. Previously this code was shared between `local_push` and `local_connect`.
Edward Thomson b97e55f2 2014-01-18T14:48:59 Merge pull request #2059 from linquize/git_config_get_crash Fix segfault when calling git_config_get_* functions when a config fails to load
Linquize c24130e0 2014-01-18T22:58:31 Fix segfault when calling git_config_get_* functions when a config fails to load Reinitialize the result code of get_entry() to GIT_ENOTFOUND
Edward Thomson fed98153 2014-01-17T14:00:48 Merge pull request #2058 from libgit2/rb/gitdir-windows-paths Convert gitdir paths to posix on Windows
Graham Dennis c7015424 2014-01-18T08:54:19 Fix a compile warning.
Russell Belfer 6b415f62 2014-01-17T13:46:44 Convert gitdir paths to posix on Windows Apparently, a .git file with "gitdir: path" link on Windows is allowed to use backslashes in the path. Who knew?
Graham Dennis 194d077c 2014-01-18T08:43:29 Add test for pushing to a local file:// URL.
Graham Dennis 4e974c97 2014-01-18T08:02:58 Fix local push to file:// URL.
Vicent Marti b6815fe0 2014-01-16T13:21:20 Merge pull request #2055 from arthurschreiber/patch-3 Fix some documentation issues.
Arthur Schreiber 3f033c55 2014-01-16T21:53:25 Revert a wrong doc change.
Arthur Schreiber 3f0e3e16 2014-01-16T21:42:28 Fix some documentation issues.
Ben Straub c85d606e 2014-01-16T11:36:06 Merge pull request #2044 from libgit2/coverity Run Coverity scan on Travis
Ben Straub ba6464b3 2014-01-15T14:05:04 Merge pull request #2053 from ethomson/bindings Update README to include Java, PowerShell bindings
Edward Thomson 4ef9a508 2014-01-15T13:58:11 Update README to include Java, PowerShell bindings
Ben Straub 998f0016 2014-01-15T12:32:12 Refine build limitation
Ben Straub 53e6f480 2014-01-15T12:12:17 Only run coverity on development
Vicent Marti f04c7dca 2014-01-15T11:54:10 Merge pull request #2050 from libgit2/cmn/always-reflog-message refs: remove the _with_log differentiation
Carlos Martín Nieto 0b28217b 2014-01-15T12:51:31 refs: remove the _with_log differentiation Any well-behaved program should write a descriptive message to the reflog whenever it updates a reference. Let's make this more prominent by removing the version without the reflog parameters.
Vicent Marti dec1ac75 2014-01-15T03:17:26 Merge pull request #2049 from ethomson/common Common
Edward Thomson e85bbd52 2014-01-14T14:41:49 Move libgit2 settings out of util
Edward Thomson 39c2302a 2014-01-14T11:19:57 unnecessary include
Vicent Marti 3c1b3ded 2014-01-14T12:41:01 Merge pull request #2047 from arthurschreiber/arthur/fix-dup-functions Align `*_dup` functions
Vicent Marti 30aebe63 2014-01-14T12:40:30 Merge pull request #2048 from arthurschreiber/arthur/add-git_remote_dup Implement @cmn's suggestions for `git_remote_dup`.
Arthur Schreiber 529f342a 2014-01-14T21:33:59 Align git_tree_entry_dup.
Arthur Schreiber 29be3a6d 2014-01-14T21:33:35 Align git_signature_dup. This changes git_signature_dup to actually honor oom conditions raised by the call to git__strdup. It also aligns it with the error code return pattern used everywhere else.
Arthur Schreiber 99dcb218 2014-01-14T21:08:20 We don't need memset here.
Arthur Schreiber 616cd137 2014-01-14T21:08:09 Don't duplicate state that's only used when fetching.
Vicent Marti 76c00ead 2014-01-14T12:03:52 Merge pull request #2045 from arthurschreiber/arthur/add-git_remote_dup Add `git_remote_dup`.
Arthur Schreiber 40ef47dd 2014-01-14T21:03:01 Add `git_remote_dup`.
Vicent Marti 557bd1f4 2014-01-14T10:27:57 Merge pull request #2043 from arthurschreiber/arthur/fix-memory-leaks Fix a bunch of memory leaks.
Vicent Marti 0d5d0ea8 2014-01-14T10:27:42 Merge pull request #2004 from ethomson/pack_stream Stream packs to the destination
Arthur Schreiber 24953757 2014-01-14T19:08:58 Incorporate @arrbee's suggestions.
Edward Thomson 52a8a130 2014-01-06T16:41:12 Packbuilder contains its own zstream
Edward Thomson 0ade2f7a 2013-12-14T10:37:57 Packbuilder stream deflate instead of one-shot
Edward Thomson c6f26b48 2013-12-13T18:26:46 Refactor zlib for easier deflate streaming
Ben Straub 4caf0df0 2014-01-13T15:43:29 Add coverity scan badge to readme
Ben Straub f1c16d0e 2014-01-13T15:18:13 Tweak travis secure config
Arthur Schreiber ac44b3d2 2014-01-13T23:28:03 Incorporate @ethomson's suggestions.
Ben Straub 9bf17d2c 2014-01-13T14:11:14 Add coverity-scan script
Arthur Schreiber b0b32b43 2014-01-13T22:51:10 Fix a double free issue in `git_blame__alloc`. `git_blame_free` already calls `git__free` on `gbr`.
Arthur Schreiber ddf1b1ff 2014-01-13T22:33:10 Fix a memory leak in `hash_and_save` and `inject_object`.
Arthur Schreiber a8e4cb11 2014-01-13T22:12:17 Fix a memory leak in `config_parse`.
Arthur Schreiber 1234738e 2014-01-13T22:12:02 Fix a memory leak in `git_config_iterator_glob_new`.
Arthur Schreiber 63170bca 2014-01-13T17:51:08 Fix a memory leak in `git_pathspec__vinit`.
Vicent Marti be29dd82 2014-01-13T06:09:51 Merge pull request #2040 from scunz/cmake_msgs Show informational messages during cmake run as informational
Vicent Marti 9dcd8cee 2014-01-13T06:09:34 Merge pull request #2039 from brodie/brodie/handle-null-on-free Fix places in public free() functions where NULL pointers aren't handled
Sascha Cunz 86f92b74 2014-01-13T12:49:54 Show informational messages during cmake run as informational
Brodie Rao 2fcc0d07 2014-01-12T23:32:10 util: handle NULL pointers passed to git_strarray_free() Signed-off-by: Brodie Rao <brodie@sf.io>
Brodie Rao 2ad45213 2014-01-12T23:31:57 refs: handle NULL pointers passed to git_reference_iterator_free() Signed-off-by: Brodie Rao <brodie@sf.io>
Brodie Rao 32b7e84e 2014-01-12T23:31:35 oid: handle NULL pointers passed to git_oid_shorten_free() Signed-off-by: Brodie Rao <brodie@sf.io>
Brodie Rao ae3b6d61 2014-01-12T23:31:13 odb: handle NULL pointers passed to git_odb_stream_free Signed-off-by: Brodie Rao <brodie@sf.io>
Brodie Rao e3c6a1bf 2014-01-12T23:30:06 config: handle NULL pointers passed to git_config_iterator_free() Signed-off-by: Brodie Rao <brodie@sf.io>
Brodie Rao 9eb45fc5 2014-01-12T23:29:44 branch: handle NULL pointers passed to git_branch_iterator_free() Signed-off-by: Brodie Rao <brodie@sf.io>
Ben Straub 426d8456 2014-01-08T19:43:31 Merge pull request #2033 from xtao/blame_orig_commit Add orig_commit.
XTao b92b434f 2014-01-09T11:18:38 Add orig & final commit test.
Vicent Marti cc3d961b 2014-01-08T12:48:47 Merge pull request #2036 from ethomson/git_buf_sanitize Handle git_buf's from users more liberally
Edward Thomson 6adcaab7 2014-01-08T10:07:30 Handle git_buf's from users more liberally
Vicent Marti 32309b5d 2014-01-08T04:09:09 Merge pull request #2034 from jacquesg/solaris-qsort Solaris doesn't have qsort_r either
Jacques Germishuys 551f5cef 2014-01-08T13:47:47 Solaris does not have qsort_r
XTao a06474f8 2014-01-08T11:19:12 Add orig_commit.
Vicent Marti fe959e52 2014-01-07T09:58:05 Merge pull request #2023 from arthurschreiber/patch-1 Add missing `git_reference_symbolic_create_with_log`.
nulltoken 5ce9f9b4 2014-01-04T15:22:20 Merge pull request #2030 from seejohnrun/patch-1 Fix spelling mistake
John Crepezzi e7f89b46 2014-01-04T18:18:59 Fix spelling mistake Closes #2029
Russell Belfer ac9f9231 2014-01-03T14:40:25 Merge pull request #2022 from KTXSoftware/development submodule branch option + little VS2013 fix
Vicent Marti 5f5e4465 2014-01-03T13:01:14 Merge pull request #2026 from libgit2/rb/fix-strnlen-on-old-macos Use our strnlen on MacOS for backward compat
Russell Belfer b4998521 2014-01-03T11:37:23 Use our strnlen on MacOS for backward compat Apparently MacOS didn't have strnlen on 10.6 and earlier. To avoid having linking problems on older versions, we'll just use our internal version.
Russell Belfer 91524172 2014-01-02T14:30:24 Fix warnings with submodule changes
Arthur Schreiber 0b795178 2014-01-02T16:58:13 Allow the log message to be NULL.
Arthur Schreiber e5994eb0 2014-01-02T16:56:09 Add missing `git_reference_symbolic_create_with_log`. It's exported in the headers, but the implementation was missing.
Robert Konrad 10311979 2014-01-02T03:14:03 Read the submodule branch option from Git 1.8.2.