diff options
| author | nulltoken <emeric.fermas@gmail.com> | 2012-08-22 13:30:55 +0400 |
|---|---|---|
| committer | nulltoken <emeric.fermas@gmail.com> | 2012-09-06 20:40:06 +0400 |
| commit | ced8d1420a76c13796d951203c2b35540a49b454 (patch) | |
| tree | 21f33f82625401b20e7c4e607cc4508d43fa712c /src/reset.c | |
| parent | bb2d305c20d62b10b39d95916d1a172057c26d65 (diff) | |
errors: deploy GIT_EBAREREPO usage
Diffstat (limited to 'src/reset.c')
| -rw-r--r-- | src/reset.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/reset.c b/src/reset.c index f9e16f7c6..5aaf94840 100644 --- a/src/reset.c +++ b/src/reset.c @@ -34,8 +34,9 @@ int git_reset( if (git_object_owner(target) != repo) return reset_error_invalid("The given target does not belong to this repository."); - if (reset_type == GIT_RESET_MIXED && git_repository_is_bare(repo)) - return reset_error_invalid("Mixed reset is not allowed in a bare repository."); + if (reset_type == GIT_RESET_MIXED + && git_repository__ensure_not_bare(repo, "reset mixed") < 0) + return GIT_EBAREREPO; if (git_object_peel(&commit, target, GIT_OBJ_COMMIT) < 0) { reset_error_invalid("The given target does not resolve to a commit"); |