Commit 065be7a1d9779d72d7de5e9f963f7b6dc971e66e
2012-11-05T10:44:21
Merge pull request #1044 from dahlbyk/repo/state Fix state when HEAD is not detached
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40
diff --git a/README.md b/README.md
index 0868727..403520b 100644
--- a/README.md
+++ b/README.md
@@ -70,7 +70,7 @@ The following CMake variables are declared:
- `LIB_INSTALL_DIR`: Where to install libraries to.
- `INCLUDE_INSTALL_DIR`: Where to install headers to.
- `BUILD_SHARED_LIBS`: Build libgit2 as a Shared Library (defaults to ON)
-- `BUILD_CLAR`: Build [Clar](https://github.com/tanoku/clar)-based test suite (defaults to ON)
+- `BUILD_CLAR`: Build [Clar](https://github.com/vmg/clar)-based test suite (defaults to ON)
- `THREADSAFE`: Build libgit2 with threading support (defaults to OFF)
Language Bindings
diff --git a/src/repository.c b/src/repository.c
index 0e416e0..fbae893 100644
--- a/src/repository.c
+++ b/src/repository.c
@@ -1552,9 +1552,6 @@ int git_repository_state(git_repository *repo)
assert(repo);
- if (!git_repository_head_detached(repo))
- return state;
-
if (git_buf_puts(&repo_path, repo->path_repository) < 0)
return -1;
diff --git a/tests-clar/repo/state.c b/tests-clar/repo/state.c
index c0aba19..5a0a5f3 100644
--- a/tests-clar/repo/state.c
+++ b/tests-clar/repo/state.c
@@ -23,8 +23,6 @@ static void setup_simple_state(const char *filename)
cl_git_pass(git_buf_joinpath(&_path, git_repository_path(_repo), filename));
git_futils_mkpath2file(git_buf_cstr(&_path), 0777);
cl_git_mkfile(git_buf_cstr(&_path), "dummy");
-
- cl_git_pass(git_repository_detach_head(_repo));
}
static void assert_repo_state(git_repository_state_t state)