Log

Author Commit Date CI Message
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.
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
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.
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
Edward Thomson 4f46a98b 2014-02-24T23:32:25 Remove now-duplicated stdarg.h include
Edward Thomson ab0af298 2014-02-24T21:56:08 Include stdarg.h for the va_copy test
Edward Thomson 83634d38 2014-02-24T17:43:10 Move system directory cache out of utils
Vicent Marti 98b93662 2014-02-24T23:01:01 Merge pull request #2134 from libgit2/ben/icc Fix Intel compiler warnings
Ben Straub c8893d1f 2014-02-24T13:39:04 Use a portable cast
Juan Rubén 899bd19a 2014-02-24T21:20:57 Document enumerator and rewording
Ben Straub b1f2c2e2 2014-02-22T10:18:42 Prevent icc warning
Ben Straub 8ac7da79 2014-02-22T10:15:11 Avoid casting warning
Ben Straub 0d8265c8 2014-02-22T09:25:41 Staticize file-local variables
Vicent Marti f3e44dd6 2014-02-24T11:02:42 Merge pull request #2132 from ethomson/merge_doc Improve documentation for merging
Juan Rubén 9e3b901a 2014-02-24T00:09:29 Add unit test
Juan Rubén c7c83394 2014-02-21T00:22:07 Add option to limit blame to first parent
Russell Belfer 5af69ee9 2014-02-21T10:06:11 Merge pull request #2130 from worblehat/development Check if librt exists independent of OS, to be able to exclude librt on ...
Edward Thomson c254e2b6 2014-02-21T08:55:30 Improve documentation for merging
Vicent Marti f83ef562 2014-02-21T01:33:47 Merge pull request #2129 from arrbee/rb/c89-or-c99 Improve C89 compatibility and clarify use of C99 features
Tobias Marquardt 5bda607c 2014-02-21T01:09:44 Check if librt exists independent of OS, to be able to exclude librt on Android builds, even though it is a 'Linux'.
Russell Belfer 72556cc6 2014-02-20T14:27:10 Address PR comments * Make GIT_INLINE an internal definition so it cannot be used in public headers * Fix language in CONTRIBUTING * Make index caps API use signed instead of unsigned values
Russell Belfer 68a19ca9 2014-02-20T11:26:51 Clarify C compatibility policy and a couple of other minor doc fixups.
Russell Belfer 978a4ed5 2014-02-20T11:00:31 Make git_oid_equal a non-inline API
Vicent Marti 2dc49ea9 2014-02-19T00:21:38 Merge pull request #2124 from libgit2/better-shallow-errors Improve error propagation in shallow call
Ben Straub 864535cf 2014-02-18T14:07:42 Readability
Ben Straub 9bda5fb8 2014-02-18T14:05:30 Improve error propagation in shallow call
Vicent Marti e0ebaaa5 2014-02-18T18:48:43 Merge pull request #2121 from bk2204/ewouldblock Check for EWOULDBLOCK as well as EAGAIN on write.
brian m. carlson 0197d410 2014-02-15T23:09:01 Check for EWOULDBLOCK as well as EAGAIN on write. On some systems, notably HP PA-RISC systems running Linux or HP-UX, EWOULDBLOCK and EAGAIN are not the same value. POSIX (and these OSes) allow EWOULDBLOCK to occur on write(2) (and send(2), etc.), so check explicitly for this case as well as EAGAIN by defining and using a macro GIT_ISBLOCKED that considers both. The macro is necessary because MSYS does not provide EWOULDBLOCK and compilation fails if an attempt is made to use it unconditionally. On most systems, where the two values are the same, the compiler will simply optimize this check out and it will have no effect.
Edward Thomson dbd2ca35 2014-02-11T17:27:30 Merge pull request #2115 from ethomson/crlf_redux Fix filter test for CRLF->LF issues
Edward Thomson 2a528bc0 2014-02-11T19:05:13 Fix filter test for CRLF->LF issues
Vicent Marti 90dd2864 2014-02-12T01:55:25 Merge pull request #2114 from ethomson/crlf_redux Never convert CRLF->LF
Edward Thomson b033f3a3 2014-02-11T16:52:08 Never convert CRLF->LF Core git performs no conversion on systems that use LF, emulate that.
Russell Belfer 5d195cf7 2014-02-11T15:56:04 Merge pull request #2110 from libgit2/ed/crlf_input Handle `core.autocrlf=input` when checking out
Russell Belfer b362fbf3 2014-02-10T10:01:36 Merge pull request #2111 from libgit2/cmn/cond-fixups Conditional ref update fixups
Carlos Martín Nieto 15284a2c 2014-02-10T14:52:28 refs: move current_id before the reflog parameters Keep the reflog parameters as the last two, as they're the optional parameters.
Carlos Martín Nieto 77ad6754 2014-02-10T14:38:01 refs: conditional wording fixups This addresses arrbee's concerns about wording in the conditional reference udpate functions.
Edward Thomson 66b2626c 2014-02-09T13:43:56 core.autocrlf=input w/ text=auto attr to workdir
Edward Thomson 9780020b 2014-02-09T13:37:39 Tests for crlf filtering into the repository
Edward Thomson f77127da 2014-02-09T12:37:16 Tests for core.autocrlf and .gitattributes
Edward Thomson fb6f4539 2014-02-09T12:36:24 Close files on file diff failure Not closing the files on a diff failure ensures that clar cleanup will fail on win32 because we still have the file open.
Ben Straub fb52ba19 2014-02-09T07:25:49 Merge pull request #2107 from rocky-luo/examples-diff-numstat add example for diff with --numstat
rocky-luo 8086b78b 2014-02-09T21:08:42 replace 'out' with 'patch',replace the literal tabs with '\t'.
rocky-luo 4f5a3f40 2014-02-08T20:10:19 add example for diff with --numstat
Ben Straub f1590a18 2014-02-07T16:56:46 Merge pull request #2056 from libgit2/rb/commit-amend Add git_commit_amend API