From 850b1edfe8f04daaec05237e35e74f11600e5b4c Mon Sep 17 00:00:00 2001 From: Ben Straub Date: Thu, 13 Dec 2012 12:55:28 -0800 Subject: [PATCH 1/9] Allow clone to handle empty repos --- src/transports/local.c | 4 +++- tests-clar/clone/nonetwork.c | 39 ++++++++++++++++++++++++++++++++++++ 2 files changed, 42 insertions(+), 1 deletion(-) diff --git a/src/transports/local.c b/src/transports/local.c index 53b24947c..8aeab2975 100644 --- a/src/transports/local.c +++ b/src/transports/local.c @@ -50,9 +50,11 @@ static int add_ref(transport_local *t, const char *name) GITERR_CHECK_ALLOC(head->name); if (git_reference_name_to_id(&head->oid, t->repo, name) < 0) { + /* This is actually okay. Empty repos often have a HEAD that points to + * a nonexistant "refs/haeds/master". */ git__free(head->name); git__free(head); - return -1; + return 0; } if (git_vector_insert(&t->refs, head) < 0) diff --git a/tests-clar/clone/nonetwork.c b/tests-clar/clone/nonetwork.c index 623a0683f..0f4e77a48 100644 --- a/tests-clar/clone/nonetwork.c +++ b/tests-clar/clone/nonetwork.c @@ -86,3 +86,42 @@ void test_clone_nonetwork__fail_with_already_existing_but_non_empty_directory(vo cl_git_mkfile("./foo/bar", "Baz!"); cl_git_fail(git_clone(&g_repo, g_origin, "./foo", &g_options)); } + +void test_clone_nonetwork__can_clone_an_empty_local_repo_barely(void) +{ + const char *src = cl_git_fixture_url("empty_bare.git"); + cl_set_cleanup(&cleanup_repository, "./empty"); + + git_remote_free(g_origin); + cl_git_pass(git_remote_new(&g_origin, NULL, "origin", src, GIT_REMOTE_DEFAULT_FETCH)); + + cl_git_pass(git_clone_bare(&g_repo, g_origin, "./empty", NULL, NULL)); +} + +void test_clone_nonetwork__can_clone_an_empty_local_repo(void) +{ + const char *src = cl_git_fixture_url("empty_bare.git"); + cl_set_cleanup(&cleanup_repository, "./empty"); + + git_remote_free(g_origin); + cl_git_pass(git_remote_new(&g_origin, NULL, "origin", src, GIT_REMOTE_DEFAULT_FETCH)); + + cl_git_pass(git_clone(&g_repo, g_origin, "./empty", NULL, NULL, NULL)); +} + +void test_clone_nonetwork__can_clone_an_empty_standard_repo(void) +{ + const char *src; + + cl_git_sandbox_init("empty_standard_repo"); + src = cl_git_path_url("./empty_standard_repo"); + + git_remote_free(g_origin); + cl_git_pass(git_remote_new(&g_origin, NULL, "origin", src, GIT_REMOTE_DEFAULT_FETCH)); + + cl_set_cleanup(&cleanup_repository, "./empty"); + + cl_git_pass(git_clone(&g_repo, g_origin, "./empty", NULL, NULL, NULL)); + + cl_git_sandbox_cleanup(); +} From b524fe1a3c6033a5a8a64b7d8f9acc5cd3dd90c4 Mon Sep 17 00:00:00 2001 From: Ben Straub Date: Fri, 14 Dec 2012 08:35:59 -0800 Subject: [PATCH 2/9] Local Only ignore ENOTFOUNDs when adding corrupted refs --- src/refs.c | 2 +- src/transports/local.c | 14 ++++++++++---- 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/src/refs.c b/src/refs.c index 85813096b..df533c95d 100644 --- a/src/refs.c +++ b/src/refs.c @@ -177,7 +177,7 @@ static int loose_parse_oid(git_oid *oid, git_buf *file_content) corrupted: giterr_set(GITERR_REFERENCE, "Corrupted loose reference file"); - return -1; + return GIT_ENOTFOUND; } static git_ref_t loose_guess_rtype(const git_buf *full_path) diff --git a/src/transports/local.c b/src/transports/local.c index 8aeab2975..b5b1dd06d 100644 --- a/src/transports/local.c +++ b/src/transports/local.c @@ -42,6 +42,7 @@ static int add_ref(transport_local *t, const char *name) git_remote_head *head; git_object *obj = NULL, *target = NULL; git_buf buf = GIT_BUF_INIT; + int error; head = git__calloc(1, sizeof(git_remote_head)); GITERR_CHECK_ALLOC(head); @@ -49,12 +50,17 @@ static int add_ref(transport_local *t, const char *name) head->name = git__strdup(name); GITERR_CHECK_ALLOC(head->name); - if (git_reference_name_to_id(&head->oid, t->repo, name) < 0) { - /* This is actually okay. Empty repos often have a HEAD that points to - * a nonexistant "refs/haeds/master". */ + error = git_reference_name_to_id(&head->oid, t->repo, name); + if (error < 0) { git__free(head->name); git__free(head); - return 0; + if (error == GIT_ENOTFOUND) { + /* This is actually okay. Empty repos often have a HEAD that points to + * a nonexistant "refs/haeds/master". */ + giterr_clear(); + return 0; + } + return error; } if (git_vector_insert(&t->refs, head) < 0) From 1164acde96a1d72506fee02003863321223f9470 Mon Sep 17 00:00:00 2001 From: Ben Straub Date: Fri, 14 Dec 2012 14:00:35 -0800 Subject: [PATCH 3/9] Rebase fixup --- tests-clar/clone/nonetwork.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/tests-clar/clone/nonetwork.c b/tests-clar/clone/nonetwork.c index 0f4e77a48..128376150 100644 --- a/tests-clar/clone/nonetwork.c +++ b/tests-clar/clone/nonetwork.c @@ -95,7 +95,8 @@ void test_clone_nonetwork__can_clone_an_empty_local_repo_barely(void) git_remote_free(g_origin); cl_git_pass(git_remote_new(&g_origin, NULL, "origin", src, GIT_REMOTE_DEFAULT_FETCH)); - cl_git_pass(git_clone_bare(&g_repo, g_origin, "./empty", NULL, NULL)); + g_options.bare = true; + cl_git_pass(git_clone(&g_repo, g_origin, "./empty", &g_options)); } void test_clone_nonetwork__can_clone_an_empty_local_repo(void) @@ -106,7 +107,7 @@ void test_clone_nonetwork__can_clone_an_empty_local_repo(void) git_remote_free(g_origin); cl_git_pass(git_remote_new(&g_origin, NULL, "origin", src, GIT_REMOTE_DEFAULT_FETCH)); - cl_git_pass(git_clone(&g_repo, g_origin, "./empty", NULL, NULL, NULL)); + cl_git_pass(git_clone(&g_repo, g_origin, "./empty", &g_options)); } void test_clone_nonetwork__can_clone_an_empty_standard_repo(void) @@ -121,7 +122,7 @@ void test_clone_nonetwork__can_clone_an_empty_standard_repo(void) cl_set_cleanup(&cleanup_repository, "./empty"); - cl_git_pass(git_clone(&g_repo, g_origin, "./empty", NULL, NULL, NULL)); + cl_git_pass(git_clone(&g_repo, g_origin, "./empty", &g_options)); cl_git_sandbox_cleanup(); } From 57f5d8dca5e5d080c59fe0dc3e2221dabd9d4c2c Mon Sep 17 00:00:00 2001 From: Ben Straub Date: Fri, 14 Dec 2012 14:15:42 -0800 Subject: [PATCH 4/9] Remove placeholder files during tests --- tests-clar/clone/empty.c | 67 ++++++++++++++++++++++++++++++++++++ tests-clar/clone/nonetwork.c | 40 --------------------- 2 files changed, 67 insertions(+), 40 deletions(-) create mode 100644 tests-clar/clone/empty.c diff --git a/tests-clar/clone/empty.c b/tests-clar/clone/empty.c new file mode 100644 index 000000000..93fe151bc --- /dev/null +++ b/tests-clar/clone/empty.c @@ -0,0 +1,67 @@ +#include "clar_libgit2.h" + +#include "git2/clone.h" +#include "repository.h" + +static git_clone_options g_options; +static git_remote *g_origin; +static git_repository *g_repo; + +void test_clone_empty__initialize(void) +{ + git_repository *sandbox = cl_git_sandbox_init("empty_bare.git"); + cl_git_remove_placeholders(git_repository_path(sandbox), "dummy-marker.txt"); + + g_repo = NULL; + + memset(&g_options, 0, sizeof(git_clone_options)); + g_options.version = GIT_CLONE_OPTIONS_VERSION; + cl_git_pass(git_remote_new(&g_origin, NULL, "origin", cl_git_fixture_url("testrepo.git"), GIT_REMOTE_DEFAULT_FETCH)); +} + +void test_clone_empty__cleanup(void) +{ + git_remote_free(g_origin); + cl_git_sandbox_cleanup(); +} + +static void cleanup_repository(void *path) +{ + cl_fixture_cleanup((const char *)path); +} + +void test_clone_empty__can_clone_an_empty_local_repo_barely(void) +{ + cl_set_cleanup(&cleanup_repository, "./empty"); + + git_remote_free(g_origin); + cl_git_pass(git_remote_new(&g_origin, NULL, "origin", "./empty_bare.git", GIT_REMOTE_DEFAULT_FETCH)); + + g_options.bare = true; + cl_git_pass(git_clone(&g_repo, g_origin, "./empty", &g_options)); +} + +void test_clone_empty__can_clone_an_empty_local_repo(void) +{ + cl_set_cleanup(&cleanup_repository, "./empty"); + + git_remote_free(g_origin); + cl_git_pass(git_remote_new(&g_origin, NULL, "origin", "./empty_bare.git", GIT_REMOTE_DEFAULT_FETCH)); + + cl_git_pass(git_clone(&g_repo, g_origin, "./empty", &g_options)); +} + +void test_clone_empty__can_clone_an_empty_standard_repo(void) +{ + cl_git_sandbox_cleanup(); + g_repo = cl_git_sandbox_init("empty_standard_repo"); + cl_git_remove_placeholders(git_repository_path(g_repo), "dummy-marker.txt"); + git_repository_free(g_repo); + + git_remote_free(g_origin); + cl_git_pass(git_remote_new(&g_origin, NULL, "origin", "./empty_standard_repo", GIT_REMOTE_DEFAULT_FETCH)); + + cl_set_cleanup(&cleanup_repository, "./empty"); + + cl_git_pass(git_clone(&g_repo, g_origin, "./empty", &g_options)); +} diff --git a/tests-clar/clone/nonetwork.c b/tests-clar/clone/nonetwork.c index 128376150..623a0683f 100644 --- a/tests-clar/clone/nonetwork.c +++ b/tests-clar/clone/nonetwork.c @@ -86,43 +86,3 @@ void test_clone_nonetwork__fail_with_already_existing_but_non_empty_directory(vo cl_git_mkfile("./foo/bar", "Baz!"); cl_git_fail(git_clone(&g_repo, g_origin, "./foo", &g_options)); } - -void test_clone_nonetwork__can_clone_an_empty_local_repo_barely(void) -{ - const char *src = cl_git_fixture_url("empty_bare.git"); - cl_set_cleanup(&cleanup_repository, "./empty"); - - git_remote_free(g_origin); - cl_git_pass(git_remote_new(&g_origin, NULL, "origin", src, GIT_REMOTE_DEFAULT_FETCH)); - - g_options.bare = true; - cl_git_pass(git_clone(&g_repo, g_origin, "./empty", &g_options)); -} - -void test_clone_nonetwork__can_clone_an_empty_local_repo(void) -{ - const char *src = cl_git_fixture_url("empty_bare.git"); - cl_set_cleanup(&cleanup_repository, "./empty"); - - git_remote_free(g_origin); - cl_git_pass(git_remote_new(&g_origin, NULL, "origin", src, GIT_REMOTE_DEFAULT_FETCH)); - - cl_git_pass(git_clone(&g_repo, g_origin, "./empty", &g_options)); -} - -void test_clone_nonetwork__can_clone_an_empty_standard_repo(void) -{ - const char *src; - - cl_git_sandbox_init("empty_standard_repo"); - src = cl_git_path_url("./empty_standard_repo"); - - git_remote_free(g_origin); - cl_git_pass(git_remote_new(&g_origin, NULL, "origin", src, GIT_REMOTE_DEFAULT_FETCH)); - - cl_set_cleanup(&cleanup_repository, "./empty"); - - cl_git_pass(git_clone(&g_repo, g_origin, "./empty", &g_options)); - - cl_git_sandbox_cleanup(); -} From 28abb187c468f9dfc4bab9353fe4c8485ca09099 Mon Sep 17 00:00:00 2001 From: Ben Straub Date: Fri, 14 Dec 2012 14:16:10 -0800 Subject: [PATCH 5/9] Stop returning incorrect error message --- src/refs.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/refs.c b/src/refs.c index df533c95d..85813096b 100644 --- a/src/refs.c +++ b/src/refs.c @@ -177,7 +177,7 @@ static int loose_parse_oid(git_oid *oid, git_buf *file_content) corrupted: giterr_set(GITERR_REFERENCE, "Corrupted loose reference file"); - return GIT_ENOTFOUND; + return -1; } static git_ref_t loose_guess_rtype(const git_buf *full_path) From 2a2d1ab0867a43fe9a206c20d3d34bab57a2fb06 Mon Sep 17 00:00:00 2001 From: Ben Straub Date: Sat, 15 Dec 2012 14:30:20 -0800 Subject: [PATCH 6/9] Cloning empty repos: only allow missing target for HEAD --- src/transports/local.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/transports/local.c b/src/transports/local.c index b5b1dd06d..c6c95ce75 100644 --- a/src/transports/local.c +++ b/src/transports/local.c @@ -54,9 +54,9 @@ static int add_ref(transport_local *t, const char *name) if (error < 0) { git__free(head->name); git__free(head); - if (error == GIT_ENOTFOUND) { + if (!strcmp(name, GIT_HEAD_FILE) && error == GIT_ENOTFOUND) { /* This is actually okay. Empty repos often have a HEAD that points to - * a nonexistant "refs/haeds/master". */ + * a nonexistent "refs/heads/master". */ giterr_clear(); return 0; } From a7f125cdba0fe00c7df39e124e104fd030718350 Mon Sep 17 00:00:00 2001 From: Ben Straub Date: Sat, 15 Dec 2012 14:56:20 -0800 Subject: [PATCH 7/9] Fix fetchhead tests --- tests-clar/fetchhead/network.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/tests-clar/fetchhead/network.c b/tests-clar/fetchhead/network.c index d10c891c6..dc223e2aa 100644 --- a/tests-clar/fetchhead/network.c +++ b/tests-clar/fetchhead/network.c @@ -63,8 +63,7 @@ static void fetchhead_test_fetch(const char *fetchspec, const char *expected_fet git_remote_disconnect(remote); git_remote_free(remote); - cl_git_pass(git_futils_readbuffer(&fetchhead_buf, - "./test1/.git/FETCH_HEAD")); + cl_git_pass(git_futils_readbuffer(&fetchhead_buf, "./foo/.git/FETCH_HEAD")); equals = (strcmp(fetchhead_buf.ptr, expected_fetchhead) == 0); From cc3e9b5af46ab090944c1a67900564479069c686 Mon Sep 17 00:00:00 2001 From: Ben Straub Date: Sun, 16 Dec 2012 10:50:10 -0800 Subject: [PATCH 8/9] Make building samples more friendly --- examples/.gitignore | 2 ++ examples/network/Makefile | 4 ++++ 2 files changed, 6 insertions(+) diff --git a/examples/.gitignore b/examples/.gitignore index 4c34e4ab5..e40bfc29f 100644 --- a/examples/.gitignore +++ b/examples/.gitignore @@ -1,2 +1,4 @@ general showindex +diff +*.dSYM diff --git a/examples/network/Makefile b/examples/network/Makefile index ef3cec659..60969bd87 100644 --- a/examples/network/Makefile +++ b/examples/network/Makefile @@ -14,3 +14,7 @@ OBJECTS = \ all: $(OBJECTS) $(CC) $(CFLAGS) $(LDFLAGS) -o git2 $(OBJECTS) + +clean: + $(RM) $(OBJECTS) + $(RM) git2 From c4e3e797d11bf7d8a9873a193e182d2537b0ee6a Mon Sep 17 00:00:00 2001 From: Ben Straub Date: Sun, 16 Dec 2012 12:27:11 -0800 Subject: [PATCH 9/9] Ensure static variables are nulled after every test --- tests-clar/network/push.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/tests-clar/network/push.c b/tests-clar/network/push.c index f8856091f..788af5267 100644 --- a/tests-clar/network/push.c +++ b/tests-clar/network/push.c @@ -211,6 +211,10 @@ void test_network_push__cleanup(void) { if (_remote) git_remote_free(_remote); + _remote = NULL; + + /* Freed by cl_git_sandbox_cleanup */ + _repo = NULL; record_callbacks_data_clear(&_record_cbs_data);