8 Commits

Author	SHA1	Message	Date
Edward Thomson	0e0108f73f	introduce git_conflict_iterator	2013-05-17 16:10:48 -05:00
Sebastian Bauer	a7f8065f8c	Use cl_assert_equal_s() instead of strcmp(). ... Replaced all cl_assert(!strcmp()) or semantically equivalent forms by cl_assert_equal_s().	2013-01-25 06:55:56 +01:00
Edward Thomson	25743bd7c5	add an index_remove_bypath that removes conflicts, renamed add_from_workdir to match	2013-01-12 13:47:56 -06:00
Russell Belfer	a8122b5d4a	Fix warnings on Win64 build	2012-11-27 13:18:29 -08:00
Ben Straub	f45d51ff8e	API updates for index.h	2012-11-27 13:18:28 -08:00
Sascha Cunz	9094d30b93	Reset all static variables to NULL in clar's __cleanup ... Without this change, any failed assertion in the second (or a later) test inside a test suite has a chance of double deleting memory, resulting in a heap corruption. See #1096 for details. This leaves alone the test cases where we "just" use cl_git_sandbox_init() and cl_git_sandbox_cleanup(). These methods already take good care to not double delete a repository. Fixes #1096	2012-11-23 11:41:56 +01:00
nulltoken	7cc1bf0fcb	index: Introduce git_index_has_conflicts()	2012-11-08 21:16:48 +01:00
Edward Thomson	f45ec1a076	index refactoring	2012-10-29 20:04:21 -05:00