diff options
| author | Edward Thomson <ethomson@microsoft.com> | 2013-11-22 18:02:12 -0500 |
|---|---|---|
| committer | Edward Thomson <ethomson@edwardthomson.com> | 2013-12-02 16:57:41 -0600 |
| commit | bab0b9f2d21d993c3f25ee00ce2d243a4dc0de93 (patch) | |
| tree | 57e11cab3b255a3fb8a46b00601504a002702f42 /src/reset.c | |
| parent | 300d192f7ed45112121f2a35d5ca80a4913c7aad (diff) | |
| download | libgit2-bab0b9f2d21d993c3f25ee00ce2d243a4dc0de93.tar.gz | |
clean up state metadata more consistently
Diffstat (limited to 'src/reset.c')
| -rw-r--r-- | src/reset.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/reset.c b/src/reset.c index a9780bfbc..261a36576 100644 --- a/src/reset.c +++ b/src/reset.c @@ -149,7 +149,7 @@ int git_reset( (error = git_index_write(index)) < 0) goto cleanup; - if ((error = git_repository_merge_cleanup(repo)) < 0) { + if ((error = git_repository_state_cleanup(repo)) < 0) { giterr_set(GITERR_INDEX, "%s - failed to clean up merge data", ERROR_MSG); goto cleanup; } |