kmx git

Commit	Date	Message
acc573cb	2015-05-19T14:12:40	Merge pull request #3109 from libgit2/cmn/index-use-diff Use a diff for iteration in index_update_all and index_add_all
2b2dfe80	2015-05-12T12:07:33	index: include TYPECHANGE in the diff Without this option, we would not be able to catch exec bit changes.
041ad7db	2015-05-14T10:34:05	push: add tests for the push negotiation callback The functionality was meged without including tests, so let's add them now.
16d742eb	2015-05-13T21:43:58	Merge pull request #3119 from ethomson/ignore Attributes: don't match files for folders
cd430bc7	2015-05-13T14:26:20	Merge pull request #3103 from libgit2/cmn/local-push-message Use the packbuilder in local push
882cc37f	2015-05-13T10:56:55	attr tests: make explicit our dir/file match tests
3e529e9d	2015-05-13T16:12:45	Fix a few leaks The interesting one is the notification macro, which was returning directly on a soft-abort instead of going through the cleanup.
6cd92193	2015-05-13T09:07:15	Merge pull request #3115 from libgit2/cmn/clone-submodule submodule: add test initialising and cloning a repo
0bc3d56d	2015-05-07T16:12:36	tests: don't push to our resources A couple of tests use the wrong remote to push to. We did not notice up to now because the local push would copy individual objects, and those already existed, so it became a no-op. Once we made local push create the packfile, it became noticeable that there was a new packfile where it didn't belong.
a4b6452a	2015-04-23T06:55:29	remote: remove git_remote_save() It has now become a no-op, so remove the function and all references to it.
77254990	2015-04-23T06:51:34	remote: remove live changing of refspecs The base refspecs changing can be a cause of confusion as to what is the current base refspec set and complicate saving the remote's configuration. Change `git_remote_add_{fetch,push}()` to update the configuration instead of an instance. This finally makes `git_remote_save()` a no-op, it will be removed in a later commit.
35a8a8c5	2015-04-22T17:29:20	remote: move the tagopt setting to the fetch options This is another option which we should not be keeping in the remote, but is specific to each particular operation.
3eff2a57	2015-04-22T16:11:10	remote: move the update_fetchhead setting to the options While this will rarely be different from the default, having it in the remote adds yet another setting it has to keep around and can affect its behaviour. Move it to the options.
058b753c	2015-04-22T15:45:21	remote: move the transport ctor to the callbacks Instead of having it set in a different place from every other callback, put it the main structure. This removes some state from the remote and makes it behave more like clone, where the constructors are passed via the options.
22261344	2015-04-22T04:38:08	remote: remove url and pushurl from the save logic As a first step in removing the repository-saving logic, don't allow chaning the url or push url from a remote object, but change the configuration on the configuration immediately.
8f0104ec	2015-04-21T22:10:36	Remove the callbacks struct from the remote Having the setting be different from calling its actions was not a great idea and made for the sake of the wrong convenience. Instead of that, accept either fetch options, push options or the callbacks when dealing with the remote. The fetch options are currently only the callbacks, but more options will be moved from setters and getters on the remote to the options. This does mean passing the same struct along the different functions but the typical use-case will only call git_remote_fetch() or git_remote_push() and so won't notice much difference.
9486d203	2015-05-12T13:07:59	attr test: test a file beneath ignored folder
97fb9ac7	2015-05-12T13:54:28	attr: test that a file is not ignored for a folder When a .gitignore specifies some folder "foo/", ensure that a file with the same name "foo" is not ignored.
adad5181	2015-05-12T13:52:47	attr: regression tests for ignore matching Ensure that when examining a .gitignore in a subdirectory, we do not erroneously apply the paths contained therein to the root of the repository. (Fixed in c02a0e4).
1e44ea97	2015-05-12T11:13:41	submodule: add test initialising and cloning a repo We have a few tests checking each step, but we do not yet have a test which tests the documented workflow for creating a submodule, namely `setup_add` followed by cloning into it, followed by `add_finalize`. Add such a test to protect against regressions in this workflow.
4ea3eebf	2015-05-01T18:34:38	stash_apply: provide progress callbacks
19c80a6f	2015-05-01T18:07:10	stash_apply: provide its own options structure
24961668	2015-04-20T20:06:02	stash: test checkout notify callbacks
f78bb2af	2015-03-18T01:54:04	stash: return GIT_EMERGECONFLICT on merge conflict
f0957589	2015-03-04T23:55:42	stash: refactor to use merge_iterators
d0dd3fce	2015-02-18T15:16:05	stash apply: check out a tree, not piecewise
35d39761	2015-03-18T00:25:18	index: introduce git_index_read_index
9ebb5a3f	2015-02-18T22:53:40	merge: merge iterators
bf8dd3f5	2014-11-14T12:32:47	Added git_stash_apply() and git_stash_pop() APIs
074d323f	2015-05-04T15:23:40	Merge pull request #3079 from ethomson/config Configuration changes for handling multiple of the same sections
d6b7e404	2015-05-04T07:36:21	config: test all multivars are updated If a multivar exists within two sections (of the same name) then they should both be updated in a `set_multivar`. Ensure that this is the case.
0daf998d	2015-04-27T16:31:18	config: use wildcard in test instead of empty expr
63c0cc65	2015-04-27T16:29:00	config: cleanup some now-unused variables
5a70df94	2015-04-21T15:57:20	Test setting config var under duplicate header. Add a test that exposes a bug in config_write. It is valid to have multiple separate headers for the same config section, but config_write will exit after finding the first matching section in certain situations. This test proves that config_write will duplicate a variable that already exists instead of overwriting it if the variable is defined under a duplicate section header.
bf99390e	2015-04-23T16:54:36	config: examine whole file when writing Previously we would try to be clever when writing the configuration file and try to stop parsing (and simply copy the rest of the old file) when we either found the value we were trying to write, or when we left the section that value was in, the assumption being that there was no more work to do. Regrettably, you can have another section with the same name later in the file, and we must cope with that gracefully, thus we read the whole file in order to write a new file. Now, writing a file looks even more than reading. Pull the config parsing out into its own function that can be used by both reading and writing the configuration.
f79c7322	2015-04-23T12:00:05	config: test overwriting cvar in multiple regions
7ee61b8e	2015-04-21T17:18:21	config: ensure we can write to an empty file
cd79d99a	2015-04-23T15:58:53	checkout test: better case-insensitive test on Mac On Mac OS, `realpath` is deficient in determining the actual filename on-disk as it will simply provide the string you gave it if that file exists, instead of returning the filename as it exists. Instead we must read the directory entries for the parent directory to get the canonical filename.
f286e271	2015-03-31T16:06:33	status test: always test the new file path
64842d87	2015-04-23T09:21:33	checkout test: only run icase on icase platform
05f69012	2015-03-31T16:28:13	checkout: remove blocking dir when FORCEd
3520c970	2015-03-27T15:39:28	Revert "Always checkout with case sensitive iterator" This reverts commit 40d791545abfb3cb71553a27dc64129e1a9bec28.
6dfd8506	2015-04-01T15:23:37	checkout test: ensure we write to casechanged dir Ensure that on a case insensitive filesystem that we can checkout into some folder 'FOLDER' that exists on disk, even if the target of the checkout is a different case (eg 'folder').
431f9807	2015-03-27T15:33:44	checkout test: ignore unstaged case-changing renames On Windows, you might sloppily rewrite a file (or have a sloppy text editor that does it for you) and accidentally change its case. (eg, "README" -> "readme"). Git ignores this accidental case changing rename during checkout and will happily write the new content to the file despite the name change. We should, too.
cfc2e56d	2015-05-04T11:16:52	Merge pull request #3087 from ethomson/pr/3054 Performance Improvements to Status on Windows
5c387b6c	2015-04-29T14:31:59	git_path_diriter: next shouldn't take path ptr The _next method shouldn't take a path pointer (and a path_len pointer) as 100% of current users use the full path and ignore the filename. Plus let's add some docs and a unit test.
07bbc045	2015-04-29T11:58:10	git_path_dirload: use git_path_diriter
cbe8a61d	2015-05-01T11:28:54	Merge pull request #3059 from libgit2/cmn/negotiation-notify [WIP/RFC] push: report the update plan to the caller
cf2380a6	2015-04-30T14:17:05	Fixed unused warning in tests/rebase/merge.c
4c09e19a	2015-03-30T14:07:44	Improvements to ignore performance on Windows. Minimizing the number directory and file opens, minimizes the amount of IO thus reducing the overall cost of performing ignore operations.
65808406	2015-04-24T02:46:49	Merge pull request #3063 from ethomson/config_validate_name Validate configuration keys
24e53d2f	2015-03-19T09:55:20	Rename GIT_SSL to GIT_OPENSSL This is what it's meant all along, but now we actually have multiple implementations, it's clearer to use the name of the library.
6bb54cbf	2014-11-02T13:23:32	Add a SecureTransport TLS channel As an alternative to OpenSSL when we're on OS X. This one can actually take advantage of stacking the streams.
6dc55872	2015-04-21T17:18:21	config: ensure we can write to an empty file
23fb4004	2015-04-21T12:49:57	config: test that we validate the key
69c333f9	2015-04-23T17:23:04	Merge pull request #3064 from rcorre/config-write-fix config_write -- handle duplicate section headers when deleting entries
63e8b08d	2015-04-23T17:08:10	Merge branch 'attr-ignore'
c6bf03b4	2015-03-28T18:37:15	Add failing subdirectory gitignore attr test.
27fa7477	2015-04-23T10:54:08	Merge pull request #3032 from jfultz/index-file-modes Fix git_checkout_tree() to do index filemodes correctly on Windows.
fc6f044e	2015-04-21T20:02:24	Fix for Issue #3023 tests fail with no network Moved offending tests from network to online so they will get skipped when there is a lack of network connectivity: -test_online_remotes__single_branch -test_online_remotes__restricted_refspecs
f56a417d	2015-04-16T15:20:33	Specify mock config file content in test. Instead of using a config file in resources, include the config file content to be tested directly in the test.
a060cccc	2015-04-16T10:53:22	Unittest to validate config entry deletion bug. Add a unittest to validate bug #3043, where a duplicate empty config header could cause deletion of a config entry to fail silently. The bug is currently unresolved and this test will fail.
7636f740	2015-04-21T14:38:23	Merge pull request #2992 from ethomson/rebase_fixes Rebase fixes
d3282680	2015-04-20T23:41:04	Fix index-adding functions to know when to trust filemodes. The idea...sometimes, a filemode is user-specified via an explicit git_index_entry. In this case, believe the user, always. Sometimes, it is instead built up by statting the file system. In those cases, go with the existing logic we have to determine whether the file system supports all filemodes and symlinks, and make the best guess. On file systems which have full filemode and symlink support, this commit should make no difference. On others (most notably Windows), this will fix problems things like: * git_index_add and git_index_add_frombuffer() should be believed. * As a consequence, git_checkout_tree should make the filemodes in the index match the ones in the tree. * And diffs with GIT_DIFF_UPDATE_INDEX don't write the wrong filemodes. * And merges, and probably other downstream stuff now fixed, too. This makes my previous changes to checkout.c unnecessary, so they are now reverted. Also, added a test for index_entry permissions from git_index_add and git_index_add_frombuffer, both of which failed before these changes.
94c988f6	2015-04-20T17:19:08	rebase: include checkout opts within rebase opts
78382358	2015-03-17T17:21:11	rebase: test checkout options for rebase
f3a199dd	2015-03-17T15:53:04	rebase: init and open take a rebase_options `git_rebase_init` and `git_rebase_open` should take a `git_rebase_options` and use it for future rebase operations on that `rebase` object.
5ae38538	2015-03-17T11:47:16	rebase: take `checkout_options` where appropriate
eaf0d688	2015-03-17T17:53:07	rebase: block rebase_commit with unstaged changes
49b3ddf2	2015-03-17T17:45:31	rebase: commit should return GIT_EUNMERGED git_rebase_commit should return `GIT_EUNMERGED` when unmerged items exist in the index, per the documentation. Test that this is correct.
30640aa9	2015-03-17T10:04:08	rebase: identify a rebase that has not started In `git_rebase_operation_current()`, indicate when a rebase has not started (with `GIT_REBASE_NO_OPERATION`) rather than conflating that with the first operation being in-progress.
e009a705	2015-04-20T00:22:20	config_file: comment char can be invalid escape Don't assume that comment chars are comment chars, they may be (an attempt to be escaped). If so, \; is not a valid escape sequence, complain.
7f2e61f3	2015-04-19T23:55:02	config_file: parse multilines generously Combine unquoting and multiline detection to avoid ambiguity when parsing.
efc2fec5	2015-04-19T00:55:00	push: report the update plan to the caller It can be useful for the caller to know which update commands will be sent to the server before the packfile is pushed up. git does this via the pre-push hook. We don't have hooks, but as it adds introspection into what is happening, we can add a callback which performs the same function.
4c02d393	2015-04-17T16:57:26	Merge pull request #3016 from pks-t/ignore-exclude-fix ignore: fix negative ignores without wildcards.
a0e652d2	2015-04-17T12:35:41	Merge pull request #2999 from pks-t/submodule-set-url Implement git_submodule_set_branch.
e3737a41	2015-04-17T10:30:33	Fix memleak in test/core/mkdir reported by CRTDBG
4f358603	2015-03-24T16:33:50	ignore: fix negative ignores without wildcards.
6f80bf4a	2015-04-16T19:12:28	Merge pull request #3037 from libgit2/cmn/hide-then-push Handle hide-then-push in the revwalk
fa7281db	2015-04-16T18:26:47	Merge pull request #3039 from jeffhostetler/jeffhostetler/msvc_crtdbg Add memory leak detection/reporting using MSVC CRTDBG facility.
d06c589f	2015-04-10T06:15:06	Add MSVC CRTDBG memory leak reporting.
129788a6	2015-03-18T11:45:18	Implement git_submodule_set_branch.
623fbd93	2015-04-10T11:38:07	Merge pull request #2974 from libgit2/cmn/clone-everything Make sure to pack referenced objects for non-branches
63af449e	2015-04-10T11:33:14	Merge pull request #3030 from linquize/symlink_supported If work_dir is not specified, use repo_dir to test if symlink is supported
129022ee	2015-04-10T09:36:38	Fix checking of return value for regcomp. The regcomp function returns a non-zero value if compilation of a regular expression fails. In most places we only check for negative values, but positive values indicate an error, as well. Fix this tree-wide, fixing a segmentation fault when calling git_config_iterator_glob_new with an invalid regexp.
5a503fff	2015-04-08T23:42:36	revwalk: add failing test for hiding and then pushing a commit When we hide a commit which we later push into the revwalk, we do not handle this well and return commits which we should not.
08e1fd65	2015-04-07T14:44:08	describe: only abort without tags if fallback is not allowed. When no reference names could be found we did error out when trying to describe a commit. This is wrong, though, when the option to fall back to a commit's object ID is set.
67db2bde	2015-03-10T12:02:45	Fix git_checkout_tree() to do index filemodes correctly on Windows. git_checkout_tree() has some fallback behaviors for file systems which don't have full support of filemodes. Generally works fine, but if a given file had a change of type from a 0644 to 0755 (i.e., you add executable permissions), the fallback behavior incorrectly triggers when writing hte updated index. This would cause a git_checkout_tree() command, even with the GIT_CHECKOUT_FORCE option set, to leave a dirty index on Windows. Also added checks to an existing test to catch this case.
7c2a2172	2015-04-04T00:29:01	Test: Create repo in while current dir is readonly and checkout symlink
de355f23	2015-03-25T13:14:28	Merge pull request #3011 from ethomson/filter_zero_tempbuf Clear temporary buffer when filtering
7c2b9e06	2015-03-22T19:06:53	Illustrate bad checkout on Windows
78db0239	2015-03-24T20:58:00	squash some leaks
95d1624b	2015-03-24T08:34:12	Merge pull request #2947 from libgit2/cmn/notes-buf note: use a git_buf to return the default namespace
89ba9f1a	2015-03-18T13:17:04	Merge pull request #2967 from jacquesg/merge-whitespace Allow merges of files (and trees) with whitespace problems/fixes
7568bdf4	2015-03-18T05:04:50	Merge pull request #2993 from ethomson/clar_update clar: update to 08f434d
83ad46f7	2015-03-18T04:59:16	Merge remote-tracking branch 'ethomson/submodule_8dot3'
4c2e6b1e	2015-03-17T23:35:52	Merge pull request #2985 from claudiuolteanu/patch-1 Lower case the include directive of windows header
08c29c44	2015-03-17T19:04:48	clar: update to 08f434d
d23fb5c9	2015-03-12T01:09:13	clone: add failing test for local transport with a tag When there is a tag, we must make sure that we get all referenced objects from this tag as well. This failing test shows that e.g. when there is a tagged tree, we insert the top tree but do not descend, thus causing the clone to have broken links.
385449b1	2015-03-04T01:23:20	note: use a git_buf to return the default namespace The caller has otherwise no way to know how long the string will be allocated or ability to free it. This fixes #2944.

acc573cb

2015-05-19T14:12:40

Merge pull request #3109 from libgit2/cmn/index-use-diff Use a diff for iteration in index_update_all and index_add_all

2b2dfe80

2015-05-12T12:07:33

index: include TYPECHANGE in the diff Without this option, we would not be able to catch exec bit changes.

041ad7db

2015-05-14T10:34:05

push: add tests for the push negotiation callback The functionality was meged without including tests, so let's add them now.

16d742eb

2015-05-13T21:43:58

Merge pull request #3119 from ethomson/ignore Attributes: don't match files for folders

cd430bc7

2015-05-13T14:26:20

Merge pull request #3103 from libgit2/cmn/local-push-message Use the packbuilder in local push

882cc37f

2015-05-13T10:56:55

attr tests: make explicit our dir/file match tests

3e529e9d

2015-05-13T16:12:45

Fix a few leaks The interesting one is the notification macro, which was returning directly on a soft-abort instead of going through the cleanup.

6cd92193

2015-05-13T09:07:15

Merge pull request #3115 from libgit2/cmn/clone-submodule submodule: add test initialising and cloning a repo

0bc3d56d

2015-05-07T16:12:36

tests: don't push to our resources A couple of tests use the wrong remote to push to. We did not notice up to now because the local push would copy individual objects, and those already existed, so it became a no-op. Once we made local push create the packfile, it became noticeable that there was a new packfile where it didn't belong.

a4b6452a

2015-04-23T06:55:29

remote: remove git_remote_save() It has now become a no-op, so remove the function and all references to it.

77254990

2015-04-23T06:51:34

remote: remove live changing of refspecs The base refspecs changing can be a cause of confusion as to what is the current base refspec set and complicate saving the remote's configuration. Change `git_remote_add_{fetch,push}()` to update the configuration instead of an instance. This finally makes `git_remote_save()` a no-op, it will be removed in a later commit.

35a8a8c5

2015-04-22T17:29:20

remote: move the tagopt setting to the fetch options This is another option which we should not be keeping in the remote, but is specific to each particular operation.

3eff2a57

2015-04-22T16:11:10

remote: move the update_fetchhead setting to the options While this will rarely be different from the default, having it in the remote adds yet another setting it has to keep around and can affect its behaviour. Move it to the options.

058b753c

2015-04-22T15:45:21

remote: move the transport ctor to the callbacks Instead of having it set in a different place from every other callback, put it the main structure. This removes some state from the remote and makes it behave more like clone, where the constructors are passed via the options.

22261344

2015-04-22T04:38:08

remote: remove url and pushurl from the save logic As a first step in removing the repository-saving logic, don't allow chaning the url or push url from a remote object, but change the configuration on the configuration immediately.

8f0104ec

2015-04-21T22:10:36

Remove the callbacks struct from the remote Having the setting be different from calling its actions was not a great idea and made for the sake of the wrong convenience. Instead of that, accept either fetch options, push options or the callbacks when dealing with the remote. The fetch options are currently only the callbacks, but more options will be moved from setters and getters on the remote to the options. This does mean passing the same struct along the different functions but the typical use-case will only call git_remote_fetch() or git_remote_push() and so won't notice much difference.

9486d203

2015-05-12T13:07:59

attr test: test a file beneath ignored folder

97fb9ac7

2015-05-12T13:54:28

attr: test that a file is not ignored for a folder When a .gitignore specifies some folder "foo/", ensure that a file with the same name "foo" is not ignored.

adad5181

2015-05-12T13:52:47

attr: regression tests for ignore matching Ensure that when examining a .gitignore in a subdirectory, we do not erroneously apply the paths contained therein to the root of the repository. (Fixed in c02a0e4).

1e44ea97

2015-05-12T11:13:41

submodule: add test initialising and cloning a repo We have a few tests checking each step, but we do not yet have a test which tests the documented workflow for creating a submodule, namely `setup_add` followed by cloning into it, followed by `add_finalize`. Add such a test to protect against regressions in this workflow.

4ea3eebf

2015-05-01T18:34:38

stash_apply: provide progress callbacks

19c80a6f

2015-05-01T18:07:10

stash_apply: provide its own options structure

24961668

2015-04-20T20:06:02

stash: test checkout notify callbacks

f78bb2af

2015-03-18T01:54:04

stash: return GIT_EMERGECONFLICT on merge conflict

f0957589

2015-03-04T23:55:42

stash: refactor to use merge_iterators

d0dd3fce

2015-02-18T15:16:05

stash apply: check out a tree, not piecewise

35d39761

2015-03-18T00:25:18

index: introduce git_index_read_index

9ebb5a3f

2015-02-18T22:53:40

merge: merge iterators

bf8dd3f5

2014-11-14T12:32:47

Added git_stash_apply() and git_stash_pop() APIs

074d323f

2015-05-04T15:23:40

Merge pull request #3079 from ethomson/config Configuration changes for handling multiple of the same sections

d6b7e404

2015-05-04T07:36:21

config: test all multivars are updated If a multivar exists within two sections (of the same name) then they should both be updated in a `set_multivar`. Ensure that this is the case.

0daf998d

2015-04-27T16:31:18

config: use wildcard in test instead of empty expr

63c0cc65

2015-04-27T16:29:00

config: cleanup some now-unused variables

5a70df94

2015-04-21T15:57:20

Test setting config var under duplicate header. Add a test that exposes a bug in config_write. It is valid to have multiple separate headers for the same config section, but config_write will exit after finding the first matching section in certain situations. This test proves that config_write will duplicate a variable that already exists instead of overwriting it if the variable is defined under a duplicate section header.

bf99390e

2015-04-23T16:54:36

config: examine whole file when writing Previously we would try to be clever when writing the configuration file and try to stop parsing (and simply copy the rest of the old file) when we either found the value we were trying to write, or when we left the section that value was in, the assumption being that there was no more work to do. Regrettably, you can have another section with the same name later in the file, and we must cope with that gracefully, thus we read the whole file in order to write a new file. Now, writing a file looks even more than reading. Pull the config parsing out into its own function that can be used by both reading and writing the configuration.

f79c7322

2015-04-23T12:00:05

config: test overwriting cvar in multiple regions

7ee61b8e

2015-04-21T17:18:21

config: ensure we can write to an empty file

cd79d99a

2015-04-23T15:58:53

checkout test: better case-insensitive test on Mac On Mac OS, `realpath` is deficient in determining the actual filename on-disk as it will simply provide the string you gave it if that file exists, instead of returning the filename as it exists. Instead we must read the directory entries for the parent directory to get the canonical filename.

f286e271

2015-03-31T16:06:33

status test: always test the new file path

64842d87

2015-04-23T09:21:33

checkout test: only run icase on icase platform

05f69012

2015-03-31T16:28:13

checkout: remove blocking dir when FORCEd

3520c970

2015-03-27T15:39:28

Revert "Always checkout with case sensitive iterator" This reverts commit 40d791545abfb3cb71553a27dc64129e1a9bec28.

6dfd8506

2015-04-01T15:23:37

checkout test: ensure we write to casechanged dir Ensure that on a case insensitive filesystem that we can checkout into some folder 'FOLDER' that exists on disk, even if the target of the checkout is a different case (eg 'folder').

431f9807

2015-03-27T15:33:44

checkout test: ignore unstaged case-changing renames On Windows, you might sloppily rewrite a file (or have a sloppy text editor that does it for you) and accidentally change its case. (eg, "README" -> "readme"). Git ignores this accidental case changing rename during checkout and will happily write the new content to the file despite the name change. We should, too.

cfc2e56d

2015-05-04T11:16:52

Merge pull request #3087 from ethomson/pr/3054 Performance Improvements to Status on Windows

5c387b6c

2015-04-29T14:31:59

git_path_diriter: next shouldn't take path ptr The _next method shouldn't take a path pointer (and a path_len pointer) as 100% of current users use the full path and ignore the filename. Plus let's add some docs and a unit test.

07bbc045

2015-04-29T11:58:10

git_path_dirload: use git_path_diriter

cbe8a61d

2015-05-01T11:28:54

Merge pull request #3059 from libgit2/cmn/negotiation-notify [WIP/RFC] push: report the update plan to the caller

cf2380a6

2015-04-30T14:17:05

Fixed unused warning in tests/rebase/merge.c

4c09e19a

2015-03-30T14:07:44

Improvements to ignore performance on Windows. Minimizing the number directory and file opens, minimizes the amount of IO thus reducing the overall cost of performing ignore operations.

65808406

2015-04-24T02:46:49

Merge pull request #3063 from ethomson/config_validate_name Validate configuration keys

24e53d2f

2015-03-19T09:55:20

Rename GIT_SSL to GIT_OPENSSL This is what it's meant all along, but now we actually have multiple implementations, it's clearer to use the name of the library.

6bb54cbf

2014-11-02T13:23:32

Add a SecureTransport TLS channel As an alternative to OpenSSL when we're on OS X. This one can actually take advantage of stacking the streams.

6dc55872

2015-04-21T17:18:21

config: ensure we can write to an empty file

23fb4004

2015-04-21T12:49:57

config: test that we validate the key

69c333f9

2015-04-23T17:23:04

Merge pull request #3064 from rcorre/config-write-fix config_write -- handle duplicate section headers when deleting entries

63e8b08d

2015-04-23T17:08:10

Merge branch 'attr-ignore'

c6bf03b4

2015-03-28T18:37:15

Add failing subdirectory gitignore attr test.

27fa7477

2015-04-23T10:54:08

Merge pull request #3032 from jfultz/index-file-modes Fix git_checkout_tree() to do index filemodes correctly on Windows.

fc6f044e

2015-04-21T20:02:24

Fix for Issue #3023 tests fail with no network Moved offending tests from network to online so they will get skipped when there is a lack of network connectivity: -test_online_remotes__single_branch -test_online_remotes__restricted_refspecs

f56a417d

2015-04-16T15:20:33

Specify mock config file content in test. Instead of using a config file in resources, include the config file content to be tested directly in the test.

a060cccc

2015-04-16T10:53:22

Unittest to validate config entry deletion bug. Add a unittest to validate bug #3043, where a duplicate empty config header could cause deletion of a config entry to fail silently. The bug is currently unresolved and this test will fail.

7636f740

2015-04-21T14:38:23

Merge pull request #2992 from ethomson/rebase_fixes Rebase fixes

d3282680

2015-04-20T23:41:04

Fix index-adding functions to know when to trust filemodes. The idea...sometimes, a filemode is user-specified via an explicit git_index_entry. In this case, believe the user, always. Sometimes, it is instead built up by statting the file system. In those cases, go with the existing logic we have to determine whether the file system supports all filemodes and symlinks, and make the best guess. On file systems which have full filemode and symlink support, this commit should make no difference. On others (most notably Windows), this will fix problems things like: * git_index_add and git_index_add_frombuffer() should be believed. * As a consequence, git_checkout_tree should make the filemodes in the index match the ones in the tree. * And diffs with GIT_DIFF_UPDATE_INDEX don't write the wrong filemodes. * And merges, and probably other downstream stuff now fixed, too. This makes my previous changes to checkout.c unnecessary, so they are now reverted. Also, added a test for index_entry permissions from git_index_add and git_index_add_frombuffer, both of which failed before these changes.

94c988f6

2015-04-20T17:19:08

rebase: include checkout opts within rebase opts

78382358

2015-03-17T17:21:11

rebase: test checkout options for rebase

f3a199dd

2015-03-17T15:53:04

rebase: init and open take a rebase_options `git_rebase_init` and `git_rebase_open` should take a `git_rebase_options` and use it for future rebase operations on that `rebase` object.

5ae38538

2015-03-17T11:47:16

rebase: take `checkout_options` where appropriate

eaf0d688

2015-03-17T17:53:07

rebase: block rebase_commit with unstaged changes

49b3ddf2

2015-03-17T17:45:31

rebase: commit should return GIT_EUNMERGED git_rebase_commit should return `GIT_EUNMERGED` when unmerged items exist in the index, per the documentation. Test that this is correct.

30640aa9

2015-03-17T10:04:08

rebase: identify a rebase that has not started In `git_rebase_operation_current()`, indicate when a rebase has not started (with `GIT_REBASE_NO_OPERATION`) rather than conflating that with the first operation being in-progress.

e009a705

2015-04-20T00:22:20

config_file: comment char can be invalid escape Don't assume that comment chars are comment chars, they may be (an attempt to be escaped). If so, \; is not a valid escape sequence, complain.

7f2e61f3

2015-04-19T23:55:02

config_file: parse multilines generously Combine unquoting and multiline detection to avoid ambiguity when parsing.

efc2fec5

2015-04-19T00:55:00

push: report the update plan to the caller It can be useful for the caller to know which update commands will be sent to the server before the packfile is pushed up. git does this via the pre-push hook. We don't have hooks, but as it adds introspection into what is happening, we can add a callback which performs the same function.

4c02d393

2015-04-17T16:57:26

Merge pull request #3016 from pks-t/ignore-exclude-fix ignore: fix negative ignores without wildcards.

a0e652d2

2015-04-17T12:35:41

Merge pull request #2999 from pks-t/submodule-set-url Implement git_submodule_set_branch.

e3737a41

2015-04-17T10:30:33

Fix memleak in test/core/mkdir reported by CRTDBG

4f358603

2015-03-24T16:33:50

ignore: fix negative ignores without wildcards.

6f80bf4a

2015-04-16T19:12:28

Merge pull request #3037 from libgit2/cmn/hide-then-push Handle hide-then-push in the revwalk

fa7281db

2015-04-16T18:26:47

Merge pull request #3039 from jeffhostetler/jeffhostetler/msvc_crtdbg Add memory leak detection/reporting using MSVC CRTDBG facility.

d06c589f

2015-04-10T06:15:06

Add MSVC CRTDBG memory leak reporting.

129788a6

2015-03-18T11:45:18

Implement git_submodule_set_branch.

623fbd93

2015-04-10T11:38:07

Merge pull request #2974 from libgit2/cmn/clone-everything Make sure to pack referenced objects for non-branches

63af449e

2015-04-10T11:33:14

Merge pull request #3030 from linquize/symlink_supported If work_dir is not specified, use repo_dir to test if symlink is supported

129022ee

2015-04-10T09:36:38

Fix checking of return value for regcomp. The regcomp function returns a non-zero value if compilation of a regular expression fails. In most places we only check for negative values, but positive values indicate an error, as well. Fix this tree-wide, fixing a segmentation fault when calling git_config_iterator_glob_new with an invalid regexp.

5a503fff

2015-04-08T23:42:36

revwalk: add failing test for hiding and then pushing a commit When we hide a commit which we later push into the revwalk, we do not handle this well and return commits which we should not.

08e1fd65

2015-04-07T14:44:08

describe: only abort without tags if fallback is not allowed. When no reference names could be found we did error out when trying to describe a commit. This is wrong, though, when the option to fall back to a commit's object ID is set.

67db2bde

2015-03-10T12:02:45

Fix git_checkout_tree() to do index filemodes correctly on Windows. git_checkout_tree() has some fallback behaviors for file systems which don't have full support of filemodes. Generally works fine, but if a given file had a change of type from a 0644 to 0755 (i.e., you add executable permissions), the fallback behavior incorrectly triggers when writing hte updated index. This would cause a git_checkout_tree() command, even with the GIT_CHECKOUT_FORCE option set, to leave a dirty index on Windows. Also added checks to an existing test to catch this case.

7c2a2172

2015-04-04T00:29:01

Test: Create repo in while current dir is readonly and checkout symlink

de355f23

2015-03-25T13:14:28

Merge pull request #3011 from ethomson/filter_zero_tempbuf Clear temporary buffer when filtering

7c2b9e06

2015-03-22T19:06:53

Illustrate bad checkout on Windows

78db0239

2015-03-24T20:58:00

squash some leaks

95d1624b

2015-03-24T08:34:12

Merge pull request #2947 from libgit2/cmn/notes-buf note: use a git_buf to return the default namespace

89ba9f1a

2015-03-18T13:17:04

Merge pull request #2967 from jacquesg/merge-whitespace Allow merges of files (and trees) with whitespace problems/fixes

7568bdf4

2015-03-18T05:04:50

Merge pull request #2993 from ethomson/clar_update clar: update to 08f434d

83ad46f7

2015-03-18T04:59:16

Merge remote-tracking branch 'ethomson/submodule_8dot3'

4c2e6b1e

2015-03-17T23:35:52

Merge pull request #2985 from claudiuolteanu/patch-1 Lower case the include directive of windows header

08c29c44

2015-03-17T19:04:48

clar: update to 08f434d

d23fb5c9

2015-03-12T01:09:13

clone: add failing test for local transport with a tag When there is a tag, we must make sure that we get all referenced objects from this tag as well. This failing test shows that e.g. when there is a tagged tree, we insert the top tree but do not descend, thus causing the clone to have broken links.

385449b1

2015-03-04T01:23:20

note: use a git_buf to return the default namespace The caller has otherwise no way to know how long the string will be allocated or ability to free it. This fixes #2944.

thodg/libgit2/tests

tests

Log