thodg/libgit2

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 188678c..39a2da6 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -254,7 +254,7 @@ IF (BUILD_CLAR)
 
 	ADD_CUSTOM_COMMAND(
 		OUTPUT ${CLAR_PATH}/clar.suite
-		COMMAND ${PYTHON_EXECUTABLE} clar/generate.py .
+		COMMAND ${PYTHON_EXECUTABLE} clar/generate.py . -xonline
 		DEPENDS ${SRC_TEST}
 		WORKING_DIRECTORY ${CLAR_PATH}
 	)
diff --git a/tests-clar/clar b/tests-clar/clar
index fe7d974..3f99b7f 160000
--- a/tests-clar/clar
+++ b/tests-clar/clar
@@ -1 +1 @@
-Subproject commit fe7d9740becabac0e856eb0cdc19bc7e48680ba5
+Subproject commit 3f99b7f36ffa2b0965eefd04abac998fa37ced23
diff --git a/tests-clar/online/clone.c b/tests-clar/online/clone.c
index f783a5a..bf35fac 100644
--- a/tests-clar/online/clone.c
+++ b/tests-clar/online/clone.c
@@ -10,7 +10,7 @@ static git_repository *g_repo;
 static git_remote *g_origin;
 static git_clone_options g_options;
 
-void test_clone_network__initialize(void)
+void test_online_clone__initialize(void)
 {
 	g_repo = NULL;
 
@@ -19,7 +19,7 @@ void test_clone_network__initialize(void)
 	cl_git_pass(git_remote_new(&g_origin, NULL, "origin", LIVE_REPO_URL, GIT_REMOTE_DEFAULT_FETCH));
 }
 
-void test_clone_network__cleanup(void)
+void test_online_clone__cleanup(void)
 {
 	git_remote_free(g_origin);
 }
@@ -34,7 +34,7 @@ static void cleanup_repository(void *path)
 }
 
 
-void test_clone_network__network_full(void)
+void test_online_clone__network_full(void)
 {
 	git_remote *origin;
 
@@ -48,7 +48,7 @@ void test_clone_network__network_full(void)
 }
 
 
-void test_clone_network__network_bare(void)
+void test_online_clone__network_bare(void)
 {
 	git_remote *origin;
 
@@ -62,7 +62,7 @@ void test_clone_network__network_bare(void)
 	git_remote_free(origin);
 }
 
-void test_clone_network__cope_with_already_existing_directory(void)
+void test_online_clone__cope_with_already_existing_directory(void)
 {
 	cl_set_cleanup(&cleanup_repository, "./foo");
 
@@ -70,7 +70,7 @@ void test_clone_network__cope_with_already_existing_directory(void)
 	cl_git_pass(git_clone(&g_repo, g_origin, "./foo", &g_options));
 }
 
-void test_clone_network__empty_repository(void)
+void test_online_clone__empty_repository(void)
 {
 	git_reference *head;
 
@@ -91,7 +91,7 @@ void test_clone_network__empty_repository(void)
 	git_reference_free(head);
 }
 
-void test_clone_network__can_prevent_the_checkout_of_a_standard_repo(void)
+void test_online_clone__can_prevent_the_checkout_of_a_standard_repo(void)
 {
 	git_buf path = GIT_BUF_INIT;
 	cl_set_cleanup(&cleanup_repository, "./foo");
@@ -118,7 +118,7 @@ static void fetch_progress(const git_transfer_progress *stats, void *payload)
 	(*was_called) = true;
 }
 
-void test_clone_network__can_checkout_a_cloned_repo(void)
+void test_online_clone__can_checkout_a_cloned_repo(void)
 {
 	git_checkout_opts opts = GIT_CHECKOUT_OPTS_INIT;
 	git_buf path = GIT_BUF_INIT;
diff --git a/tests-clar/online/fetch.c b/tests-clar/online/fetch.c
index 979b023..6fcea25 100644
--- a/tests-clar/online/fetch.c
+++ b/tests-clar/online/fetch.c
@@ -3,12 +3,12 @@
 static git_repository *_repo;
 static int counter;
 
-void test_network_fetch__initialize(void)
+void test_online_fetch__initialize(void)
 {
 	cl_git_pass(git_repository_init(&_repo, "./fetch", 0));
 }
 
-void test_network_fetch__cleanup(void)
+void test_online_fetch__cleanup(void)
 {
 	git_repository_free(_repo);
 	_repo = NULL;
@@ -53,22 +53,22 @@ static void do_fetch(const char *url, git_remote_autotag_option_t flag, int n)
 	git_remote_free(remote);
 }
 
-void test_network_fetch__default_git(void)
+void test_online_fetch__default_git(void)
 {
 	do_fetch("git://github.com/libgit2/TestGitRepository.git", GIT_REMOTE_DOWNLOAD_TAGS_AUTO, 6);
 }
 
-void test_network_fetch__default_http(void)
+void test_online_fetch__default_http(void)
 {
 	do_fetch("http://github.com/libgit2/TestGitRepository.git", GIT_REMOTE_DOWNLOAD_TAGS_AUTO, 6);
 }
 
-void test_network_fetch__no_tags_git(void)
+void test_online_fetch__no_tags_git(void)
 {
 	do_fetch("git://github.com/libgit2/TestGitRepository.git", GIT_REMOTE_DOWNLOAD_TAGS_NONE, 3);
 }
 
-void test_network_fetch__no_tags_http(void)
+void test_online_fetch__no_tags_http(void)
 {
 	do_fetch("http://github.com/libgit2/TestGitRepository.git", GIT_REMOTE_DOWNLOAD_TAGS_NONE, 3);
 }
@@ -81,7 +81,7 @@ static void transferProgressCallback(const git_transfer_progress *stats, void *p
 	*invoked = true;
 }
 
-void test_network_fetch__doesnt_retrieve_a_pack_when_the_repository_is_up_to_date(void)
+void test_online_fetch__doesnt_retrieve_a_pack_when_the_repository_is_up_to_date(void)
 {
 	git_repository *_repository;
 	bool invoked = false;
diff --git a/tests-clar/online/fetchhead.c b/tests-clar/online/fetchhead.c
index a6b8a6f..fb6cf57 100644
--- a/tests-clar/online/fetchhead.c
+++ b/tests-clar/online/fetchhead.c
@@ -11,7 +11,7 @@ static git_repository *g_repo;
 static git_remote *g_origin;
 static git_clone_options g_options;
 
-void test_fetchhead_network__initialize(void)
+void test_online_fetchhead__initialize(void)
 {
 	g_repo = NULL;
 
@@ -20,7 +20,7 @@ void test_fetchhead_network__initialize(void)
 	cl_git_pass(git_remote_new(&g_origin, NULL, "origin", LIVE_REPO_URL, GIT_REMOTE_DEFAULT_FETCH));
 }
 
-void test_fetchhead_network__cleanup(void)
+void test_online_fetchhead__cleanup(void)
 {
 	git_remote_free(g_origin);
 }
@@ -70,19 +70,19 @@ static void fetchhead_test_fetch(const char *fetchspec, const char *expected_fet
 	cl_assert(equals);
 }
 
-void test_fetchhead_network__wildcard_spec(void)
+void test_online_fetchhead__wildcard_spec(void)
 {
 	fetchhead_test_clone();
 	fetchhead_test_fetch(NULL, FETCH_HEAD_WILDCARD_DATA);
 }
 
-void test_fetchhead_network__explicit_spec(void)
+void test_online_fetchhead__explicit_spec(void)
 {
 	fetchhead_test_clone();
 	fetchhead_test_fetch("refs/heads/first-merge:refs/remotes/origin/first-merge", FETCH_HEAD_EXPLICIT_DATA);
 }
 
-void test_fetchhead_network__no_merges(void)
+void test_online_fetchhead__no_merges(void)
 {
 	git_config *config;
 
diff --git a/tests-clar/online/push.c b/tests-clar/online/push.c
index 8878e63..477a39e 100644
--- a/tests-clar/online/push.c
+++ b/tests-clar/online/push.c
@@ -125,7 +125,7 @@ static void verify_refs(git_remote *remote, expected_ref expected_refs[], size_t
 	git_vector_free(&actual_refs);
 }
 
-void test_network_push__initialize(void)
+void test_online_push__initialize(void)
 {
 	git_vector delete_specs = GIT_VECTOR_INIT;
 	size_t i;
@@ -205,7 +205,7 @@ void test_network_push__initialize(void)
 		printf("GITTEST_REMOTE_URL unset; skipping push test\n");
 }
 
-void test_network_push__cleanup(void)
+void test_online_push__cleanup(void)
 {
 	if (_remote)
 		git_remote_free(_remote);
@@ -269,12 +269,12 @@ static void do_push(const char *refspecs[], size_t refspecs_len,
 }
 
 /* Call push_finish() without ever calling git_push_add_refspec() */
-void test_network_push__noop(void)
+void test_online_push__noop(void)
 {
 	do_push(NULL, 0, NULL, 0, NULL, 0, 0);
 }
 
-void test_network_push__b1(void)
+void test_online_push__b1(void)
 {
 	const char *specs[] = { "refs/heads/b1:refs/heads/b1" };
 	push_status exp_stats[] = { { "refs/heads/b1", NULL } };
@@ -284,7 +284,7 @@ void test_network_push__b1(void)
 		exp_refs, ARRAY_SIZE(exp_refs), 0);
 }
 
-void test_network_push__b2(void)
+void test_online_push__b2(void)
 {
 	const char *specs[] = { "refs/heads/b2:refs/heads/b2" };
 	push_status exp_stats[] = { { "refs/heads/b2", NULL } };
@@ -294,7 +294,7 @@ void test_network_push__b2(void)
 		exp_refs, ARRAY_SIZE(exp_refs), 0);
 }
 
-void test_network_push__b3(void)
+void test_online_push__b3(void)
 {
 	const char *specs[] = { "refs/heads/b3:refs/heads/b3" };
 	push_status exp_stats[] = { { "refs/heads/b3", NULL } };
@@ -304,7 +304,7 @@ void test_network_push__b3(void)
 		exp_refs, ARRAY_SIZE(exp_refs), 0);
 }
 
-void test_network_push__b4(void)
+void test_online_push__b4(void)
 {
 	const char *specs[] = { "refs/heads/b4:refs/heads/b4" };
 	push_status exp_stats[] = { { "refs/heads/b4", NULL } };
@@ -314,7 +314,7 @@ void test_network_push__b4(void)
 		exp_refs, ARRAY_SIZE(exp_refs), 0);
 }
 
-void test_network_push__b5(void)
+void test_online_push__b5(void)
 {
 	const char *specs[] = { "refs/heads/b5:refs/heads/b5" };
 	push_status exp_stats[] = { { "refs/heads/b5", NULL } };
@@ -324,7 +324,7 @@ void test_network_push__b5(void)
 		exp_refs, ARRAY_SIZE(exp_refs), 0);
 }
 
-void test_network_push__multi(void)
+void test_online_push__multi(void)
 {
 	const char *specs[] = {
 		"refs/heads/b1:refs/heads/b1",
@@ -352,7 +352,7 @@ void test_network_push__multi(void)
 		exp_refs, ARRAY_SIZE(exp_refs), 0);
 }
 
-void test_network_push__implicit_tgt(void)
+void test_online_push__implicit_tgt(void)
 {
 	const char *specs1[] = { "refs/heads/b1:" };
 	push_status exp_stats1[] = { { "refs/heads/b1", NULL } };
@@ -373,7 +373,7 @@ void test_network_push__implicit_tgt(void)
 		exp_refs2, ARRAY_SIZE(exp_refs2), 0);
 }
 
-void test_network_push__fast_fwd(void)
+void test_online_push__fast_fwd(void)
 {
 	/* Fast forward b1 in tgt from _oid_b1 to _oid_b6. */
 
@@ -407,7 +407,7 @@ void test_network_push__fast_fwd(void)
 		exp_refs_ff, ARRAY_SIZE(exp_refs_ff), 0);
 }
 
-void test_network_push__force(void)
+void test_online_push__force(void)
 {
 	const char *specs1[] = {"refs/heads/b3:refs/heads/tgt"};
 	push_status exp_stats1[] = { { "refs/heads/tgt", NULL } };
@@ -433,7 +433,7 @@ void test_network_push__force(void)
 		exp_refs2_force, ARRAY_SIZE(exp_refs2_force), 0);
 }
 
-void test_network_push__delete(void)
+void test_online_push__delete(void)
 {
 	const char *specs1[] = {
 		"refs/heads/b1:refs/heads/tgt1",
@@ -486,7 +486,7 @@ void test_network_push__delete(void)
 		exp_refs_delete, ARRAY_SIZE(exp_refs_delete), 0);
 }
 
-void test_network_push__bad_refspecs(void)
+void test_online_push__bad_refspecs(void)
 {
 	/* All classes of refspecs that should be rejected by
 	 * git_push_add_refspec() should go in this test.
@@ -504,7 +504,7 @@ void test_network_push__bad_refspecs(void)
 	}
 }
 
-void test_network_push__expressions(void)
+void test_online_push__expressions(void)
 {
 	/* TODO: Expressions in refspecs doesn't actually work yet */
 	const char *specs_left_expr[] = { "refs/heads/b2~1:refs/heads/b2" };