kmx git

Commit	Date	Message
d2c4d1c6	2014-05-12T10:04:52	Merge pull request #2188 from libgit2/cmn/config-snapshot Configuration snapshotting
e18d5e52	2014-05-09T08:59:59	Merge pull request #2331 from libgit2/rb/dont-stop-diff-on-safecrlf Add filter options and ALLOW_UNSAFE
2dde1e0c	2014-05-08T22:31:59	indexer: avoid memory moves Our vector does a move of the rest of the array when we remove an item. Doing this repeatedly can be expensive, and we do this a lot in the indexer. Instead, set the value to NULL and skip those entries. perf reported around 30% of `index-pack` time was going into memmove. With this change, that goes away and we spent most of the time hashing and inflating data.
45c53eb6	2014-05-08T10:46:04	Use unsigned type for APIs with opt flag mask
ac99d86b	2014-05-07T11:34:32	repository: introduce a convenience config snapshot method Accessing the repository's config and immediately taking a snapshot of it is a common operation, so let's provide a convenience function for it.
ed476c23	2014-05-06T16:11:03	Merge pull request #2329 from anuraggup/fix_git_shutdown Fix the issues in git_shutdown
5269008c	2014-05-06T16:01:49	Add filter options and ALLOW_UNSAFE Diff and status do not want core.safecrlf to actually raise an error regardless of the setting, so this extends the filter API with an additional options flags parameter and adds a flag so that filters can be applied with GIT_FILTER_OPT_ALLOW_UNSAFE, indicating that unsafe filter application should be downgraded from a failure to a warning.
10511000	2014-05-06T14:03:58	Merge pull request #2324 from libgit2/cmn/file-in-objects-dir odb: ignore files in the objects dir
0bf5430d	2014-05-06T13:33:47	Fix the issues in git_shutdown 1) Call to git_shutdown results in setting git__n_shutdown_callbacks to -1. Next call to git__on_shutdown results in ABW (Array Bound Write) for array git__shutdown_callbacks. In the current Implementation, git_atomic_dec is called git__n_shutdown_callbacks + 1 times. I have modified it to a for loop so that it is more readable. It would not set git__n_shutdown_callbacks to a negative number and reset the elements of git__shutdown_callbacks to NULL. 2) In function git_sysdir_get, shutdown function is registered only if git_sysdir__dirs_shutdown_set is set to 0. However, after this variable is set to 1, it is never reset to 0. If git_sysdir_global_init is called again from synchronized_threads_init it does not register shutdown function for this subsystem.
6e9afb97	2014-05-06T21:14:58	object: fix a brace The brace in the check for peel's return was surrounding the wrong thing, which made 'error' be set to 1 when there was an error instead of the error code.
001befcd	2014-05-06T12:16:24	Fix the issues in git__on_shutdown
ee311907	2014-05-05T16:04:14	odb: ignore files in the objects dir We assume that everything under GIT_DIR/objects/ is a directory. This is not necessarily the case if some process left a stray file in there. Check beforehand if we do have a directory and ignore the entry otherwise.
272b462d	2014-05-02T09:50:15	Merge pull request #2308 from libgit2/rb/diff-update-index-stat-cache Reduce excessive OID calculation for diff and stat
9862ef8e	2014-05-02T09:42:07	Merge pull request #2310 from libgit2/cmn/commit-create-safe commit: safer commit creation with reference update
0f603132	2014-05-01T14:47:33	Improve handling of fake home directory There are a few tests that set up a fake home directory and a fake GLOBAL search path so that we can test things in global ignore or attribute or config files. This cleans up that code to work more robustly even if there is a test failure. This also fixes some valgrind warnings where scanning search paths for separators could end up doing a little bit of sketchy data access when coming to the end of search list.
bc91347b	2014-04-30T11:16:31	Fix remaining init_options inconsistencies There were a couple of "init_opts()" functions a few more cases of structure initialization that I somehow missed.
702efc89	2014-04-30T10:57:42	Make init_options fns use unsigned ints and macro Use an unsigned int for the version and add a helper macro so the code is simplified (and so the error message is a common string).
9c8ed499	2014-04-29T15:05:58	Remove trace / add git_diff_perfdata struct + api
7a2e56a3	2014-04-29T14:30:15	Get rid of redundant git_diff_options_init fn Since git_diff_init_options was introduced, remove this old fn.
b23b112d	2014-04-29T11:29:49	Add payloads, bitmaps to trace API This is a proposed adjustment to the trace APIs. This makes the trace levels into a bitmask so that they can be selectively enabled and adds a callback-level payload, plus a message-level payload. This makes it easier for me to a GIT_TRACE_PERF callbacks that are simply bypassed if the PERF level is not set.
cd424ad5	2014-04-28T16:39:53	Add GIT_STATUS_OPT_UPDATE_INDEX and use trace API This adds an option to refresh the stat cache while generating status. It also rips out the GIT_PERF stuff I had an makes use of the trace API to keep statistics about what happens during diff.
94fb4aad	2014-04-28T14:48:41	Add diff option to update index stat cache When diff is scanning the working directory, if it finds a file where it is not sure if the index entry matches the working dir, it will recalculate the OID (which is pretty expensive). This adds a new flag to diff so that if the OID calculation finds that the file actually has not changed (i.e. just the modified time was altered or such), then it will refresh the stat cache in the index so that future calls to diff will not have to check the oid again.
0fc8e1f6	2014-04-28T14:34:55	Lay groundwork for updating stat cache in diff This reorganized the diff OID calculation to make it easier to correctly update the stat cache during a diff once the flags to do so are enabled. This includes marking the path of a git_index_entry as const so we can make a "fake" git_index_entry with a "const char *" path and not get warnings. I was a little surprised at how unobtrusive this change was, but I think it's probably a good thing.
8ef4e11a	2014-04-28T14:16:26	Skip diff oid calc when size definitely changed When we think the stat cache in the index seems valid and the size or mode of a file has definitely changed, then don't bother trying to recalculate the OID of the workdir bits to confirm that it is modified - just accept that it is modified. This can result in files that show as modified with no actual diff, but the behavior actually appears to match Git on the command line. This also includes a minor optimization to not perform a submodule lookup on the ".git" directory itself.
240f4af3	2014-04-28T14:04:29	Add build option for diff internal statistics
6a1ca96e	2014-05-02T17:14:04	Temporary fix for Travis CI builds See https://github.com/libgit2/libgit2/pull/2321#issuecomment-42039673 We may rollback once we found something more reliable
d19b2f9f	2014-05-01T12:46:46	Make pattern eat trailing slash This allows "foo//*.html" to match "foo/file.html"
9d878fc4	2014-05-01T01:23:10	Merge pull request #2304 from jacquesg/solaris Solaris!
183aa4f8	2014-04-30T17:46:53	Check for NULL before passing it to vsnprintf
6b05240c	2014-04-27T19:44:20	strcasecmp is in <strings.h>
90a4340a	2014-04-30T11:47:58	cygwin also doesn't have qsort_r
217c029b	2014-04-09T14:08:22	commit: safer commit creation with reference update The current version of the commit creation and amend function are unsafe to use when passing the update_ref parameter, as they do not check that the reference at the moment of update points to what the user expects. Make sure that we're moving history forward when we ask the library to update the reference for us by checking that the first parent of the new commit is the current value of the reference. We also make sure that the ref we're updating hasn't moved between the read and the write. Similarly, when amending a commit, make sure that the current tip of the branch is the commit we're amending.
36a61518	2014-04-29T13:28:16	MidnightBSD may also not have strnlen
38d338b2	2014-04-26T18:15:39	pack-objects: always write out the status in write_one() Make sure we set the output parameter to a value.
c7f86efb	2014-04-26T18:04:43	zstream: grow based on used memory rather than allocated When deflating data, we might need to grow the buffer. Currently we add a guess on top of the currently-allocated buffer size. When we re-use the buffer, it already has some memory allocated; adding to that means that we always grow the buffer regardless of how much we need to use. Instead, increase on top of the currently-used size. This still leaves us with the allocated size of the largest object we compress, but it's a minor pain compared to unbounded growth. This fixes #2285.
4f9d5414	2014-04-26T14:29:18	refdb: fix typo and wording
424222f4	2014-04-25T15:49:26	Filter: Make sure to release local on error
8443ed6c	2014-04-25T02:10:19	Merge pull request #2284 from jacquesg/push-progress-callback Fire progress and update tips callbacks also for pushes.
2ad51b81	2014-04-25T02:04:12	Merge pull request #2241 from libgit2/rb/stash-skip-submodules Improve stash and checkout for ignored + untracked items
af9eeac9	2014-04-24T16:20:08	Merge pull request #2294 from ethomson/merge_checkout_strategy Merge checkout strategy
a409acef	2014-04-24T11:59:50	Handle explicitly ignored dir slightly differently When considering status of untracked directories, if we find an explicitly ignored item, even if it is a directory, treat the parent as an IGNORED item. It was accidentally being treated as an EMPTY item because we were not looking into the ignored subdir.
bdc82e1c	2014-04-24T14:08:29	fetchhead: deal with quotes in branch names The current FETCH_HEAD parsing code assumes that a quote must end the branch name. Git however allows for quotes as part of a branch name, which causes us to consider the FETCH_HEAD file as invalid. Instead of searching for a single quote char, search for a quote char followed by SP, which is not a valid part of a ref name.
a4e2c36a	2014-04-23T19:40:21	merge: checkout default shouldn't clobber given
26564d80	2014-04-23T19:26:58	merge: default checkout strategy for should be SAFE
219c89d1	2014-04-23T16:28:45	Treat ignored, empty, and untracked dirs different In the iterator, distinguish between ignores and empty directories so that diff and status can ignore empty directories, but checkout and stash can treat them as untracked items.
212b6205	2014-04-23T09:27:15	Merge pull request #2291 from ethomson/patch_binary patch: emit deflated binary patches (optionally)
5ca410b9	2014-04-23T07:13:49	Merge pull request #2283 from phkelley/win32_fs Win32: UTF-8 <-> WCHAR conversion overhaul
7110000d	2014-04-22T10:21:19	React to feedback for UTF-8 <-> WCHAR and reparse work
37da3685	2014-04-22T21:51:54	Make checkout match diff for untracked/ignored dir When diff finds an untracked directory, it emulates Git behavior by looking inside the directory to see if there are any untracked items inside it. If there are only ignored items inside the dir, then diff considers it ignored, even if there is no direct ignore rule for it. Checkout was not copying this behavior - when it found an untracked directory, it just treated it as untracked. Unfortunately, when combined with GIT_CHECKOUT_REMOVE_UNTRACKED, this made is seem that checkout (and stash, which uses checkout) was removing ignored items when you had only asked it to remove untracked ones. This commit moves the logic for advancing past an untracked dir while scanning for non-ignored items into an iterator helper fn, and uses that for both diff and checkout.
e349ed50	2014-04-22T14:58:33	patch: emit binary patches (optionally)
24d17de2	2014-04-02T12:07:27	Make stash and checkout ignore contained repos To emulate git, stash should not remove untracked git repositories inside the parent repo, and checkout's REMOVE_UNTRACKED should also skip over these items. `git stash` actually prints a warning message for these items. That should be possible with a checkout notify callback if you wanted to, although it would require a bit of extra logic as things are at the moment.
e60883c8	2014-04-22T12:59:31	Replace math fns with simpler integer math
8d09efa2	2014-04-22T12:33:27	Use git_diff_get_stats in example/diff + refactor This takes the `--stat` and related example options in the example diff.c program and converts them to use the `git_diff_get_stats` API which nicely formats stats for you. I went to add bar-graph scaling to the stats formatter and noticed that the `git_diff_stats` structure was holding on to all of the `git_patch` objects. Unfortunately, each of these objects keeps the full text of the diff in memory, so this is very expensive. I ended up modifying `git_diff_stats` to keep just the data that it needs to keep and allowed it to release the patches. Then, I added width scaling to the output on top of that. In making the diff example program match 'git diff' output, I ended up removing an newline from the sumamry output which I then had to compensate for in the email formatting to match the expectations. Lastly, I went through and refactored the tests to use a couple of helper functions and reduce the overall amount of code there.
12e422a0	2014-04-21T16:08:05	Some doc and examples/diff.c changes I was playing with "git diff-index" and wanted to be able to emulate that behavior a little more closely with the diff example. Also, I wanted to play with running `git_diff_tree_to_workdir` directly even though core Git doesn't exactly have the equivalent, so I added a command line option for that and tweaked some other things in the example code. This changes a minor output thing in that the "raw" print helper function will no longer add ellipses (...) if the OID is not actually abbreviated.
bc0a6198	2014-04-19T15:52:58	transports: allow the creds callback to say it doesn't exist Allow the credentials callback to return GIT_PASSTHROUGH to make the transports code behave as though none was set. This should make it easier for bindings to behave closer to the C code when there is no credentials callback set at their level.
2efd7df6	2014-04-19T15:34:12	remote: provide read access to the callback structure This should make it easier for bindings to dynamically override their own callbacks.
dac95e4a	2014-04-22T11:04:35	Merge pull request #2287 from libgit2/rb/moar-coverity-fixes Fix some issues from the last Coverity scan
65477db1	2014-04-21T23:32:31	Handle win32 reparse points properly
17ef678c	2014-04-21T11:55:57	Fix some coverity-found issues
bd101a7e	2014-04-21T11:54:54	Fix reset for staged deletes
321d377a	2014-04-21T17:02:05	Fire update_tips callback also for pushes.
78399310	2014-04-21T16:38:52	attrcache: fix use-after-free Reported by coverity.
8b686b31	2014-04-21T15:25:19	Correct argument order of git__calloc()
be6996b7	2014-04-21T15:25:02	It is safe to free() a NULL pointer
a15d3537	2014-04-21T15:48:05	sysdir: free the path if we cannot find the file Returning an error cleared the buf, but this operation does not free the memory associated with it. Use git_buf_free() instead.
48e60ae7	2014-04-21T11:23:29	Don't redefine the same callback types, their signatures may change
98020d3a	2014-04-21T10:55:37	Rename progress callback to sideband_progress
4f62163e	2014-04-20T22:06:05	Check the return codes of remote callbacks. The user may have requested that the operation be cancelled.
9effa2fb	2014-04-20T19:19:13	Fire progress callbacks also for pushes. It's not very useful to only know that a pre-receive hook has declined a push, you probably want to know why.
c2c81615	2014-04-19T18:05:31	Win32: UTF-8 <-> WCHAR conversion overhaul
bfc50f83	2014-04-19T18:59:09	Merge pull request #2273 from jacquesg/ssh-interactive Add support for SSH keyboard-interactive authentication
7b0f8ba9	2014-04-19T13:05:32	Merge pull request #2279 from libgit2/rb/moar-eegnöre-fîxés Fix several ignore and attribute file behavior bugs
ac16bd0a	2014-04-18T15:45:59	Minor fixes Only apply LEADING_DIR pattern munging to patterns in ignore and attribute files, not to pathspecs used to select files to operate on. Also, allow internal macro definitions to be evaluated before loading all external ones (important so that external ones can make use of internal `binary` definition).
916fcbd6	2014-04-18T14:42:40	Fix ignore difference from git with trailing /* Ignore patterns that ended with a trailing '/' were still needing to match against another actual '/' character in the full path. This is not the same behavior as core Git. Instead, we strip a trailing '/' off of any patterns that were matching and just take it to imply the FNM_LEADING_DIR behavior.
e3a2a04c	2014-04-18T14:29:58	Preload attribute files that may contain macros There was a latent bug where files that use macro definitions could be parsed before the macro definitions were loaded. Because of attribute file caching, preloading files that are going to be used doesn't add a significant amount of overhead, so let's always preload any files that could contain macros before we assemble the actual vector of files to scan for attributes.
a622ff17	2014-04-18T20:05:28	Only zero sensitive information on destruction (and memory actually allocated by us)
6a0956e5	2014-04-18T10:32:35	Pop ignore only if whole relative path matches When traversing the directory structure, the iterator pushes and pops ignore files using a vector. Some directories don't have ignore files, so it uses a path comparison to decide when it is right to actually pop the last ignore file. This was only comparing directory suffixes, though, so a subdirectory with the same name as a parent could result in the parent's .gitignore being popped off the list ignores too early. This changes the logic to compare the entire relative path of the ignore file.
386777fd	2014-04-18T09:26:38	Merge pull request #2213 from ethomson/safecrlf Introduce core.safecrlf handling
8ec0a552	2014-04-18T00:49:07	Make git_cred_ssh_custom_new() naming more consistent
478408c0	2014-04-17T23:03:44	Introduce git_cred_ssh_interactive_new() This allows for keyboard-interactive based SSH authentication
bd270b70	2014-04-18T17:08:10	cred: tighten username rules The ssh-specific credentials allow the username to be missing. The idea being that the ssh transport will then use the username provided in the url, if it's available. There are two main issues with this. The credential callback already knows what username was provided by the url and needs to figure out whether it wants to ask the user for it or it can reuse it, so passing NULL as the username means the credential callback is suspicious. The username provided in the url is not in fact used by the transport. The only time it even considers it is for the user/pass credential, which asserts the existence of a username in its constructor. For the ssh-specific ones, it passes in the username stored in the credential, which is NULL. The libssh2 macro we use runs strlen() against this value (which is no different from what we would be doing ourselves), so we then crash. As the documentation doesn't suggest to leave out the username, assert the need for a username in the code, which removes this buggy behavior and removes implicit state. git_cred_has_username() becomes a blacklist of credential types that do not have a username. The only one at the moment is the 'default' one, which is meant to call up some Microsoft magic.
2280b388	2014-04-09T13:17:51	config: share the strmap on snapshot Now that our strmap is no longer modified but replaced, we can use the same strmap for the snapshot's values and it will be freed when we don't need it anymore.
4b99b8f5	2014-04-09T13:08:01	config: refcount the values map This is mostly groundwork to let us re-use the map in the snapshots.
523032cd	2014-03-31T09:58:44	config: refresh before reading a value With the isolation of complex reads, we can now try to refresh the on-disk file before reading a value from it. This changes the semantics a bit, as before we could be sure that a string we got from the configuration was valid until we wrote or refreshed. This is no longer the case, as a read can also invalidate the pointer.
eaf37034	2014-03-31T08:53:56	config: refresh the values on write When writing out, parse the resulting file instead of adding or replacing the value locally. This has the effect of reading external changes as well.
8c1f4ab4	2014-04-09T12:26:53	config: refresh on delete When we delete an entry, we also want to refresh the configuration to catch any changes that happened externally. This allows us to simplify the logic, as we no longer need to delete these variables internally. The whole state will be refreshed and the deleted entries won't be there.
0500a1ef	2014-03-31T08:32:45	config: use a snapshot for the iterator
bd95f836	2014-03-31T08:08:17	config: split out the refresh step This will be used by the writing commands in a later step.
c047317e	2014-03-18T17:54:32	config: make refresh atomic Current code sets the active map to a new one and builds it whilst it's active. This is a race condition with someone else trying to access the same config. Instead, let's build up our new map and swap the active and new one.
29c4cb09	2014-03-15T03:53:36	Use config snapshotting This way we can assume we have a consistent view of the config situation when we're looking up remote, branch, pack-objects, etc.
55ebd7d3	2014-03-13T17:11:34	config: implement config snapshotting In order to have consistent views of the config files for remotes, submodules et al. and a configuration that represents what is currently stored on-disk, we need a way to provide a view of the configuration that does not change. The goal here is to provide the snapshotting part by creating a read-only copy of the state of the configuration at a particular point in time, which does not change when a repository's main config changes.
28fd7206	2014-04-18T12:33:19	Merge pull request #2108 from libgit2/rb/threadsafe-index-iterator Make index iterator thread safe
2bed3553	2014-04-18T00:34:04	cherry-pick: terminate the commit id string We treat this as a NUL-terminated string, so make sure that we add the terminator.
83038272	2014-04-17T14:35:29	Some memory leak fixes
823c0e9c	2014-04-17T11:53:13	Fix broken logic for attr cache invalidation The checks to see if files were out of date in the attibute cache was wrong because the cache-breaker data wasn't getting stored correctly. Additionally, when the cache-breaker triggered, the old file data was being leaked.
e6e8530a	2014-04-14T12:31:17	Lock attribute file while reparsing data I don't love this approach, but achieving thread-safety for attribute and ignore data while reloading files would require a larger rewrite in order to avoid this. If an attribute or ignore file is out of date, this holds a lock on the file while we are reloading the data so that another thread won't try to reload the data at the same time.
ea642d61	2014-04-14T12:29:27	Fix race checking for existing index items In the threading tests, I was still seeing a race condition where the same item could end up being inserted multiple times into the index. Preserving the sorted-ness of the index outside of the `index_insert` call fixes the issue.
2e9d813b	2014-04-11T12:12:47	Fix tests with new attr cache code
7d490872	2014-04-10T22:31:01	Attribute file cache refactor This is a big refactoring of the attribute file cache to be a bit simpler which in turn makes it easier to enforce a lock around any updates to the cache so that it can be used in a threaded env. Tons of changes to the attributes and ignores code.
1fa17b5c	2014-03-14T22:01:30	Minor tree cache speedups While I was looking at the conflict cleanup code, I looked over at the tree cache code, since we clear the tree cache for each entry that gets removed and there is some redundancy there. I made some small tweaks to avoid extra calls to strchr and strlen in a few circumstances.

d2c4d1c6

2014-05-12T10:04:52

Merge pull request #2188 from libgit2/cmn/config-snapshot Configuration snapshotting

e18d5e52

2014-05-09T08:59:59

Merge pull request #2331 from libgit2/rb/dont-stop-diff-on-safecrlf Add filter options and ALLOW_UNSAFE

2dde1e0c

2014-05-08T22:31:59

indexer: avoid memory moves Our vector does a move of the rest of the array when we remove an item. Doing this repeatedly can be expensive, and we do this a lot in the indexer. Instead, set the value to NULL and skip those entries. perf reported around 30% of `index-pack` time was going into memmove. With this change, that goes away and we spent most of the time hashing and inflating data.

45c53eb6

2014-05-08T10:46:04

Use unsigned type for APIs with opt flag mask

ac99d86b

2014-05-07T11:34:32

repository: introduce a convenience config snapshot method Accessing the repository's config and immediately taking a snapshot of it is a common operation, so let's provide a convenience function for it.

ed476c23

2014-05-06T16:11:03

Merge pull request #2329 from anuraggup/fix_git_shutdown Fix the issues in git_shutdown

5269008c

2014-05-06T16:01:49

Add filter options and ALLOW_UNSAFE Diff and status do not want core.safecrlf to actually raise an error regardless of the setting, so this extends the filter API with an additional options flags parameter and adds a flag so that filters can be applied with GIT_FILTER_OPT_ALLOW_UNSAFE, indicating that unsafe filter application should be downgraded from a failure to a warning.

10511000

2014-05-06T14:03:58

Merge pull request #2324 from libgit2/cmn/file-in-objects-dir odb: ignore files in the objects dir

0bf5430d

2014-05-06T13:33:47

Fix the issues in git_shutdown 1) Call to git_shutdown results in setting git__n_shutdown_callbacks to -1. Next call to git__on_shutdown results in ABW (Array Bound Write) for array git__shutdown_callbacks. In the current Implementation, git_atomic_dec is called git__n_shutdown_callbacks + 1 times. I have modified it to a for loop so that it is more readable. It would not set git__n_shutdown_callbacks to a negative number and reset the elements of git__shutdown_callbacks to NULL. 2) In function git_sysdir_get, shutdown function is registered only if git_sysdir__dirs_shutdown_set is set to 0. However, after this variable is set to 1, it is never reset to 0. If git_sysdir_global_init is called again from synchronized_threads_init it does not register shutdown function for this subsystem.

6e9afb97

2014-05-06T21:14:58

object: fix a brace The brace in the check for peel's return was surrounding the wrong thing, which made 'error' be set to 1 when there was an error instead of the error code.

001befcd

2014-05-06T12:16:24

Fix the issues in git__on_shutdown

ee311907

2014-05-05T16:04:14

odb: ignore files in the objects dir We assume that everything under GIT_DIR/objects/ is a directory. This is not necessarily the case if some process left a stray file in there. Check beforehand if we do have a directory and ignore the entry otherwise.

272b462d

2014-05-02T09:50:15

Merge pull request #2308 from libgit2/rb/diff-update-index-stat-cache Reduce excessive OID calculation for diff and stat

9862ef8e

2014-05-02T09:42:07

Merge pull request #2310 from libgit2/cmn/commit-create-safe commit: safer commit creation with reference update

0f603132

2014-05-01T14:47:33

Improve handling of fake home directory There are a few tests that set up a fake home directory and a fake GLOBAL search path so that we can test things in global ignore or attribute or config files. This cleans up that code to work more robustly even if there is a test failure. This also fixes some valgrind warnings where scanning search paths for separators could end up doing a little bit of sketchy data access when coming to the end of search list.

bc91347b

2014-04-30T11:16:31

Fix remaining init_options inconsistencies There were a couple of "init_opts()" functions a few more cases of structure initialization that I somehow missed.

702efc89

2014-04-30T10:57:42

Make init_options fns use unsigned ints and macro Use an unsigned int for the version and add a helper macro so the code is simplified (and so the error message is a common string).

9c8ed499

2014-04-29T15:05:58

Remove trace / add git_diff_perfdata struct + api

7a2e56a3

2014-04-29T14:30:15

Get rid of redundant git_diff_options_init fn Since git_diff_init_options was introduced, remove this old fn.

b23b112d

2014-04-29T11:29:49

Add payloads, bitmaps to trace API This is a proposed adjustment to the trace APIs. This makes the trace levels into a bitmask so that they can be selectively enabled and adds a callback-level payload, plus a message-level payload. This makes it easier for me to a GIT_TRACE_PERF callbacks that are simply bypassed if the PERF level is not set.

cd424ad5

2014-04-28T16:39:53

Add GIT_STATUS_OPT_UPDATE_INDEX and use trace API This adds an option to refresh the stat cache while generating status. It also rips out the GIT_PERF stuff I had an makes use of the trace API to keep statistics about what happens during diff.

94fb4aad

2014-04-28T14:48:41

Add diff option to update index stat cache When diff is scanning the working directory, if it finds a file where it is not sure if the index entry matches the working dir, it will recalculate the OID (which is pretty expensive). This adds a new flag to diff so that if the OID calculation finds that the file actually has not changed (i.e. just the modified time was altered or such), then it will refresh the stat cache in the index so that future calls to diff will not have to check the oid again.

0fc8e1f6

2014-04-28T14:34:55

Lay groundwork for updating stat cache in diff This reorganized the diff OID calculation to make it easier to correctly update the stat cache during a diff once the flags to do so are enabled. This includes marking the path of a git_index_entry as const so we can make a "fake" git_index_entry with a "const char *" path and not get warnings. I was a little surprised at how unobtrusive this change was, but I think it's probably a good thing.

8ef4e11a

2014-04-28T14:16:26

Skip diff oid calc when size definitely changed When we think the stat cache in the index seems valid and the size or mode of a file has definitely changed, then don't bother trying to recalculate the OID of the workdir bits to confirm that it is modified - just accept that it is modified. This can result in files that show as modified with no actual diff, but the behavior actually appears to match Git on the command line. This also includes a minor optimization to not perform a submodule lookup on the ".git" directory itself.

240f4af3

2014-04-28T14:04:29

Add build option for diff internal statistics

6a1ca96e

2014-05-02T17:14:04

Temporary fix for Travis CI builds See https://github.com/libgit2/libgit2/pull/2321#issuecomment-42039673 We may rollback once we found something more reliable

d19b2f9f

2014-05-01T12:46:46

Make ** pattern eat trailing slash This allows "foo/**/*.html" to match "foo/file.html"

9d878fc4

2014-05-01T01:23:10

Merge pull request #2304 from jacquesg/solaris Solaris!

183aa4f8

2014-04-30T17:46:53

Check for NULL before passing it to vsnprintf

6b05240c

2014-04-27T19:44:20

strcasecmp is in <strings.h>

90a4340a

2014-04-30T11:47:58

cygwin also doesn't have qsort_r

217c029b

2014-04-09T14:08:22

commit: safer commit creation with reference update The current version of the commit creation and amend function are unsafe to use when passing the update_ref parameter, as they do not check that the reference at the moment of update points to what the user expects. Make sure that we're moving history forward when we ask the library to update the reference for us by checking that the first parent of the new commit is the current value of the reference. We also make sure that the ref we're updating hasn't moved between the read and the write. Similarly, when amending a commit, make sure that the current tip of the branch is the commit we're amending.

36a61518

2014-04-29T13:28:16

MidnightBSD may also not have strnlen

38d338b2

2014-04-26T18:15:39

pack-objects: always write out the status in write_one() Make sure we set the output parameter to a value.

c7f86efb

2014-04-26T18:04:43

zstream: grow based on used memory rather than allocated When deflating data, we might need to grow the buffer. Currently we add a guess on top of the currently-allocated buffer size. When we re-use the buffer, it already has some memory allocated; adding to that means that we always grow the buffer regardless of how much we need to use. Instead, increase on top of the currently-used size. This still leaves us with the allocated size of the largest object we compress, but it's a minor pain compared to unbounded growth. This fixes #2285.

4f9d5414

2014-04-26T14:29:18

refdb: fix typo and wording

424222f4

2014-04-25T15:49:26

Filter: Make sure to release local on error

8443ed6c

2014-04-25T02:10:19

Merge pull request #2284 from jacquesg/push-progress-callback Fire progress and update tips callbacks also for pushes.

2ad51b81

2014-04-25T02:04:12

Merge pull request #2241 from libgit2/rb/stash-skip-submodules Improve stash and checkout for ignored + untracked items

af9eeac9

2014-04-24T16:20:08

Merge pull request #2294 from ethomson/merge_checkout_strategy Merge checkout strategy

a409acef

2014-04-24T11:59:50

Handle explicitly ignored dir slightly differently When considering status of untracked directories, if we find an explicitly ignored item, even if it is a directory, treat the parent as an IGNORED item. It was accidentally being treated as an EMPTY item because we were not looking into the ignored subdir.

bdc82e1c

2014-04-24T14:08:29

fetchhead: deal with quotes in branch names The current FETCH_HEAD parsing code assumes that a quote must end the branch name. Git however allows for quotes as part of a branch name, which causes us to consider the FETCH_HEAD file as invalid. Instead of searching for a single quote char, search for a quote char followed by SP, which is not a valid part of a ref name.

a4e2c36a

2014-04-23T19:40:21

merge: checkout default shouldn't clobber given

26564d80

2014-04-23T19:26:58

merge: default checkout strategy for should be SAFE

219c89d1

2014-04-23T16:28:45

Treat ignored, empty, and untracked dirs different In the iterator, distinguish between ignores and empty directories so that diff and status can ignore empty directories, but checkout and stash can treat them as untracked items.

212b6205

2014-04-23T09:27:15

Merge pull request #2291 from ethomson/patch_binary patch: emit deflated binary patches (optionally)

5ca410b9

2014-04-23T07:13:49

Merge pull request #2283 from phkelley/win32_fs Win32: UTF-8 <-> WCHAR conversion overhaul

7110000d

2014-04-22T10:21:19

React to feedback for UTF-8 <-> WCHAR and reparse work

37da3685

2014-04-22T21:51:54

Make checkout match diff for untracked/ignored dir When diff finds an untracked directory, it emulates Git behavior by looking inside the directory to see if there are any untracked items inside it. If there are only ignored items inside the dir, then diff considers it ignored, even if there is no direct ignore rule for it. Checkout was not copying this behavior - when it found an untracked directory, it just treated it as untracked. Unfortunately, when combined with GIT_CHECKOUT_REMOVE_UNTRACKED, this made is seem that checkout (and stash, which uses checkout) was removing ignored items when you had only asked it to remove untracked ones. This commit moves the logic for advancing past an untracked dir while scanning for non-ignored items into an iterator helper fn, and uses that for both diff and checkout.

e349ed50

2014-04-22T14:58:33

patch: emit binary patches (optionally)

24d17de2

2014-04-02T12:07:27

Make stash and checkout ignore contained repos To emulate git, stash should not remove untracked git repositories inside the parent repo, and checkout's REMOVE_UNTRACKED should also skip over these items. `git stash` actually prints a warning message for these items. That should be possible with a checkout notify callback if you wanted to, although it would require a bit of extra logic as things are at the moment.

e60883c8

2014-04-22T12:59:31

Replace math fns with simpler integer math

8d09efa2

2014-04-22T12:33:27

Use git_diff_get_stats in example/diff + refactor This takes the `--stat` and related example options in the example diff.c program and converts them to use the `git_diff_get_stats` API which nicely formats stats for you. I went to add bar-graph scaling to the stats formatter and noticed that the `git_diff_stats` structure was holding on to all of the `git_patch` objects. Unfortunately, each of these objects keeps the full text of the diff in memory, so this is very expensive. I ended up modifying `git_diff_stats` to keep just the data that it needs to keep and allowed it to release the patches. Then, I added width scaling to the output on top of that. In making the diff example program match 'git diff' output, I ended up removing an newline from the sumamry output which I then had to compensate for in the email formatting to match the expectations. Lastly, I went through and refactored the tests to use a couple of helper functions and reduce the overall amount of code there.

12e422a0

2014-04-21T16:08:05

Some doc and examples/diff.c changes I was playing with "git diff-index" and wanted to be able to emulate that behavior a little more closely with the diff example. Also, I wanted to play with running `git_diff_tree_to_workdir` directly even though core Git doesn't exactly have the equivalent, so I added a command line option for that and tweaked some other things in the example code. This changes a minor output thing in that the "raw" print helper function will no longer add ellipses (...) if the OID is not actually abbreviated.

bc0a6198

2014-04-19T15:52:58

transports: allow the creds callback to say it doesn't exist Allow the credentials callback to return GIT_PASSTHROUGH to make the transports code behave as though none was set. This should make it easier for bindings to behave closer to the C code when there is no credentials callback set at their level.

2efd7df6

2014-04-19T15:34:12

remote: provide read access to the callback structure This should make it easier for bindings to dynamically override their own callbacks.

dac95e4a

2014-04-22T11:04:35

Merge pull request #2287 from libgit2/rb/moar-coverity-fixes Fix some issues from the last Coverity scan

65477db1

2014-04-21T23:32:31

Handle win32 reparse points properly

17ef678c

2014-04-21T11:55:57

Fix some coverity-found issues

bd101a7e

2014-04-21T11:54:54

Fix reset for staged deletes

321d377a

2014-04-21T17:02:05

Fire update_tips callback also for pushes.

78399310

2014-04-21T16:38:52

attrcache: fix use-after-free Reported by coverity.

8b686b31

2014-04-21T15:25:19

Correct argument order of git__calloc()

be6996b7

2014-04-21T15:25:02

It is safe to free() a NULL pointer

a15d3537

2014-04-21T15:48:05

sysdir: free the path if we cannot find the file Returning an error cleared the buf, but this operation does not free the memory associated with it. Use git_buf_free() instead.

48e60ae7

2014-04-21T11:23:29

Don't redefine the same callback types, their signatures may change

98020d3a

2014-04-21T10:55:37

Rename progress callback to sideband_progress

4f62163e

2014-04-20T22:06:05

Check the return codes of remote callbacks. The user may have requested that the operation be cancelled.

9effa2fb

2014-04-20T19:19:13

Fire progress callbacks also for pushes. It's not very useful to only know that a pre-receive hook has declined a push, you probably want to know why.

c2c81615

2014-04-19T18:05:31

Win32: UTF-8 <-> WCHAR conversion overhaul

bfc50f83

2014-04-19T18:59:09

Merge pull request #2273 from jacquesg/ssh-interactive Add support for SSH keyboard-interactive authentication

7b0f8ba9

2014-04-19T13:05:32

Merge pull request #2279 from libgit2/rb/moar-eegnöre-fîxés Fix several ignore and attribute file behavior bugs

ac16bd0a

2014-04-18T15:45:59

Minor fixes Only apply LEADING_DIR pattern munging to patterns in ignore and attribute files, not to pathspecs used to select files to operate on. Also, allow internal macro definitions to be evaluated before loading all external ones (important so that external ones can make use of internal `binary` definition).

916fcbd6

2014-04-18T14:42:40

Fix ignore difference from git with trailing /* Ignore patterns that ended with a trailing '/*' were still needing to match against another actual '/' character in the full path. This is not the same behavior as core Git. Instead, we strip a trailing '/*' off of any patterns that were matching and just take it to imply the FNM_LEADING_DIR behavior.

e3a2a04c

2014-04-18T14:29:58

Preload attribute files that may contain macros There was a latent bug where files that use macro definitions could be parsed before the macro definitions were loaded. Because of attribute file caching, preloading files that are going to be used doesn't add a significant amount of overhead, so let's always preload any files that could contain macros before we assemble the actual vector of files to scan for attributes.

a622ff17

2014-04-18T20:05:28

Only zero sensitive information on destruction (and memory actually allocated by us)

6a0956e5

2014-04-18T10:32:35

Pop ignore only if whole relative path matches When traversing the directory structure, the iterator pushes and pops ignore files using a vector. Some directories don't have ignore files, so it uses a path comparison to decide when it is right to actually pop the last ignore file. This was only comparing directory suffixes, though, so a subdirectory with the same name as a parent could result in the parent's .gitignore being popped off the list ignores too early. This changes the logic to compare the entire relative path of the ignore file.

386777fd

2014-04-18T09:26:38

Merge pull request #2213 from ethomson/safecrlf Introduce core.safecrlf handling

8ec0a552

2014-04-18T00:49:07

Make git_cred_ssh_custom_new() naming more consistent

478408c0

2014-04-17T23:03:44

Introduce git_cred_ssh_interactive_new() This allows for keyboard-interactive based SSH authentication

bd270b70

2014-04-18T17:08:10

cred: tighten username rules The ssh-specific credentials allow the username to be missing. The idea being that the ssh transport will then use the username provided in the url, if it's available. There are two main issues with this. The credential callback already knows what username was provided by the url and needs to figure out whether it wants to ask the user for it or it can reuse it, so passing NULL as the username means the credential callback is suspicious. The username provided in the url is not in fact used by the transport. The only time it even considers it is for the user/pass credential, which asserts the existence of a username in its constructor. For the ssh-specific ones, it passes in the username stored in the credential, which is NULL. The libssh2 macro we use runs strlen() against this value (which is no different from what we would be doing ourselves), so we then crash. As the documentation doesn't suggest to leave out the username, assert the need for a username in the code, which removes this buggy behavior and removes implicit state. git_cred_has_username() becomes a blacklist of credential types that do not have a username. The only one at the moment is the 'default' one, which is meant to call up some Microsoft magic.

2280b388

2014-04-09T13:17:51

config: share the strmap on snapshot Now that our strmap is no longer modified but replaced, we can use the same strmap for the snapshot's values and it will be freed when we don't need it anymore.

4b99b8f5

2014-04-09T13:08:01

config: refcount the values map This is mostly groundwork to let us re-use the map in the snapshots.

523032cd

2014-03-31T09:58:44

config: refresh before reading a value With the isolation of complex reads, we can now try to refresh the on-disk file before reading a value from it. This changes the semantics a bit, as before we could be sure that a string we got from the configuration was valid until we wrote or refreshed. This is no longer the case, as a read can also invalidate the pointer.

eaf37034

2014-03-31T08:53:56

config: refresh the values on write When writing out, parse the resulting file instead of adding or replacing the value locally. This has the effect of reading external changes as well.

8c1f4ab4

2014-04-09T12:26:53

config: refresh on delete When we delete an entry, we also want to refresh the configuration to catch any changes that happened externally. This allows us to simplify the logic, as we no longer need to delete these variables internally. The whole state will be refreshed and the deleted entries won't be there.

0500a1ef

2014-03-31T08:32:45

config: use a snapshot for the iterator

bd95f836

2014-03-31T08:08:17

config: split out the refresh step This will be used by the writing commands in a later step.

c047317e

2014-03-18T17:54:32

config: make refresh atomic Current code sets the active map to a new one and builds it whilst it's active. This is a race condition with someone else trying to access the same config. Instead, let's build up our new map and swap the active and new one.

29c4cb09

2014-03-15T03:53:36

Use config snapshotting This way we can assume we have a consistent view of the config situation when we're looking up remote, branch, pack-objects, etc.

55ebd7d3

2014-03-13T17:11:34

config: implement config snapshotting In order to have consistent views of the config files for remotes, submodules et al. and a configuration that represents what is currently stored on-disk, we need a way to provide a view of the configuration that does not change. The goal here is to provide the snapshotting part by creating a read-only copy of the state of the configuration at a particular point in time, which does not change when a repository's main config changes.

28fd7206

2014-04-18T12:33:19

Merge pull request #2108 from libgit2/rb/threadsafe-index-iterator Make index iterator thread safe

2bed3553

2014-04-18T00:34:04

cherry-pick: terminate the commit id string We treat this as a NUL-terminated string, so make sure that we add the terminator.

83038272

2014-04-17T14:35:29

Some memory leak fixes

823c0e9c

2014-04-17T11:53:13

Fix broken logic for attr cache invalidation The checks to see if files were out of date in the attibute cache was wrong because the cache-breaker data wasn't getting stored correctly. Additionally, when the cache-breaker triggered, the old file data was being leaked.

e6e8530a

2014-04-14T12:31:17

Lock attribute file while reparsing data I don't love this approach, but achieving thread-safety for attribute and ignore data while reloading files would require a larger rewrite in order to avoid this. If an attribute or ignore file is out of date, this holds a lock on the file while we are reloading the data so that another thread won't try to reload the data at the same time.

ea642d61

2014-04-14T12:29:27

Fix race checking for existing index items In the threading tests, I was still seeing a race condition where the same item could end up being inserted multiple times into the index. Preserving the sorted-ness of the index outside of the `index_insert` call fixes the issue.

2e9d813b

2014-04-11T12:12:47

Fix tests with new attr cache code

7d490872

2014-04-10T22:31:01

Attribute file cache refactor This is a big refactoring of the attribute file cache to be a bit simpler which in turn makes it easier to enforce a lock around any updates to the cache so that it can be used in a threaded env. Tons of changes to the attributes and ignores code.

1fa17b5c

2014-03-14T22:01:30

Minor tree cache speedups While I was looking at the conflict cleanup code, I looked over at the tree cache code, since we clear the tree cache for each entry that gets removed and there is some redundancy there. I made some small tweaks to avoid extra calls to strchr and strlen in a few circumstances.

thodg/libgit2/src

src

Log