4 Commits

Author	SHA1	Message	Date
Edward Thomson	6249d960ab	index: include conflicts in git_index_read_index ... 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.	2016-06-29 18:37:00 -04:00
Edward Thomson	91fbf9d867	test: ensure we can round-trip a written tree ... Read a tree into an index, write the index, then re-open the index and ensure that we are treesame to the original.	2016-06-02 02:37:04 -05:00
Edward Thomson	5baa20b86e	round-trip trees through index_read_index ... Read a tree into an index using `git_index_read_index` (by reading a tree into a new index, then reading that index into the current index), then write the index back out, ensuring that our new index is treesame to the tree that we read.	2016-06-02 00:59:46 -05:00
Edward Thomson	35d3976151	index: introduce git_index_read_index	2015-05-11 14:12:05 -04:00