diff options
author | Ben Straub <bs@github.com> | 2013-05-24 02:11:53 +0400 |
---|---|---|
committer | Ben Straub <bs@github.com> | 2013-05-24 02:35:50 +0400 |
commit | 93d8f77fed9407421ba1c90141d997b2dea7e0e7 (patch) | |
tree | 2212d7ad77c4fdc23425d7e8c5526a9c36332b57 | |
parent | 9c941ccfaf600caef3c87387a6992bfe5a17c742 (diff) |
Improve test failure output
-rw-r--r-- | include/git2/repository.h | 9 | ||||
-rw-r--r-- | src/repository.c | 12 | ||||
-rw-r--r-- | tests-clar/repo/shallow.c | 33 | ||||
-rw-r--r-- | tests-clar/resources/shallow.git/HEAD | 1 | ||||
-rw-r--r-- | tests-clar/resources/shallow.git/config | 8 | ||||
-rw-r--r-- | tests-clar/resources/shallow.git/objects/pack/pack-706e49b161700946489570d96153e5be4dc31ad4.idx | bin | 0 -> 1324 bytes | |||
-rw-r--r-- | tests-clar/resources/shallow.git/objects/pack/pack-706e49b161700946489570d96153e5be4dc31ad4.pack | bin | 0 -> 791 bytes | |||
-rw-r--r-- | tests-clar/resources/shallow.git/packed-refs | 2 | ||||
-rw-r--r-- | tests-clar/resources/shallow.git/refs/.gitkeep | 0 | ||||
-rw-r--r-- | tests-clar/resources/shallow.git/shallow | 1 |
10 files changed, 66 insertions, 0 deletions
diff --git a/include/git2/repository.h b/include/git2/repository.h index bb2b3db83..4fbd913b1 100644 --- a/include/git2/repository.h +++ b/include/git2/repository.h @@ -657,6 +657,15 @@ GIT_EXTERN(int) git_repository_set_namespace(git_repository *repo, const char *n */ GIT_EXTERN(const char *) git_repository_get_namespace(git_repository *repo); + +/** + * Determine if the repository was a shallow clone + * + * @param repo The repository + * @return 1 if shallow, zero if not + */ +GIT_EXTERN(int) git_repository_is_shallow(git_repository *repo); + /** @} */ GIT_END_DECL #endif diff --git a/src/repository.c b/src/repository.c index 9957f32b7..b0359a58f 100644 --- a/src/repository.c +++ b/src/repository.c @@ -1822,3 +1822,15 @@ int git_repository_state(git_repository *repo) git_buf_free(&repo_path); return state; } + +int git_repository_is_shallow(git_repository *repo) +{ + git_buf path = GIT_BUF_INIT; + struct stat st; + + git_buf_joinpath(&path, repo->path_repository, "shallow"); + + if (git_path_lstat(path.ptr, &st) == GIT_ENOTFOUND) + return 0; + return st.st_size == 0 ? 0 : 1; +} diff --git a/tests-clar/repo/shallow.c b/tests-clar/repo/shallow.c new file mode 100644 index 000000000..1cc66ae40 --- /dev/null +++ b/tests-clar/repo/shallow.c @@ -0,0 +1,33 @@ +#include "clar_libgit2.h" +#include "fileops.h" + +static git_repository *g_repo; + +void test_repo_shallow__initialize(void) +{ +} + +void test_repo_shallow__cleanup(void) +{ + cl_git_sandbox_cleanup(); +} + +void test_repo_shallow__no_shallow_file(void) +{ + g_repo = cl_git_sandbox_init("testrepo.git"); + cl_assert_equal_i(0, git_repository_is_shallow(g_repo)); +} + +void test_repo_shallow__empty_shallow_file(void) +{ + g_repo = cl_git_sandbox_init("testrepo.git"); + cl_git_mkfile("testrepo.git/shallow", ""); + cl_assert_equal_i(0, git_repository_is_shallow(g_repo)); +} + +void test_repo_shallow__shallow_repo(void) +{ + g_repo = cl_git_sandbox_init("shallow.git"); + cl_assert_equal_i(1, git_repository_is_shallow(g_repo)); +} + diff --git a/tests-clar/resources/shallow.git/HEAD b/tests-clar/resources/shallow.git/HEAD new file mode 100644 index 000000000..cb089cd89 --- /dev/null +++ b/tests-clar/resources/shallow.git/HEAD @@ -0,0 +1 @@ +ref: refs/heads/master diff --git a/tests-clar/resources/shallow.git/config b/tests-clar/resources/shallow.git/config new file mode 100644 index 000000000..a88b74b69 --- /dev/null +++ b/tests-clar/resources/shallow.git/config @@ -0,0 +1,8 @@ +[core] + repositoryformatversion = 0 + filemode = true + bare = true + ignorecase = true + precomposeunicode = false +[remote "origin"] + url = file://testrepo.git diff --git a/tests-clar/resources/shallow.git/objects/pack/pack-706e49b161700946489570d96153e5be4dc31ad4.idx b/tests-clar/resources/shallow.git/objects/pack/pack-706e49b161700946489570d96153e5be4dc31ad4.idx Binary files differnew file mode 100644 index 000000000..bfc7d24ff --- /dev/null +++ b/tests-clar/resources/shallow.git/objects/pack/pack-706e49b161700946489570d96153e5be4dc31ad4.idx diff --git a/tests-clar/resources/shallow.git/objects/pack/pack-706e49b161700946489570d96153e5be4dc31ad4.pack b/tests-clar/resources/shallow.git/objects/pack/pack-706e49b161700946489570d96153e5be4dc31ad4.pack Binary files differnew file mode 100644 index 000000000..ccc6932fc --- /dev/null +++ b/tests-clar/resources/shallow.git/objects/pack/pack-706e49b161700946489570d96153e5be4dc31ad4.pack diff --git a/tests-clar/resources/shallow.git/packed-refs b/tests-clar/resources/shallow.git/packed-refs new file mode 100644 index 000000000..97eed743b --- /dev/null +++ b/tests-clar/resources/shallow.git/packed-refs @@ -0,0 +1,2 @@ +# pack-refs with: peeled +a65fedf39aefe402d3bb6e24df4d4f5fe4547750 refs/heads/master diff --git a/tests-clar/resources/shallow.git/refs/.gitkeep b/tests-clar/resources/shallow.git/refs/.gitkeep new file mode 100644 index 000000000..e69de29bb --- /dev/null +++ b/tests-clar/resources/shallow.git/refs/.gitkeep diff --git a/tests-clar/resources/shallow.git/shallow b/tests-clar/resources/shallow.git/shallow new file mode 100644 index 000000000..9536ad89c --- /dev/null +++ b/tests-clar/resources/shallow.git/shallow @@ -0,0 +1 @@ +be3563ae3f795b2b4353bcce3a527ad0a4f7f644 |