delta/libgit2.git/tests/index/conflicts.c, branch ethomson/https_proxy github.com: libgit2/libgit2.git index: use new enum and structure names 2018-12-01T10:46:44+00:00 Edward Thomson ethomson@edwardthomson.com 2018-11-28T13:31:06+00:00 18e71e6d597abe6c7feb666429c921bd19dc0ba8 Use the new-style index names throughout our own codebase. 
Use the new-style index names throughout our own codebase.
tests: verify adding index conflicts with invalid filemodes fails 2018-08-24T07:15:29+00:00 Patrick Steinhardt ps@pks.im 2018-08-24T07:15:29+00:00 3a1f5df87b1be025b21972a592a6d0a75cfa2bb2 Commit 581d5492f (Fix leak in index.c, 2018-08-16) was fixing a memory leak in our code adding conflicts to the index when the added index entries have an invalid file mode. The memory leak was previously undiscovered as there are no tests covering this scenario, which is now being added by this commit. 
Commit 581d5492f (Fix leak in index.c, 2018-08-16) was fixing a memory
leak in our code adding conflicts to the index when the added index
entries have an invalid file mode. The memory leak was previously
undiscovered as there are no tests covering this scenario, which is now
being added by this commit.
treewide: remove use of C++ style comments 2018-07-13T06:25:12+00:00 Patrick Steinhardt ps@pks.im 2018-06-25T09:56:52+00:00 9994cd3f0ffcd7b28d26c82ecb6564bc4072dc2a C++ style comment ("//") are not specified by the ISO C90 standard and thus do not conform to it. While libgit2 aims to conform to C90, we did not enforce it until now, which is why quite a lot of these non-conforming comments have snuck into our codebase. Do a tree-wide conversion of all C++ style comments to the supported C style comments to allow us enforcing strict C90 compliance in a later commit. 
C++ style comment ("//") are not specified by the ISO C90 standard and
thus do not conform to it. While libgit2 aims to conform to C90, we did
not enforce it until now, which is why quite a lot of these
non-conforming comments have snuck into our codebase. Do a tree-wide
conversion of all C++ style comments to the supported C style comments
to allow us enforcing strict C90 compliance in a later commit.
index: include conflicts in `git_index_read_index` 2016-06-29T22:37:00+00:00 Edward Thomson ethomson@github.com 2016-06-29T21:55:44+00:00 6249d960ab2d968acd1a9d87986c81a12e2e96bc Ensure that we include conflicts when calling `git_index_read_index`, which will remove conflicts in the index that do not exist in the new target, and will add conflicts from the new target. 
Ensure that we include conflicts when calling `git_index_read_index`,
which will remove conflicts in the index that do not exist in the new
target, and will add conflicts from the new target.
tests: use legitimate object ids 2016-02-28T23:54:56+00:00 Edward Thomson ethomson@github.com 2016-02-28T21:02:49+00:00 4afe536ba1c909ff8ab8d1b75997d3897b72571b Use legitimate (existing) object IDs in tests so that we have the ability to turn on strict object validation when running tests. 
Use legitimate (existing) object IDs in tests so that we have the
ability to turn on strict object validation when running tests.
Failing test for case sensitive conflicts in the index 2015-11-12T11:11:45+00:00 nulltoken emeric.fermas@gmail.com 2014-08-26T11:51:37+00:00 1314af8d63ca5d12af585e68ae0334f68c0b980e 






introduce `git_index_entry_is_conflict`
2015-05-28T13:47:31+00:00

Edward Thomson
ethomson@microsoft.com

2015-05-19T15:23:59+00:00

9f545b9d71c7bd316be80e5fe8b47135e9deb97e

It's not always obvious the mapping between stage level and
conflict-ness.  More importantly, this can lead otherwise sane
people to write constructs like `if (!git_index_entry_stage(entry))`,
which (while technically correct) is unreadable.

Provide a nice method to help avoid such messy thinking.





It's not always obvious the mapping between stage level and
conflict-ness.  More importantly, this can lead otherwise sane
people to write constructs like `if (!git_index_entry_stage(entry))`,
which (while technically correct) is unreadable.

Provide a nice method to help avoid such messy thinking.







conflict tests: use GIT_IDXENTRY_STAGE_SET
2015-05-28T13:44:22+00:00

Edward Thomson
ethomson@microsoft.com

2015-05-19T15:17:07+00:00

2f1080ea04ad1235efcd4b213dbe3a1b847644f7












index: validate mode of new conflicts
2015-05-28T13:43:57+00:00

Edward Thomson
ethomson@microsoft.com

2015-05-14T17:30:29+00:00

d67f270e58942fed5871eca6802d3fa4f290e4f1












conflicts: when adding conflicts, remove staged
2015-05-28T13:43:49+00:00

Edward Thomson
ethomson@microsoft.com

2015-05-14T15:52:48+00:00

ecd60a56ebd6bdc347a486f53da7de0febef58cf

When adding a conflict for some path, remove the staged entry.
Otherwise, an illegal index (with both stage 0 and high-stage
entries) would result.





When adding a conflict for some path, remove the staged entry.
Otherwise, an illegal index (with both stage 0 and high-stage
entries) would result.