Log

Author Commit Date CI Message
Carlos Martín Nieto 83504371 2014-03-19T22:27:23 reflog: follow core.logallrefupdates On bare by default, or when core.logallrefupdates is false, we must not write the reflog.
Vicent Marti f29e4899 2014-03-19T19:51:57 Merge pull request #2193 from libgit2/cmn/reflog-HEAD Reflog all the way
Carlos Martín Nieto 99797c96 2014-03-19T18:14:35 reflog: handle symref chains Given HEAD -> master -> foo, when updating foo's reflog we should also update HEAD's, as it's considered the current branch.
Carlos Martín Nieto 6aaae94a 2014-03-19T16:30:37 reflog: handle the birth of a branch The reflog append function was overzealous in its checking. When passed an old and new ids, it should not do any checking, but just serialize the data to a reflog entry.
Carlos Martín Nieto afc57eb4 2014-03-19T06:59:09 reflog: simplify the append logic Remove some duplicated logic.
Carlos Martín Nieto 1afe1400 2014-03-18T22:16:58 refdb: don't update when there's no need If the caller wants to update a ref to point to the same target as it currently has, we should return early and avoid writing to the reflog.
Carlos Martín Nieto bac95e6e 2014-03-18T19:41:03 reflog: more comprehensive HEAD tests The existing ones lack checking zeroed ids when switching back from an unborn branch as well as what happens when detaching. The reflog appending function mistakenly wrote zeros when dealing with a detached HEAD. This explicitly checks for those situations and fixes them.
Vicent Marti 5dd7d243 2014-03-18T16:23:51 Merge pull request #2189 from Aimeast/octopus Implement git_merge_base_octopus
Aimeast 0aee025b 2014-03-18T22:31:14 Implement git_merge_base_octopus
Vicent Marti dd4c6962 2014-03-18T15:25:43 Merge pull request #2192 from phkelley/development Seamless support for NTLM/Kerberos auth on Windows
Philip Kelley 1392418e 2014-03-18T09:04:33 Seamless support for NTLM/Kerberos auth on Windows
Vicent Marti a7af1f7d 2014-03-18T14:46:42 Merge pull request #2190 from libgit2/cmn/current-branch-reflog refs: append to the HEAD reflog when updating the current branch
Russell Belfer dd5e74e5 2014-03-17T15:57:25 Merge pull request #2191 from libgit2/cmn/projects Add a few projects to the list
Carlos Martín Nieto 5c8096c5 2014-03-17T19:44:07 Add a few projects to the list
Carlos Martín Nieto cb562c3f 2014-03-17T17:36:51 repo: remove test which deletes HEAD This is not something anybody would ever do; removing HEAD makes the .git/ directory no longer be a repository, so we wouldn't be expected to handle such a situation.
Carlos Martín Nieto 4b7e1b9e 2014-01-15T13:19:48 refs: append to the HEAD reflog when updating the current branch When we update the current branch, we must also append to HEAD's reflog to keep them in sync. This is a bit of a hack, but as git.git says, it covers 100% of default cases.
Carlos Martín Nieto 853b1407 2014-03-17T16:10:33 branch: constness fixes
Carlos Martín Nieto 2b40390f 2014-03-13T15:54:53 refs: fix copy-paste doc error
Edward Thomson e59e712f 2014-03-12T12:05:35 Merge pull request #2184 from libgit2/rb/fix-revwalk-order-regression Fix pqueue sort boundary condition bug
Russell Belfer 5302a885 2014-03-12T11:21:55 Fix pqueue sort boundary condition bug If the pqueue comparison fn returned just 0 or 1 (think "a<b") then the sort order of returned items could be wrong because there was a "< 0" that really needed to be "<= 0". Yikes!!!
Carlos Martín Nieto 9af14886 2014-03-10T18:20:47 MSVC is silly
Vicent Marti fc78488b 2014-03-10T18:16:56 Merge pull request #2175 from Yogu/submodule-resolve-url Add git_submodule_resolve_url()
Jan Melcher 52fba18f 2014-03-10T18:16:10 Add git_submodule_resolve_url()
Paul Betts 4a8692f6 2014-03-09T21:07:18 Merge pull request #2177 from shiftkey/typo-fix corrected typo in error message
Brendan Forster 0782c89e 2014-03-10T14:40:07 corrected typo in error message
Vicent Marti 6de018bb 2014-03-07T20:00:20 Merge pull request #2170 from ethomson/clar Update clar to e1990d6
Edward Thomson dd954a37 2014-03-07T10:53:00 Update clar to e1990d6
Vicent Marti 041cd4a2 2014-03-07T19:02:58 Merge pull request #2028 from libgit2/options-names Rename options structures
Russell Belfer 5a6de908 2014-03-07T09:13:43 Merge pull request #2153 from mekishizufu/tag_example Add a tag example
Vicent Marti 628edd6b 2014-03-07T16:26:58 Merge pull request #2167 from mekishizufu/memory_access_fixes Fun with memory access
Vicent Marti 0d95f6ec 2014-03-07T16:26:51 Merge pull request #2169 from libgit2/valgrind Plug leaks
Carlos Martín Nieto ae32c54e 2014-03-05T20:28:49 Plug a few leaks in the tests
Carlos Martín Nieto a07b1698 2014-03-07T15:40:53 branch: fix leak when checking against HEAD We look up a reference in order to figure out if it's the current branch, which we need to free once we're done with the check. As a bonus, only perform the check when we're passed the force flag, as it's a useless check otherwise.
Carlos Martín Nieto 7c1ee212 2014-03-07T15:17:08 commit: simplify and correct refcounting in nth_gen_ancestor We can make use of git_object_dup to use refcounting instead of pointer comparison to make sure we don't free the caller's object. This also lets us simplify the case for '~0' which is now just an assignment instead of looking up the object we have at hand.
Carlos Martín Nieto 5187b609 2014-03-07T14:58:43 local transport: catch double-opens Combinations of connect + fetch can call local_open multiple times. Detect this and skip the initialization stage.
Jiri Pospisil 79aa0302 2014-03-06T22:23:57 blame: Fix compare function's data types Previously the hunk_byfinalline_search_cmp function was called with different data types (size_t and uint32_t) for the key argument but expected only the former resulting in an invalid memory access when passed the latter on a 64 bit machine. The following patch makes sure that the function is called and works with the same type (size_t).
Jiri Pospisil 00258cc0 2014-03-06T22:10:17 git_oid_fromstrn: Simplify the implementation and fix memory access issues
Vicent Marti c81e4adf 2014-03-07T14:00:59 Merge pull request #2168 from ethomson/clar Update clar to a0b00f0
Edward Thomson 806571f3 2014-03-07T00:28:18 Update clar to a0b00f0
Ben Straub aa17c3c6 2014-01-03T17:42:09 git_revert_opts -> git_revert_options
Ben Straub 6affd71f 2014-01-03T17:38:34 git_checkout_opts -> git_checkout_options
Carlos Martín Nieto 8e524720 2014-03-06T16:40:34 tests: MSVC compat MSVC doesn't like declaring variables in the middle of a block, so make sure we only declare variables at the beginning of a block.
Vicent Marti 4a759bfb 2014-03-06T16:08:36 Merge pull request #2165 from libgit2/revert-1997 Revert pull request #1997
Vicent Marti 2ab6d2cd 2014-03-06T16:08:17 Revert pull request #1997
Vicent Marti 4d116c34 2014-03-06T16:08:12 Merge pull request #1997 from mgbowen/merge-options-init-fix Fix GIT_MERGE_OPTS_INIT on MSVC.
Vicent Marti efc822ef 2014-03-06T13:14:15 Merge pull request #2014 from mgbowen/cpp-options-init Function-based options initializers
Ben Straub a5139485 2014-03-05T19:50:23 Merge pull request #2162 from sunheehnus/dev examples/diff:Add the shortstat flag to examples/diff.c
Sun He 6246de93 2014-03-06T11:16:36 Merge completed: resolve the conflict with the upstream
Matthew Bowen b9f81997 2014-03-05T21:49:23 Added function-based initializers for every options struct. The basic structure of each function is courtesy of arrbee.
Vicent Marti a064dc2d 2014-03-06T00:47:05 Merge pull request #2159 from libgit2/rb/odb-exists-prefix Add ODB API to check for existence by prefix and object id shortener
Russell Belfer 26875825 2014-03-05T13:06:22 Check short OID len in odb, not in backends
Vicent Marti a62ad3c3 2014-03-05T21:07:20 Merge pull request #2164 from libgit2/cmn/refs-delete-iteration refdb: catch a directory disappearing
Vicent Marti 967d3f2e 2014-03-05T21:06:59 Merge pull request #2163 from ethomson/nobackend_odb_write ODB writing fails gracefully when unsupported
Carlos Martín Nieto a213a7bf 2014-03-05T20:32:53 refdb: catch a directory disappearing If a directory disappears between the time we look up the entries of its parent and the time when we go to look at it, we should ignore the error and move forward. This fixes #2046.
Edward Thomson 7bd2f401 2014-03-05T11:35:47 ODB writing fails gracefully when unsupported If no ODB backends support writing, we should fail gracefully.
Jiri Pospisil feebe615 2014-03-05T20:26:13 Move all variable declarations to the top of the block
Jiri Pospisil a53b8584 2014-03-03T23:56:43 Add tag example
Jiri Pospisil 4ae4a9bb 2014-03-03T23:36:34 Fix typo
Sun He 8384a50a 2014-03-05T20:33:20 fix the output format of diff
Sun He 45d2e8dc 2014-03-05T20:13:34 Add the --shortstat flag to examples/diff.c
Vicent Marti 68581754 2014-03-05T11:42:50 Merge pull request #2160 from modocache/examples-diff-add-patience-and-minimal examples/diff: Add minimal, patience diff options.
Vicent Marti d2b7841d 2014-03-05T11:37:08 Merge pull request #2161 from softwarenerd/softwarenerd Fixed missing error check on call to git_remote_download
Brian Lambert 06a8f5c3 2014-03-05T00:00:41 Fixed missing error check on call to git_remote_download in git_remote_fetch. Moved error check to statement following git_remote_disconnect so that the disconnect happens regardless of the result of the download call.
Brian Gesiak 0d3c8a9d 2014-03-05T13:06:31 examples/diff: Add minimal, patience diff options. - Add minimal, patience diff options to diff example. libgit2 `diff_xdiff.git_xdiff_init` already supports these flags, so no additional change is necessary. - Remove minimal and patience flag addition from project list.
Russell Belfer 13f7ecd7 2014-03-04T16:23:28 Add git_object_short_id API to get short id string This finds a short id string that will unambiguously select the given object, starting with the core.abbrev length (usually 7) and growing until it is no longer ambiguous.
Russell Belfer f5753999 2014-03-04T15:34:23 Add exists_prefix to ODB backend and ODB API
Vicent Marti 66d9e046 2014-03-04T21:01:39 Merge pull request #2157 from libgit2/cmn/write-object-mem pack-objects: free memory safely
Carlos Martín Nieto a14aa1e7 2014-03-04T20:09:17 pack-objects: free memory safely A few fixes have accumulated in this area which have made the freeing of data a bit muddy. Make sure to free the data only when needed and once. When we are going to write a delta to the packfile, we need to free the data, otherwise leave it. The current version of the code mixes up the checks for po->data and po->delta_data.
Russell Belfer 0a62caf4 2014-03-04T10:21:41 Merge pull request #2155 from jacquesg/stash-save-remove-ignored Remove ignored files from the working directory if they were stashed
Jacques Germishuys 4636ca93 2014-03-04T12:22:27 Remove ignored files from the working directory if they were stashed
Vicent Marti c2e83745 2014-03-03T17:48:32 Merge pull request #2148 from fourplusone/patch-1 Added a test, that fails for #2133
Matthias Bartelmeß d113791d 2014-03-01T16:53:47 Added a test, that fails for #2133
Vicent Marti 0511b15c 2014-03-03T15:05:26 Merge pull request #2141 from ravselj/development BUGFIX - Fetching twice from the same remote causes a segfault
Miha Ravšelj b43f35fd 2014-03-03T14:59:50 - examples CMakeLists.txt reverted to previous state
Vicent Marti bb3687c5 2014-03-03T13:12:27 Merge pull request #2151 from arthurschreiber/patch-3 Fix the description for `GIT_FEATURE_SSH`.
Arthur Schreiber 96484ecd 2014-03-03T12:59:35 Fix the description for `GIT_FEATURE_SSH`.
Vicent Marti f34b9a59 2014-03-03T12:45:46 Merge pull request #2150 from libgit2/vmg/features caps: Rename to features to avoid confusion
Vicent Marti ebb3c506 2014-03-03T12:40:25 features: Rename `_HAS_` to `_FEATURE_`
Vicent Marti 2491c416 2014-03-03T12:13:17 caps: Rename the enum name too!
Vicent Marti c9f5298b 2014-03-03T12:09:17 caps: Rename to features to avoid confusion
Miha 6874cafd 2014-03-03T12:08:17 cmake examples change so that general.c is off by default
Miha 058956ce 2014-03-03T11:47:06 - CMakeLists.txt small fix
Miha 0330469f 2014-03-03T11:42:25 - general.c reverted to original( before pr state )
Miha b5212858 2014-03-03T11:40:22 Merge remote-tracking branch 'remotes/upstream/development' into development
Ben Straub 494be429 2014-03-02T09:00:00 Merge pull request #2144 from linquize/branch-f-current Do not allow git_branch_create() to force update branch
Linquize 1d08b72e 2014-03-02T19:14:20 Add unit test to show git_branch_create() fails if attempt to force create current branch
Vicent Marti 9776cb84 2014-03-01T18:06:49 Merge pull request #2143 from libgit2/rb/projects Add project list and update readme
Vicent Marti 06d41826 2014-02-28T09:40:17 Merge pull request #2146 from libgit2/rb/diff-b2b Add git_diff_buffers and git_patch_from_buffers
Russell Belfer 6789b7a7 2014-02-27T14:13:22 Add buffer to buffer diff and patch APIs This adds `git_diff_buffers` and `git_patch_from_buffers`. This also includes a bunch of internal refactoring to increase the shared code between these functions and the blob-to-blob and blob-to-buffer APIs, as well as some higher level assert helpers in the tests to also remove redundancy.
Russell Belfer d8839992 2014-02-27T14:01:16 Fix warnings and code style issues
Linquize 59b1dbcd 2014-02-27T23:56:25 Do not allow git_branch_create() to force update branch
Russell Belfer 486bc366 2014-02-26T16:37:08 Add project list and update readme
Ben Straub 1574d388 2014-02-26T16:58:20 Merge pull request #2137 from jru/blame-first-parent Blame first-parent history
Vicent Marti 6b34a4ed 2014-02-26T22:50:51 Merge pull request #2142 from ethomson/ignore_authors Remove "ignore" state from the git.git-authors
Edward Thomson f2abb725 2014-02-26T12:39:48 Remove "ignore" state from the git.git-authors
Juan Rubén 0276f0f5 2014-02-26T19:22:19 Reset num_parents to 1 only for merge commits Also, correct test case to account for the boundary flag
Miha 3536c168 2014-02-25T14:57:47 - need_pack was not set to 0 when local fetch was already present causing negotiate_fetch access violation
Miha 300f4412 2014-02-25T11:56:11 - BUGFIX #2133 (@fourplusone) in smart_protocol.c - added MSVC cmake definitions to disable warnings - general.c is rewritten so it is ansi-c compatible and compiles ok on microsoft windows - some MSVC reported warning fixes
Vicent Marti cb81c3a7 2014-02-25T10:46:41 Merge pull request #2138 from ethomson/sysdir Move system directory cache out of utils
Vicent Marti 1c8b339d 2014-02-25T10:43:04 Merge pull request #2139 from ethomson/va_copy_warning Include stdarg.h for the va_copy test