From 35d255fda66abffc58d2c7a847aa86840727b4a0 Mon Sep 17 00:00:00 2001 From: Keith Dahlby Date: Sun, 4 Nov 2012 12:13:42 -0600 Subject: [PATCH 1/2] repo: fix state when HEAD is not detached --- src/repository.c | 3 --- tests-clar/repo/state.c | 2 -- 2 files changed, 5 deletions(-) diff --git a/src/repository.c b/src/repository.c index 0e416e0b8..fbae8935b 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 c0aba1987..5a0a5f360 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) From 221ee54b8ce67efb0346b7ace67728a14babfcac Mon Sep 17 00:00:00 2001 From: Keith Dahlby Date: Sun, 4 Nov 2012 21:24:14 -0600 Subject: [PATCH 2/2] Fix Clar link --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 08687276e..403520b66 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