diff options
Diffstat (limited to 'src/reset.c')
| -rw-r--r-- | src/reset.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/reset.c b/src/reset.c index b8d69e748..ca6a5bd73 100644 --- a/src/reset.c +++ b/src/reset.c @@ -42,7 +42,7 @@ int git_reset_default( if (target) { if (git_object_owner(target) != repo) { - giterr_set(GITERR_OBJECT, + git_error_set(GIT_ERROR_OBJECT, "%s_default - The given target does not belong to this repository.", ERROR_MSG); return -1; } @@ -70,7 +70,7 @@ int git_reset_default( error = git_index_conflict_remove(index, delta->old_file.path); if (error < 0) { if (delta->status == GIT_DELTA_ADDED && error == GIT_ENOTFOUND) - giterr_clear(); + git_error_clear(); else goto cleanup; } @@ -119,7 +119,7 @@ static int reset( opts = *checkout_opts; if (git_object_owner(target) != repo) { - giterr_set(GITERR_OBJECT, + git_error_set(GIT_ERROR_OBJECT, "%s - The given target does not belong to this repository.", ERROR_MSG); return -1; } @@ -138,7 +138,7 @@ static int reset( (git_repository_state(repo) == GIT_REPOSITORY_STATE_MERGE || git_index_has_conflicts(index))) { - giterr_set(GITERR_OBJECT, "%s (soft) in the middle of a merge", ERROR_MSG); + git_error_set(GIT_ERROR_OBJECT, "%s (soft) in the middle of a merge", ERROR_MSG); error = GIT_EUNMERGED; goto cleanup; } @@ -167,7 +167,7 @@ static int reset( goto cleanup; if ((error = git_repository_state_cleanup(repo)) < 0) { - giterr_set(GITERR_INDEX, "%s - failed to clean up merge data", ERROR_MSG); + git_error_set(GIT_ERROR_INDEX, "%s - failed to clean up merge data", ERROR_MSG); goto cleanup; } } |