Log

Author Commit Date CI Message
Russell Belfer f9775a37 2013-06-29T23:22:31 Add ignore_submodules to diff options This adds correct support for an equivalent to --ignore-submodules in diff, where an actual ignore value can be passed to diff to override the per submodule settings in the configuration. This required tweaking the constants for ignore values so that zero would not be used and could represent an unset option to the diff. This was an opportunity to move the submodule values into include/git2/types.h and to rename the poorly named DEFAULT values for ignore and update constants to RESET instead. Now the GIT_DIFF_IGNORE_SUBMODULES flag is exactly the same as setting the ignore_submodules option to GIT_SUBMODULE_IGNORE_ALL (which is actually a minor change from the old behavior in that submodules will now be treated as UNMODIFIED deltas instead of being left out totally - if you set GIT_DIFF_INCLUDE_UNMODIFIED). This includes tests for the various new settings.
Russell Belfer 2e3e273e 2013-06-29T13:20:45 Update diff to new internal submodule status API Submodules now expose an internal status API that allows diff to get back the OID values from the submodule very easily and also to avoiding caching issues and to override the ignore setting for the submodule.
Russell Belfer 3fe046cf 2013-06-29T13:13:38 Add BARE option to git_repository_open_ext This adds a BARE option to git_repository_open_ext which allows a fast open path that still knows how to read gitlinks and to search for the actual .git directory from a subdirectory. `git_repository_open_bare` is still simpler and faster, but having a gitlink aware fast open is very useful for submodules where we want to quickly be able to peek at the HEAD and index data without doing any other meaningful repo operations.
Russell Belfer 302a04b0 2013-06-29T12:41:39 Add accessors for refcount value
Russell Belfer 1aad6137 2013-06-29T13:16:33 Submodule status improvements This fixes the way that submodule status is checked to bypass just about all of the caching in the submodule object. Based on the ignore value, it will try to do the minimum work necessary to find the current status of the submodule - but it will actually go to disk to get all of the current values. This also removes the custom refcounting stuff in favor of the common git_refcount style. Right now, it is still for internal purposes only, but it should make it easier to add true submodule refcounting in the future with a public git_submodule_free call that will allow bindings not to worry about the submodule object getting freed from underneath them.
Russell Belfer e807860f 2013-06-27T16:52:38 Add timestamp check to submodule status This is probably not the final form of this change, but this is a preliminary version of checking a timestamp to see if the cached working directory HEAD OID matches the current. Right now, this uses the timestamp on the index and is, like most of our timestamp checking, subject to having only second accuracy.
Russell Belfer 41f1f9d7 2013-06-27T16:52:00 Add API to get path to index file
Russell Belfer 4535f044 2013-06-27T16:12:44 More diff submodule tests for cache issues The submodules code caches data about submodules in a way that can cause problems. This adds some tests that try making various modifications to the state of a submodule to see where we can catch out problems in the submodule caching. Right now, I've put in an extra git_submodule_reload_all so that the test will pass, but with that commented out, the test fails. I'm working on fixing the broken version of the test at which point I'll commit the fix and delete the extra reload that makes the test pass.
Russell Belfer 3e7d7100 2013-06-27T16:12:00 Fix diff test helper to show parent file/line
Russell Belfer 49621a34 2013-06-27T15:46:46 Fix memory leak in test
Russell Belfer 12f8fe00 2013-06-27T15:43:12 More improvements to submodule diff tests This controls for the diff.mnemonicprefix setting so that can't break the tests. Also, this expands one test to emulate an ObjectiveGit test more closely.
Russell Belfer 0105b55e 2013-06-27T15:26:31 Add another submodule test of dirty wd
Vicent Marti c0e529f3 2013-07-10T21:06:53 Merge branch 'arrbee/examples-log' into development
Vicent Marti 406dd556 2013-07-10T21:05:47 bitvec: Simplify the bit vector code
Russell Belfer 6fc5a581 2013-07-08T22:42:02 Basic bit vector This is a simple bit vector object that is not resizable after the initial allocation but can be of arbitrary size. It will keep the bti vector entirely on the stack for vectors 64 bits or less, and will allocate the vector on the heap for larger sizes. The API is uniform regardless of storage location. This is very basic right now and all the APIs are inline functions, but it is useful for storing an array of boolean values.
Russell Belfer 3e96ecf2 2013-07-08T09:53:24 Improve include/git2/pathspec.h docs
Russell Belfer 2b672d5b 2013-07-08T22:46:36 Add git_pathspec_match_diff API This adds an additional pathspec API that will match a pathspec against a diff object. This is convenient if you want to handle renames (so you need the whole diff and can't use the pathspec constraint built into the diff API) but still want to tell if the diff had any files that matched the pathspec. When the pathspec is matched against a diff, instead of keeping a list of filenames that matched, instead the API keeps the list of git_diff_deltas that matched and they can be retrieved via a new API git_pathspec_match_list_diff_entry. There are a couple of other minor API extensions here that were mostly for the sake of convenience and to reduce dependencies on knowing the internal data structure between files inside the library.
Russell Belfer 9abc78ae 2013-07-07T21:56:11 Convert commit->parent_ids to git_array_t This converts the array of parent SHAs from a git_vector where each SHA has to be separately allocated to a git_array_t where all the SHAs can be kept in one block. Since the two collections have almost identical APIs, there isn't much involved in making the change. I did add an API to git_array_t so that it could be allocated at a precise initial size.
Russell Belfer bc6f0839 2013-07-05T15:22:21 Add a bunch more features to log example
Russell Belfer a8b5f116 2013-07-03T17:00:50 Fix example/log.c pathspec handling of merges This fixes the way the example log program decides if a merge commit should be shown when a pathspec is given. Also makes it easier to use the pathspec API to just check "does a tree match anything in the pathspec" without allocating a match list.
Russell Belfer 733c4f3a 2013-07-03T15:12:14 more examples/log.c bug fixing
Russell Belfer 5a169711 2013-07-03T15:08:54 fix bug with order args and no revision
Russell Belfer 2b3bd8ec 2013-07-03T14:53:39 Fix example/log.c minor diffs with git log
Russell Belfer f44c4fa1 2013-07-01T15:41:32 Add basic commit formatting to log output
Russell Belfer f094f905 2013-07-01T15:41:01 Add raw header access to commit API
Russell Belfer 8ba0ff69 2013-06-25T15:39:44 rev-parse example
Russell Belfer d0628e2f 2013-06-25T15:39:13 More progress on log example
Russell Belfer 0d44d3dc 2013-06-24T23:21:23 Extending log example code This adds more command line processing to the example version of log. In particular, this adds the funky command line processing that allows an arbitrary series of revisions followed by an arbitrary number of paths and/or glob patterns. The actual logging part still isn't implemented.
Russell Belfer d2ce27dd 2013-06-24T23:16:06 Add public API for pathspec matching This adds a new public API for compiling pathspecs and matching them against the working directory, the index, or a tree from the repository. This also reworks the pathspec internals to allow the sharing of code between the existing internal usage of pathspec matching and the new external API. While this is working and the new API is ready for discussion, I think there is still an incorrect behavior in which patterns are always matched against the full path of an entry without taking the subdirectories into account (so "s*" will match "subdir/file" even though it wouldn't with core Git). Further enhancements are coming, but this was a good place to take a functional snapshot.
Russell Belfer d39fff36 2013-06-23T20:33:57 Basic framework for log command
Vicent Martí bf3ee3cf 2013-07-10T10:58:58 Merge pull request #1705 from arrbee/avoid-index-double-free Try harder not to double free index entries
Vicent Martí bf730611 2013-07-10T10:58:26 Merge pull request #1717 from libgit2/arrbee/pr-1706-merged-and-cleaned PR 1706 plus error reporting cleanups
Russell Belfer 33c8c6f0 2013-07-10T10:48:32 trivial whitespace fixup
Russell Belfer c2de6b1a 2013-07-10T10:21:24 Bring SSH error reporting up to base standards The SSH error checking and reporting could still be further improved by using the libssh2 native methods to get error info, but at least this ensures that all error codes are checked and translated into libgit2 error messages.
Russell Belfer 68bc49a1 2013-07-10T09:20:46 Merge branch 'ssh-cred-fix' of tiennou/libgit2 Conflicts: src/transports/ssh.c
Etienne Samson 08bf80fa 2013-07-10T10:29:32 Tab indent.
Etienne Samson 367c1903 2013-07-10T10:29:09 Add some missing error messages.
Vicent Martí b8cd7aa9 2013-07-09T17:20:55 Merge pull request #1704 from arrbee/kill-status-index-then-workdir Remove GIT_STATUS_SHOW_INDEX_THEN_WORKDIR option
Vicent Martí 77fa06f3 2013-07-09T17:20:36 Merge pull request #1695 from arrbee/fix-1695 API should not be ifdeffed
Vicent Martí 550cd2d7 2013-07-09T16:54:34 Merge pull request #1716 from arrbee/fix-config-get-multivar Fix git_config_get_multivar with interleaved missing entries
Russell Belfer e4fda954 2013-07-09T16:46:18 A little git_config_get_multivar code cleanup
Russell Belfer 7b5c0d18 2013-07-09T16:45:23 Add more tests for git_config_get_multivar The old tests didn't try failing lookups or lookups across multiple config files with some having the pattern and some not having it.
J. David Ibáñez 07fba63e 2013-07-06T23:51:40 Fix return value in git_config_get_multivar If there is not an error, the return value was always the return value of the last call to file->get_multivar With this commit GIT_ENOTFOUND is only returned if all the calls to filge-get_multivar return GIT_ENOTFOUND.
Russell Belfer 290e1479 2013-07-09T16:17:41 Add GIT_CAP_SSH if library was built with SSH This also adds a test that actually calls git_libgit2_capabilities and git_libgit2_version.
Russell Belfer a4456929 2013-07-09T16:16:24 Make credential clearing consistent This makes all of the credential objects use the same pattern to clear the contents and call git__memzero when done. Much of this information is probably not sensitive, but it also seems better to just clear consistently.
Russell Belfer 03d9b930 2013-07-09T14:45:58 Indent with tabs
Russell Belfer 3eae9467 2013-07-09T14:24:57 Merge pull request #1710 from arrbee/fix-1710 Null byte in hunk header
Russell Belfer 5813bc21 2013-07-09T12:01:16 Lots of SSH credential stuff can be left on Much of the SSH credential creation API can be left enabled even on platforms with no SSH support. We really just have to give an error when you attempt to open the SSH connection.
Russell Belfer a3c062db 2013-07-09T09:58:33 Make SSH APIs present even without SSH support The SSH APIs will just return an error code and state that the library was built without SSH support if they are called in that case.
Vicent Martí 42d1a1e5 2013-07-09T06:46:50 Merge pull request #1715 from tiennou/const-signature Make the git_signature `const` in the stash API.
Etienne Samson 2274993b 2013-07-09T12:52:25 Make the git_signature const in the stash API.
Russell Belfer a5f9b5f8 2013-07-05T16:59:38 Diff hunk context off by one on long lines The diff hunk context string that is returned to xdiff need not be NUL terminated because the xdiff code just copies the number of bytes that you report directly into the output. There was an off by one in the diff driver code when the header context was longer than the output buffer size, the output buffer length included the NUL byte which was copied into the hunk header. Fixes #1710
Russell Belfer 82cb8e23 2013-07-05T10:52:24 Merge pull request #1692 from arrbee/fix-1692 Segmentation fault on git_clone
Etienne Samson f6bd0863 2013-07-03T22:02:44 Fix a probable leak.
Etienne Samson 219f318c 2013-07-03T22:02:29 Fix a crash if git_remote_set_cred_acquire_cb wasn't called before connecting. Fixes #1700.
Russell Belfer 2a16914c 2013-07-03T12:20:34 Remove GIT_STATUS_SHOW_INDEX_THEN_WORKDIR option This option serves no benefit now that the git_status_list API is available. It was of questionable value before and now it would just be a bad idea to use it rather than the indexed API.
Russell Belfer 4ae29053 2013-07-03T11:45:10 Merge pull request #1701 from yorah/fix/gh-1698 Fix segfault in git_status_foreach_ext()
Russell Belfer 178aa39c 2013-07-03T11:42:43 Be more thread aware with some index updates The index isn't really thread safe for the most part, but we can easily be more careful and avoid double frees and the like, which are serious problems (as opposed to a lookup which might return the incorrect value but if the index in being updated, that is much harder to avoid).
yorah 9b6075b2 2013-07-03T17:07:20 Fix segfault in git_status_foreach_ext() Add tests for the `GIT_STATUS_SHOW_XXX` flags.
Vicent Martí 6bb7bff2 2013-07-02T14:43:44 Merge pull request #1696 from AndrejMitrovic/FixTypo [trivial] Fix small typo in docs for git_repository_message.
Andrej Mitrovic f8ccd6c9 2013-07-02T20:23:54 Fix small typo in docs for git_repository_message.
Ben Straub 7c559c25 2013-07-01T12:42:08 Merge pull request #1694 from AndrejMitrovic/FixupDocEnums [trivial] Fix docs to use proper enum names
Russell Belfer 55ededfd 2013-07-01T10:21:14 Make refspec_transform paranoid about arguments
Russell Belfer 278ce746 2013-07-01T10:20:38 Add helpful buffer shorten function
Andrej Mitrovic 0b170f4d 2013-07-01T00:56:54 Fix docs to use proper enum names that exist.
Vicent Martí c61300ed 2013-06-29T07:34:03 Merge pull request #1690 from nulltoken/fix/warnings Fix Win32/64 compilation warnings & memory leak
nulltoken d90390c1 2013-06-29T13:38:27 test: Fix memory leak
nulltoken c4ac556e 2013-06-29T12:48:58 Fix compilation warnings
Russell Belfer f2c41884 2013-06-27T22:48:46 Merge pull request #1688 from arrbee/submodule-load-ignore-orphaned-head Test submodules with empty index or orphaned head
Russell Belfer 1e9dd60f 2013-06-27T22:29:05 Test submodules with empty index or orphaned head In both of these cases, the submodule data should still be loaded just (obviously) without the data that comes from either the index or the HEAD. This fixes a bug in the orphaned head case.
Russell Belfer c8a39f9e 2013-06-27T11:11:12 Merge pull request #1684 from libgit2/fix-dirty-submodule-diff Dirty submodules do not correctly appear in diffs
Russell Belfer c67ff958 2013-06-27T07:38:27 Fix bug marking submodule diffs as unmodified There was a bug where submodules whose HEAD had not been moved were being marked as having an UNMODIFIED delta record instead of being left MODIFIED. This fixes that and fixes the tests to notice if a submodule has been incorrectly marked as UNMODIFIED.
Justin Spahr-Summers c7974b49 2013-06-26T12:03:33 Fail on unmodified deltas when they're unexpected
Russell Belfer b0401c68 2013-06-25T16:36:50 Merge pull request #1681 from arthurschreiber/patch-1 Prefer younger merge bases over older ones.
Arthur Schreiber 24ba6d3f 2013-06-25T22:55:13 Add a test case.
Russell Belfer d0c36a0b 2013-06-25T10:42:38 Merge pull request #1678 from arthurschreiber/unbreak-local-ls-after-disconnect Unbreak git_remote_ls on a local transport after disconnecting.
Russell Belfer 22ef0c28 2013-06-25T09:40:10 Merge pull request #1680 from csware/win32-junction Correctly handle win32 junctions
Arthur Schreiber 3736b64f 2013-06-25T18:36:37 Prefer younger merge bases over older ones. git-core prefers younger merge bases over older ones in case that multiple valid merge bases exists.
Sven Strickroth 47537112 2013-06-25T16:46:06 Correctly handle junctions A junction has S_IFDIR | S_IFLNK set, however, only one makes sense. Signed-off-by: Sven Strickroth <email@cs-ware.de>
Sven Strickroth 022a45e0 2013-06-25T16:43:15 Revert "Work around reparse point stat issues" This reverts commit 32c12ea6a9cafd76a746af2e2be9366c95752f5b.
Arthur Schreiber 9728cfde 2013-06-25T11:17:55 Make sure we don't leak memory again.
Arthur Schreiber edbaa63a 2013-06-25T09:04:04 Unbreak git_remote_ls on a local transport after disconnecting.
Vicent Marti eddc1f1e 2013-06-25T00:14:45 libgit2 v0.19.0 "gut merge" Minor point release! We got a lot of rather large features that we wanted to get settled in: - New (threadsafe) cache for objects - Iterator for Status - New Merge APIs - SSH support on *NIX - Function context on diff - Namespaces support - Index add/update/remove with wildcard support - Iterator for References - Fetch and push refspecs for Remotes - Rename support in Status - New 'sys/` namespace for external headers with low-level APIs As always, this comes with hundreds of bug fixes and performance improvements. We're faster and better than ever. And we haven't broken many APIs this time! Build stuff.
Vicent Marti c0e58e43 2013-06-25T00:12:19 test-rename: This is not a decimal, silly
Russell Belfer 5b4a7083 2013-06-24T14:43:33 Merge pull request #1675 from arthurschreiber/fix-leak-in-local-transport Fix a leak in the local transport code.
Vicent Martí 12212258 2013-06-24T12:02:43 Merge pull request #1674 from arrbee/fix-checkout-target-dir-win32 Fix checkout tests on Windows
Arthur Schreiber 8c510b83 2013-06-24T21:02:42 Fix a leak in the local transport code.
Russell Belfer f3f4c6b5 2013-06-24T11:56:35 Fix checkout tests on Windows
Vicent Martí 353a90be 2013-06-24T11:21:54 Merge pull request #1672 from TheRealKerni/fix/header_docs Fixed most documentation header bugs
Vicent Martí 09ee60c6 2013-06-24T11:21:09 Merge pull request #1670 from arrbee/open-cloexec Add O_CLOEXEC to open calls
Vicent Martí 6c4dadba 2013-06-24T11:20:57 Merge pull request #1669 from arrbee/fix-index-add-bypath In loose objects backend, constrain mkdir calls to avoid extra mkdirs
Russell Belfer 32c12ea6 2013-06-24T09:19:24 Work around reparse point stat issues In theory, p_stat should never return an S_ISLNK result, but due to the current implementation on Windows with mount points it is possible that it will. For now, work around that by allowing a link in the path to a directory being created. If it is really a problem, then the issue will be caught on the next iteration of the loop, but typically this will be the right thing to do.
Andreas Linde e1967164 2013-06-24T15:33:41 Fixed most documentation header bugs Fixed a few header @param and @return typos with the help of -Wdocumentation in Xcode. The following warnings have not been fixed: common.h:213 - Not sure how the documentation format is for '...' notes.h:102 - Correct @param name but empty text notes.h:111 - Correct @param name but empty text pack.h:140 - @return missing text pack.h:148 - @return missing text
Russell Belfer 3d3ea4dc 2013-06-22T20:58:32 Add O_CLOEXEC to open calls
Russell Belfer 9f1b2c5c 2013-06-22T17:22:03 Merge pull request #1668 from csware/WC_ERR_INVALID_CHARS Do not redefine WC_ERR_INVALID_CHARS
Russell Belfer 8294e8cf 2013-06-22T17:15:31 Constrain mkdir calls to avoid extra mkdirs This updates the calls that make the subdirectories for objects to use a base directory above which git_futils_mkdir won't walk any higher. This prevents attempts to mkdir all the way up to the root of the filesystem. Also, this moves the objects_dir into the loose backend structure and removes the separate allocation, plus does some preformatting of the objects_dir value to guarantee a trailing slash, etc.
Sven Strickroth a7ea4095 2013-06-23T01:25:34 Do not redefine WC_ERR_INVALID_CHARS WC_ERR_INVALID_CHARS might be already defined by the Windows SDK. Signed-off-by: Sven Strickroth <email@cs-ware.de>
Vicent Martí 5d669f0a 2013-06-21T14:29:21 Merge pull request #1665 from arrbee/checkout-target-directory Add target directory to checkout options
Russell Belfer d4f98ba4 2013-06-21T12:29:03 Addition checkout target directory tests This adds additonal tests of the checkout target directory option including using it to dump data from bare repos.
Russell Belfer 6a15e8d2 2013-06-21T12:26:36 Loosen ensure_not_bare rules in checkout With the new target directory option to checkout, the non-bareness of the repository should be checked much later in the parameter validation process - actually that check was already in place, but I was doing it redundantly in the checkout APIs. This removes the now unnecessary early check for bare repos. It also adds some other parameter validation and makes it so that implied parameters can actually be passed as NULL (i.e. if you pass a git_index, you don't have to pass the git_repository - we can get it from index).