10 Commits

Author	SHA1	Message	Date
nulltoken	9a0d590412	reset: Cannot soft reset with a conflicted index	2013-01-04 18:43:34 +01:00
Ben Straub	2508cc66eb	Rename ref and reflog apis for consistency	2012-11-27 13:17:45 -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	31966d20e3	repo: enhance git_repository_state() detection	2012-10-27 16:45:59 +02:00
nulltoken	00e161b977	tests: fix a memory leak	2012-10-27 11:43:48 +02:00
Edward Thomson	03bdb2addd	GIT_EUNMERGED	2012-10-24 20:24:37 -05:00
Edward Thomson	632d8b230b	reset changes for merge	2012-10-24 20:24:37 -05:00
nulltoken	c436ed26e0	reset: make git_reset() cope with an orphaned HEAD	2012-10-22 19:46:00 +02:00
nulltoken	209e34fa70	tests: leverage git_repository_detach_head()	2012-10-20 12:01:04 +02:00
nulltoken	edebceffef	Add git_reset() ... Currently supports Soft and Mixed modes.	2012-06-07 21:27:30 +02:00