kmx git

Commit	Date	Message
8e4aae1a	2012-07-31T10:44:42	Checkout: handle file modes properly. Global file mode override now works properly with the file mode stored in the tree node.
b31667fb	2012-07-27T20:29:06	Checkout: add head- and ref-centric checkouts. Renamed git_checkout_index to what it really was, and removed duplicate code from clone.c. Added git_checkout_ref, which updates HEAD and hands off to git_checkout_head. Added tests for the options the caller can pass to git_checkout_*.
a4827a5b	2012-07-27T11:17:21	Merge remote-tracking branch 'upstream/development' into test-merge
b41a30bd	2012-07-27T18:45:55	Merge remote-tracking branch 'nulltoken/topic/branch-rework' into development
8689a69d	2012-07-25T01:59:23	Tests: Test remote's pushurl
fb910281	2012-07-20T16:38:54	branch: introduce git_branch_tracking()
bfc65634	2012-07-17T08:08:34	Merge branch 'development' into clone
1d68fcd0	2012-07-16T16:16:11	Checkout: handle symlinks. Includes unfinished win32 implementation.
b0f15338	2012-07-15T00:45:20	revparse: add reflog test data
280c7bbf	2012-07-13T15:52:27	Add checkout test suite. Removed 'bare' option from test repository to allow checkout tests.
5b071115	2012-07-04T14:00:19	tests: add test commit with angle brackets in the author name
29f9186d	2012-07-02T11:18:01	diff: make inter-hunk-context default value git-compliant Default in git core is 0, not 3
b93688d0	2012-06-19T02:33:03	Merge remote-tracking branch 'yorah/fix/notes-creation' into development Conflicts: src/notes.c
0abd7244	2012-06-04T16:17:41	Fix filemode comparison in diffs File modes were both not being ignored properly on platforms where they should be ignored, nor be diffed consistently on platforms where they are supported. This change adds a number of diff and status filemode change tests. This also makes sure that filemode-only changes are included in the diff output when they occur and that filemode changes are ignored successfully when core.filemode is false. There is no code that automatically toggles core.filemode based on the capabilities of the current platform, so the user still needs to be careful in their .git/config file.
454cc829	2012-05-29T13:28:26	notes: add test resource with faked two-level fanout
b9ebcc59	2012-06-07T12:29:31	Merge pull request #684 from benstraub/rev-parse Rev parse
8e60c712	2012-06-07T09:50:19	Fix git_status_file for files that start with a character > 0x7f git_status_file would always return GIT_ENOTFOUND for these files. The underlying bug was that git__strcmp_cb, which is used by git_path_with_stat_cmp to sort entries in the working directory, compares strings based on unsigned chars (this is confirmed by the strcmp(3) manpage), while git__prefixcmp, which is used by workdir_iterator__entry_cmp to search for a path in the working directory, compares strings based on char. So the sort puts this path at the end of the list, while the search expects it to be at the beginning. The fix was simply to make git__prefixcmp compare using unsigned chars, just like strcmp(3). The rest of the change is just adding/updating tests.
56a5000d	2012-06-05T12:52:44	Merge branch 'development' into rev-parse Conflicts: src/util.h tests-clar/refs/branches/listall.c
bd4ca902	2012-05-16T17:02:06	Fix status for files under ignored dirs There was a bug where tracked files inside directories that were inside ignored directories where not being found by status. To make that a little clearer, if you have a .gitignore with: ignore/ And then have the following files: ignore/dir/tracked <-- actually a tracked file ignore/dir/untracked <-- should be ignored Then we would show the tracked file as being removed (because when we got the to contained item "dir/" inside the ignored directory, we decided it was safe to skip -- bzzt, wrong!). This update is much more careful about checking that we are not skipping over any prefix of a tracked item, regardless of whether it is ignored or not. As documented in diff.c, this commit does create behavior that still differs from core git with regards to the handling of untracked files contained inside ignored directories. With libgit2, those files will just not show up in status or diff. With core git, those files don't show up in status or diff either unless they are explicitly ignored by a .gitignore pattern in which case they show up as ignored files. Needless to say, this is a local behavior difference only, so it should not be important and (to me) the libgit2 behavior seems more consistent.
24634c6f	2012-05-12T15:01:39	Handle duplicate objects from different backends in git_odb_read_prefix().
92ad5a5c	2012-05-11T11:50:54	Rebasing onto libgit2/development: cleanup.
a6346302	2012-05-03T13:58:46	Rev-parse: "ref@{upstream}" syntax. Added tracking configuration to the test repo's config to support unit tests.
cfe25b13	2012-05-03T16:11:40	tests: add two binary blobs to attr test repository - edf3dce -> assets.github.com/images/icons/emoji/alien.png?v5 - de863bf -> assets.github.com/images/icons/emoji/heart.png?v5
3ec1fa5e	2012-05-04T13:55:07	Fixing issue with test data
f917481e	2012-05-03T16:37:25	Support reading attributes from index Depending on the operation, we need to consider gitattributes in both the work dir and the index. This adds a parameter to all of the gitattributes related functions that allows user control of attribute reading behavior (i.e. prefer workdir, prefer index, only use index). This fix also covers allowing us to check attributes (and hence do diff and status) on bare repositories. This was a somewhat larger change that I hoped because it had to change the cache key used for gitattributes files.
a1d08025	2012-05-02T16:33:26	Backport more test data
8c83fead	2012-05-02T16:18:55	Move test resources
40879fac	2012-05-02T15:59:02	Merge branch 'new-error-handling' into development Conflicts: .travis.yml include/git2/diff.h src/config_file.c src/diff.c src/diff_output.c src/mwindow.c src/path.c tests-clar/clar_helpers.c tests-clar/object/tree/frompath.c tests/t00-core.c tests/t03-objwrite.c tests/t08-tag.c tests/t10-refs.c tests/t12-repo.c tests/t18-status.c tests/test_helpers.c tests/test_main.c
fd29cd13	2012-03-31T16:10:01	Moved testing resources to clar, and removed old tests directory. Removed the BUILD_CLAR CMake flag, and updated the readme.

8e4aae1a

2012-07-31T10:44:42

Checkout: handle file modes properly. Global file mode override now works properly with the file mode stored in the tree node.

b31667fb

2012-07-27T20:29:06

Checkout: add head- and ref-centric checkouts. Renamed git_checkout_index to what it really was, and removed duplicate code from clone.c. Added git_checkout_ref, which updates HEAD and hands off to git_checkout_head. Added tests for the options the caller can pass to git_checkout_*.

a4827a5b

2012-07-27T11:17:21

Merge remote-tracking branch 'upstream/development' into test-merge

b41a30bd

2012-07-27T18:45:55

Merge remote-tracking branch 'nulltoken/topic/branch-rework' into development

8689a69d

2012-07-25T01:59:23

Tests: Test remote's pushurl

fb910281

2012-07-20T16:38:54

branch: introduce git_branch_tracking()

bfc65634

2012-07-17T08:08:34

Merge branch 'development' into clone

1d68fcd0

2012-07-16T16:16:11

Checkout: handle symlinks. Includes unfinished win32 implementation.

b0f15338

2012-07-15T00:45:20

revparse: add reflog test data

280c7bbf

2012-07-13T15:52:27

Add checkout test suite. Removed 'bare' option from test repository to allow checkout tests.

5b071115

2012-07-04T14:00:19

tests: add test commit with angle brackets in the author name

29f9186d

2012-07-02T11:18:01

diff: make inter-hunk-context default value git-compliant Default in git core is 0, not 3

b93688d0

2012-06-19T02:33:03

Merge remote-tracking branch 'yorah/fix/notes-creation' into development Conflicts: src/notes.c

0abd7244

2012-06-04T16:17:41

Fix filemode comparison in diffs File modes were both not being ignored properly on platforms where they should be ignored, nor be diffed consistently on platforms where they are supported. This change adds a number of diff and status filemode change tests. This also makes sure that filemode-only changes are included in the diff output when they occur and that filemode changes are ignored successfully when core.filemode is false. There is no code that automatically toggles core.filemode based on the capabilities of the current platform, so the user still needs to be careful in their .git/config file.

454cc829

2012-05-29T13:28:26

notes: add test resource with faked two-level fanout

b9ebcc59

2012-06-07T12:29:31

Merge pull request #684 from benstraub/rev-parse Rev parse

8e60c712

2012-06-07T09:50:19

Fix git_status_file for files that start with a character > 0x7f git_status_file would always return GIT_ENOTFOUND for these files. The underlying bug was that git__strcmp_cb, which is used by git_path_with_stat_cmp to sort entries in the working directory, compares strings based on unsigned chars (this is confirmed by the strcmp(3) manpage), while git__prefixcmp, which is used by workdir_iterator__entry_cmp to search for a path in the working directory, compares strings based on char. So the sort puts this path at the end of the list, while the search expects it to be at the beginning. The fix was simply to make git__prefixcmp compare using unsigned chars, just like strcmp(3). The rest of the change is just adding/updating tests.

56a5000d

2012-06-05T12:52:44

Merge branch 'development' into rev-parse Conflicts: src/util.h tests-clar/refs/branches/listall.c

bd4ca902

2012-05-16T17:02:06

Fix status for files under ignored dirs There was a bug where tracked files inside directories that were inside ignored directories where not being found by status. To make that a little clearer, if you have a .gitignore with: ignore/ And then have the following files: ignore/dir/tracked <-- actually a tracked file ignore/dir/untracked <-- should be ignored Then we would show the tracked file as being removed (because when we got the to contained item "dir/" inside the ignored directory, we decided it was safe to skip -- bzzt, wrong!). This update is much more careful about checking that we are not skipping over any prefix of a tracked item, regardless of whether it is ignored or not. As documented in diff.c, this commit does create behavior that still differs from core git with regards to the handling of untracked files contained inside ignored directories. With libgit2, those files will just not show up in status or diff. With core git, those files don't show up in status or diff either *unless* they are explicitly ignored by a .gitignore pattern in which case they show up as ignored files. Needless to say, this is a local behavior difference only, so it should not be important and (to me) the libgit2 behavior seems more consistent.

24634c6f

2012-05-12T15:01:39

Handle duplicate objects from different backends in git_odb_read_prefix().

92ad5a5c

2012-05-11T11:50:54

Rebasing onto libgit2/development: cleanup.

a6346302

2012-05-03T13:58:46

Rev-parse: "ref@{upstream}" syntax. Added tracking configuration to the test repo's config to support unit tests.

cfe25b13

2012-05-03T16:11:40

tests: add two binary blobs to attr test repository - edf3dce -> assets.github.com/images/icons/emoji/alien.png?v5 - de863bf -> assets.github.com/images/icons/emoji/heart.png?v5

3ec1fa5e

2012-05-04T13:55:07

Fixing issue with test data

f917481e

2012-05-03T16:37:25

Support reading attributes from index Depending on the operation, we need to consider gitattributes in both the work dir and the index. This adds a parameter to all of the gitattributes related functions that allows user control of attribute reading behavior (i.e. prefer workdir, prefer index, only use index). This fix also covers allowing us to check attributes (and hence do diff and status) on bare repositories. This was a somewhat larger change that I hoped because it had to change the cache key used for gitattributes files.

a1d08025

2012-05-02T16:33:26

Backport more test data

8c83fead

2012-05-02T16:18:55

Move test resources

40879fac

2012-05-02T15:59:02

Merge branch 'new-error-handling' into development Conflicts: .travis.yml include/git2/diff.h src/config_file.c src/diff.c src/diff_output.c src/mwindow.c src/path.c tests-clar/clar_helpers.c tests-clar/object/tree/frompath.c tests/t00-core.c tests/t03-objwrite.c tests/t08-tag.c tests/t10-refs.c tests/t12-repo.c tests/t18-status.c tests/test_helpers.c tests/test_main.c

fd29cd13

2012-03-31T16:10:01

Moved testing resources to clar, and removed old tests directory. Removed the BUILD_CLAR CMake flag, and updated the readme.

thodg/libgit2/tests-clar/resources

tests-clar/resources

Log