diff options
| author | nulltoken <emeric.fermas@gmail.com> | 2012-10-13 20:51:57 +0200 |
|---|---|---|
| committer | nulltoken <emeric.fermas@gmail.com> | 2012-10-15 20:41:42 +0200 |
| commit | fa5d94a0d4d9bbdd167443f052ad4f1f11541aae (patch) | |
| tree | b96dfad568def935bdc5f112aea7d3da9d2e7709 | |
| parent | 1ddc537c779a5796c4ed1d5fc2e41bd38cdeb394 (diff) | |
| download | libgit2-fa5d94a0d4d9bbdd167443f052ad4f1f11541aae.tar.gz | |
reset: prevent hard reset in a bare repository
| -rw-r--r-- | src/reset.c | 8 | ||||
| -rw-r--r-- | tests-clar/reset/hard.c | 14 |
2 files changed, 19 insertions, 3 deletions
diff --git a/src/reset.c b/src/reset.c index c536e75b8..dfa095be4 100644 --- a/src/reset.c +++ b/src/reset.c @@ -39,9 +39,11 @@ 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__ensure_not_bare(repo, "reset mixed") < 0) - return GIT_EBAREREPO; + if (reset_type != GIT_RESET_SOFT + && git_repository__ensure_not_bare( + repo, + reset_type == GIT_RESET_MIXED ? "reset mixed" : "reset hard") < 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"); diff --git a/tests-clar/reset/hard.c b/tests-clar/reset/hard.c index ad3badb8a..fdab9c536 100644 --- a/tests-clar/reset/hard.c +++ b/tests-clar/reset/hard.c @@ -44,3 +44,17 @@ void test_reset_hard__resetting_culls_empty_directories(void) git_buf_free(&subfile_path); git_buf_free(&newdir_path); } + +void test_reset_hard__cannot_reset_in_a_bare_repository(void) +{ + git_repository *bare; + + cl_git_pass(git_repository_open(&bare, cl_fixture("testrepo.git"))); + cl_assert(git_repository_is_bare(bare) == true); + + retrieve_target_from_oid(&target, bare, KNOWN_COMMIT_IN_BARE_REPO); + + cl_assert_equal_i(GIT_EBAREREPO, git_reset(bare, target, GIT_RESET_HARD)); + + git_repository_free(bare); +} |