Merge pull request #1063 from nulltoken/topic/invalid-name

EINVALIDSPEC

17 files changed, 243 insertions, 84 deletions

diff --git a/tests-clar/network/fetch.c b/tests-clar/network/fetch.c
index 84c947291..623352fa5 100644
--- a/tests-clar/network/fetch.c
+++ b/tests-clar/network/fetch.c
@@ -79,6 +79,9 @@ void test_network_fetch__no_tags_http(void)
 static void transferProgressCallback(const git_transfer_progress *stats, void *payload)
 {
 	bool *invoked = (bool *)payload;
+
+	GIT_UNUSED(stats);
+
 	*invoked = true;
 }
 
diff --git a/tests-clar/network/remoterename.c b/tests-clar/network/remoterename.c
index b14554572..bd582314d 100644
--- a/tests-clar/network/remoterename.c
+++ b/tests-clar/network/remoterename.c
@@ -121,7 +121,9 @@ void test_network_remoterename__new_name_can_contain_dots(void)
 
 void test_network_remoterename__new_name_must_conform_to_reference_naming_conventions(void)
 {
-	cl_git_fail(git_remote_rename(_remote, "new@{name", dont_call_me_cb, NULL));
+	cl_assert_equal_i(
+		GIT_EINVALIDSPEC,
+		git_remote_rename(_remote, "new@{name", dont_call_me_cb, NULL));
 }
 
 void test_network_remoterename__renamed_name_is_persisted(void)
diff --git a/tests-clar/network/remotes.c b/tests-clar/network/remotes.c
index 14fda1670..b4a3ad99d 100644
--- a/tests-clar/network/remotes.c
+++ b/tests-clar/network/remotes.c
@@ -202,6 +202,11 @@ void test_network_remotes__loading_a_missing_remote_returns_ENOTFOUND(void)
 	cl_assert_equal_i(GIT_ENOTFOUND, git_remote_load(&_remote, _repo, "just-left-few-minutes-ago"));
 }
 
+void test_network_remotes__loading_with_an_invalid_name_returns_EINVALIDSPEC(void)
+{
+	cl_assert_equal_i(GIT_EINVALIDSPEC, git_remote_load(&_remote, _repo, "Inv@{id"));
+}
+
 /*
  * $ git remote add addtest http://github.com/libgit2/libgit2
  *
@@ -229,8 +234,9 @@ void test_network_remotes__cannot_add_a_nameless_remote(void)
 {
 	git_remote *remote;
 
-	cl_git_fail(git_remote_add(&remote, _repo, NULL, "git://github.com/libgit2/libgit2"));
-	cl_git_fail(git_remote_add(&remote, _repo, "", "git://github.com/libgit2/libgit2"));
+	cl_assert_equal_i(
+		GIT_EINVALIDSPEC,
+		git_remote_add(&remote, _repo, NULL, "git://github.com/libgit2/libgit2"));
 }
 
 void test_network_remotes__cannot_save_a_nameless_remote(void)
@@ -239,13 +245,34 @@ void test_network_remotes__cannot_save_a_nameless_remote(void)
 
 	cl_git_pass(git_remote_new(&remote, _repo, NULL, "git://github.com/libgit2/libgit2", NULL));
 
-	cl_git_fail(git_remote_save(remote));
+	cl_assert_equal_i(GIT_EINVALIDSPEC, git_remote_save(remote));
 	git_remote_free(remote);
+}
 
-	cl_git_pass(git_remote_new(&remote, _repo, "", "git://github.com/libgit2/libgit2", NULL));
+void test_network_remotes__cannot_add_a_remote_with_an_invalid_name(void)
+{
+	git_remote *remote;
 
-	cl_git_fail(git_remote_save(remote));
-	git_remote_free(remote);
+	cl_assert_equal_i(
+		GIT_EINVALIDSPEC,
+		git_remote_add(&remote, _repo, "Inv@{id", "git://github.com/libgit2/libgit2"));
+
+	cl_assert_equal_i(
+		GIT_EINVALIDSPEC,
+		git_remote_add(&remote, _repo, "", "git://github.com/libgit2/libgit2"));
+}
+
+void test_network_remotes__cannot_initialize_a_remote_with_an_invalid_name(void)
+{
+	git_remote *remote;
+
+	cl_assert_equal_i(
+		GIT_EINVALIDSPEC,
+		git_remote_new(&remote, _repo, "Inv@{id", "git://github.com/libgit2/libgit2", NULL));
+
+	cl_assert_equal_i(
+		GIT_EINVALIDSPEC,
+		git_remote_new(&remote, _repo, "", "git://github.com/libgit2/libgit2", NULL));
 }
 
 void test_network_remotes__tagopt(void)
diff --git a/tests-clar/object/peel.c b/tests-clar/object/peel.c
index a19772858..bb0bbd096 100644
--- a/tests-clar/object/peel.c
+++ b/tests-clar/object/peel.c
@@ -79,12 +79,12 @@ void test_object_peel__can_peel_a_commit(void)
 
 void test_object_peel__cannot_peel_a_tree(void)
 {
-	assert_peel_error(GIT_ERROR, "53fc32d17276939fc79ed05badaef2db09990016", GIT_OBJ_BLOB);
+	assert_peel_error(GIT_EAMBIGUOUS, "53fc32d17276939fc79ed05badaef2db09990016", GIT_OBJ_BLOB);
 }
 
 void test_object_peel__cannot_peel_a_blob(void)
 {
-	assert_peel_error(GIT_ERROR, "0266163a49e280c4f5ed1e08facd36a2bd716bcf", GIT_OBJ_COMMIT);
+	assert_peel_error(GIT_ENOTFOUND, "0266163a49e280c4f5ed1e08facd36a2bd716bcf", GIT_OBJ_COMMIT);
 }
 
 void test_object_peel__target_any_object_for_type_change(void)
@@ -98,8 +98,13 @@ void test_object_peel__target_any_object_for_type_change(void)
 		"53fc32d17276939fc79ed05badaef2db09990016", GIT_OBJ_TREE);
 
 	/* fail to peel tree */
-	assert_peel_error(GIT_ERROR, "53fc32d17276939fc79ed05badaef2db09990016", GIT_OBJ_ANY);
+	assert_peel_error(GIT_EAMBIGUOUS, "53fc32d17276939fc79ed05badaef2db09990016", GIT_OBJ_ANY);
 
 	/* fail to peel blob */
-	assert_peel_error(GIT_ERROR, "0266163a49e280c4f5ed1e08facd36a2bd716bcf", GIT_OBJ_ANY);
+	assert_peel_error(GIT_ENOTFOUND, "0266163a49e280c4f5ed1e08facd36a2bd716bcf", GIT_OBJ_ANY);
+}
+
+void test_object_peel__should_use_a_well_known_type(void)
+{
+	assert_peel_error(GIT_EINVALIDSPEC, "7b4384978d2493e851f9cca7858815fac9b10980", GIT_OBJ__EXT2);
 }
diff --git a/tests-clar/object/tag/write.c b/tests-clar/object/tag/write.c
index ad6ca76b2..eb0ac2897 100644
--- a/tests-clar/object/tag/write.c
+++ b/tests-clar/object/tag/write.c
@@ -88,7 +88,6 @@ void test_object_tag_write__overwrite(void)
 
 	git_object_free(target);
 	git_signature_free(tagger);
-
 }
 
 void test_object_tag_write__replace(void)
@@ -190,3 +189,33 @@ void test_object_tag_write__delete(void)
 
 	git_reference_free(ref_tag);
 }
+
+void test_object_tag_write__creating_with_an_invalid_name_returns_EINVALIDSPEC(void)
+{
+	git_oid target_id, tag_id;
+	git_signature *tagger;
+	git_object *target;
+
+	git_oid_fromstr(&target_id, tagged_commit);
+	cl_git_pass(git_object_lookup(&target, g_repo, &target_id, GIT_OBJ_COMMIT));
+
+	cl_git_pass(git_signature_new(&tagger, tagger_name, tagger_email, 123456789, 60));
+
+	cl_assert_equal_i(GIT_EINVALIDSPEC,
+		git_tag_create(&tag_id, g_repo,
+		  "Inv@{id", target, tagger, tagger_message, 0)
+	);
+
+	cl_assert_equal_i(GIT_EINVALIDSPEC,
+		git_tag_create_lightweight(&tag_id, g_repo,
+		  "Inv@{id", target, 0)
+	);
+
+	git_object_free(target);
+	git_signature_free(tagger);
+}
+
+void test_object_tag_write__deleting_with_an_invalid_name_returns_EINVALIDSPEC(void)
+{
+	cl_assert_equal_i(GIT_EINVALIDSPEC, git_tag_delete(g_repo, "Inv@{id"));
+}
diff --git a/tests-clar/refs/branches/create.c b/tests-clar/refs/branches/create.c
index a8c4d4f51..693a592a3 100644
--- a/tests-clar/refs/branches/create.c
+++ b/tests-clar/refs/branches/create.c
@@ -65,3 +65,12 @@ void test_refs_branches_create__can_force_create_over_an_existing_branch(void)
 	cl_git_pass(git_oid_cmp(git_reference_target(branch), git_commit_id(target)));
 	cl_assert_equal_s("refs/heads/br2", git_reference_name(branch));
 }
+
+
+void test_refs_branches_create__creating_a_branch_with_an_invalid_name_returns_EINVALIDSPEC(void)
+{
+	retrieve_known_commit(&target, repo);
+
+	cl_assert_equal_i(GIT_EINVALIDSPEC,
+		git_branch_create(&branch, repo, "inv@{id", target, 0));
+}
\ No newline at end of file
diff --git a/tests-clar/refs/branches/lookup.c b/tests-clar/refs/branches/lookup.c
index d07ed0ed8..95d49a4b3 100644
--- a/tests-clar/refs/branches/lookup.c
+++ b/tests-clar/refs/branches/lookup.c
@@ -35,3 +35,11 @@ void test_refs_branches_lookup__trying_to_retrieve_an_unknown_branch_returns_ENO
 	cl_assert_equal_i(GIT_ENOTFOUND, git_branch_lookup(&branch, repo, "where/are/you", GIT_BRANCH_LOCAL));
 	cl_assert_equal_i(GIT_ENOTFOUND, git_branch_lookup(&branch, repo, "over/here", GIT_BRANCH_REMOTE));
 }
+
+void test_refs_branches_lookup__trying_to_retrieve_a_branch_with_an_invalid_name_returns_EINVALIDSPEC(void)
+{
+	cl_assert_equal_i(GIT_EINVALIDSPEC,
+		git_branch_lookup(&branch, repo, "are/you/inv@{id", GIT_BRANCH_LOCAL));
+	cl_assert_equal_i(GIT_EINVALIDSPEC,
+		git_branch_lookup(&branch, repo, "yes/i am", GIT_BRANCH_REMOTE));
+}
diff --git a/tests-clar/refs/branches/move.c b/tests-clar/refs/branches/move.c
index 4bf1d69d0..17fb6dfe6 100644
--- a/tests-clar/refs/branches/move.c
+++ b/tests-clar/refs/branches/move.c
@@ -51,6 +51,11 @@ void test_refs_branches_move__can_not_move_a_branch_if_its_destination_name_coll
 	cl_assert_equal_i(GIT_EEXISTS, git_branch_move(ref, "master", 0));
 }
 
+void test_refs_branches_move__moving_a_branch_with_an_invalid_name_returns_EINVALIDSPEC(void)
+{
+	cl_assert_equal_i(GIT_EINVALIDSPEC, git_branch_move(ref, "Inv@{id", 0));
+}
+
 void test_refs_branches_move__can_not_move_a_non_branch(void)
 {
 	git_reference *tag;
diff --git a/tests-clar/refs/branches/tracking.c b/tests-clar/refs/branches/tracking.c
index e8b2f24d7..7af5f974f 100644
--- a/tests-clar/refs/branches/tracking.c
+++ b/tests-clar/refs/branches/tracking.c
@@ -61,7 +61,7 @@ void test_refs_branches_tracking__trying_to_retrieve_a_remote_tracking_reference
 	cl_assert_equal_i(GIT_ENOTFOUND, git_branch_tracking(&tracking, branch));
 }
 
-static void assert_merge_and_or_remote_key_missing(git_repository *repository, git_object *target, const char *entry_name)
+static void assert_merge_and_or_remote_key_missing(git_repository *repository, const git_commit *target, const char *entry_name)
 {
 	git_reference *branch;
 
@@ -76,19 +76,19 @@ void test_refs_branches_tracking__retrieve_a_remote_tracking_reference_from_a_br
 {
 	git_reference *head;
 	git_repository *repository;
-	git_object *target;
+	git_commit *target;
 
 	repository = cl_git_sandbox_init("testrepo.git");
 
 	cl_git_pass(git_repository_head(&head, repository));
-	cl_git_pass(git_reference_peel(&target, head, GIT_OBJ_COMMIT));
+	cl_git_pass(git_reference_peel(((git_object **)&target), head, GIT_OBJ_COMMIT));
 	git_reference_free(head);
 
 	assert_merge_and_or_remote_key_missing(repository, target, "remoteless");
 	assert_merge_and_or_remote_key_missing(repository, target, "mergeless");
 	assert_merge_and_or_remote_key_missing(repository, target, "mergeandremoteless");
 
-	git_object_free(target);
+	git_commit_free(target);
 
 	cl_git_sandbox_cleanup();
 }
diff --git a/tests-clar/refs/create.c b/tests-clar/refs/create.c
index bef9bfd24..56c323d8a 100644
--- a/tests-clar/refs/create.c
+++ b/tests-clar/refs/create.c
@@ -25,16 +25,11 @@ void test_refs_create__symbolic(void)
 	git_reference *new_reference, *looked_up_ref, *resolved_ref;
 	git_repository *repo2;
 	git_oid id;
-	git_buf ref_path = GIT_BUF_INIT;
 
 	const char *new_head_tracker = "ANOTHER_HEAD_TRACKER";
 
 	git_oid_fromstr(&id, current_master_tip);
 
-	/* Retrieve the physical path to the symbolic ref for further cleaning */
-	cl_git_pass(git_buf_joinpath(&ref_path, g_repo->path_repository, new_head_tracker));
-	git_buf_free(&ref_path);
-
 	/* Create and write the new symbolic reference */
 	cl_git_pass(git_reference_symbolic_create(&new_reference, g_repo, new_head_tracker, current_head_target, 0));
 
@@ -72,13 +67,11 @@ void test_refs_create__deep_symbolic(void)
    // create a deep symbolic reference
 	git_reference *new_reference, *looked_up_ref, *resolved_ref;
 	git_oid id;
-	git_buf ref_path = GIT_BUF_INIT;
 
 	const char *new_head_tracker = "deep/rooted/tracker";
 
 	git_oid_fromstr(&id, current_master_tip);
 
-	cl_git_pass(git_buf_joinpath(&ref_path, g_repo->path_repository, new_head_tracker));
 	cl_git_pass(git_reference_symbolic_create(&new_reference, g_repo, new_head_tracker, current_head_target, 0));
 	cl_git_pass(git_reference_lookup(&looked_up_ref, g_repo, new_head_tracker));
 	cl_git_pass(git_reference_resolve(&resolved_ref, looked_up_ref));
@@ -87,7 +80,6 @@ void test_refs_create__deep_symbolic(void)
 	git_reference_free(new_reference);
 	git_reference_free(looked_up_ref);
 	git_reference_free(resolved_ref);
-	git_buf_free(&ref_path);
 }
 
 void test_refs_create__oid(void)
@@ -96,15 +88,11 @@ void test_refs_create__oid(void)
 	git_reference *new_reference, *looked_up_ref;
 	git_repository *repo2;
 	git_oid id;
-	git_buf ref_path = GIT_BUF_INIT;
 
 	const char *new_head = "refs/heads/new-head";
 
 	git_oid_fromstr(&id, current_master_tip);
 
-	/* Retrieve the physical path to the symbolic ref for further cleaning */
-	cl_git_pass(git_buf_joinpath(&ref_path, g_repo->path_repository, new_head));
-
 	/* Create and write the new object id reference */
 	cl_git_pass(git_reference_create(&new_reference, g_repo, new_head, &id, 0));
 
@@ -128,7 +116,6 @@ void test_refs_create__oid(void)
 
 	git_reference_free(new_reference);
 	git_reference_free(looked_up_ref);
-	git_buf_free(&ref_path);
 }
 
 void test_refs_create__oid_unknown(void)
@@ -162,3 +149,19 @@ void test_refs_create__propagate_eexists(void)
 	error = git_reference_symbolic_create(&ref, g_repo, "HEAD", current_head_target, false);
 	cl_assert(error == GIT_EEXISTS);
 }
+
+void test_refs_create__creating_a_reference_with_an_invalid_name_returns_EINVALIDSPEC(void)
+{
+	git_reference *new_reference;
+	git_oid id;
+
+	const char *name = "refs/heads/inv@{id";
+
+	git_oid_fromstr(&id, current_master_tip);
+
+	cl_assert_equal_i(GIT_EINVALIDSPEC, git_reference_create(
+		&new_reference, g_repo, name, &id, 0));
+
+	cl_assert_equal_i(GIT_EINVALIDSPEC, git_reference_symbolic_create(
+		&new_reference, g_repo, name, current_head_target, 0));
+}
diff --git a/tests-clar/refs/normalize.c b/tests-clar/refs/normalize.c
index a144ef5c0..870a533ca 100644
--- a/tests-clar/refs/normalize.c
+++ b/tests-clar/refs/normalize.c
@@ -21,7 +21,9 @@ static void ensure_refname_invalid(unsigned int flags, const char *input_refname
 {
 	char buffer_out[GIT_REFNAME_MAX];
 
-	cl_git_fail(git_reference_normalize_name(buffer_out, sizeof(buffer_out), input_refname, flags));
+	cl_assert_equal_i(
+		GIT_EINVALIDSPEC,
+		git_reference_normalize_name(buffer_out, sizeof(buffer_out), input_refname, flags));
 }
 
 void test_refs_normalize__can_normalize_a_direct_reference_name(void)
diff --git a/tests-clar/refs/peel.c b/tests-clar/refs/peel.c
index 6fa6009d5..34bd02ce0 100644
--- a/tests-clar/refs/peel.c
+++ b/tests-clar/refs/peel.c
@@ -78,7 +78,7 @@ void test_refs_peel__can_peel_a_symbolic_reference(void)
 
 void test_refs_peel__cannot_peel_into_a_non_existing_target(void)
 {
-	assert_peel_error(GIT_ERROR, "refs/tags/point_to_blob", GIT_OBJ_TAG);
+	assert_peel_error(GIT_ENOTFOUND, "refs/tags/point_to_blob", GIT_OBJ_TAG);
 }
 
 void test_refs_peel__can_peel_into_any_non_tag_object(void)
diff --git a/tests-clar/refs/read.c b/tests-clar/refs/read.c
index c10a540c0..3e2a59afd 100644
--- a/tests-clar/refs/read.c
+++ b/tests-clar/refs/read.c
@@ -223,11 +223,19 @@ void test_refs_read__trailing(void)
 void test_refs_read__unfound_return_ENOTFOUND(void)
 {
 	git_reference *reference;
+	git_oid id;
 
-	cl_assert_equal_i(GIT_ENOTFOUND, git_reference_lookup(&reference, g_repo, "TEST_MASTER"));
-	cl_assert_equal_i(GIT_ENOTFOUND, git_reference_lookup(&reference, g_repo, "refs/test/master"));
-	cl_assert_equal_i(GIT_ENOTFOUND, git_reference_lookup(&reference, g_repo, "refs/tags/test/master"));
-	cl_assert_equal_i(GIT_ENOTFOUND, git_reference_lookup(&reference, g_repo, "refs/tags/test/farther/master"));
+	cl_assert_equal_i(GIT_ENOTFOUND,
+		git_reference_lookup(&reference, g_repo, "TEST_MASTER"));
+	cl_assert_equal_i(GIT_ENOTFOUND,
+		git_reference_lookup(&reference, g_repo, "refs/test/master"));
+	cl_assert_equal_i(GIT_ENOTFOUND,
+		git_reference_lookup(&reference, g_repo, "refs/tags/test/master"));
+	cl_assert_equal_i(GIT_ENOTFOUND,
+		git_reference_lookup(&reference, g_repo, "refs/tags/test/farther/master"));
+
+	cl_assert_equal_i(GIT_ENOTFOUND,
+		git_reference_name_to_id(&id, g_repo, "refs/tags/test/farther/master"));
 }
 
 static void assert_is_branch(const char *name, bool expected_branchness)
@@ -245,3 +253,15 @@ void test_refs_read__can_determine_if_a_reference_is_a_local_branch(void)
 	assert_is_branch("refs/remotes/test/master", false);
 	assert_is_branch("refs/tags/e90810b", false);
 }
+
+void test_refs_read__invalid_name_returns_EINVALIDSPEC(void)
+{
+	git_reference *reference;
+	git_oid id;
+
+	cl_assert_equal_i(GIT_EINVALIDSPEC,
+		git_reference_lookup(&reference, g_repo, "refs/heads/Inv@{id"));
+
+	cl_assert_equal_i(GIT_EINVALIDSPEC,
+		git_reference_name_to_id(&id, g_repo, "refs/heads/Inv@{id"));
+}
diff --git a/tests-clar/refs/reflog/reflog.c b/tests-clar/refs/reflog/reflog.c
index 8743c8a76..19ee53567 100644
--- a/tests-clar/refs/reflog/reflog.c
+++ b/tests-clar/refs/reflog/reflog.c
@@ -170,3 +170,15 @@ void test_refs_reflog_reflog__cannot_write_a_moved_reflog(void)
 	git_buf_free(&moved_log_path);
 	git_buf_free(&master_log_path);
 }
+
+void test_refs_reflog_reflog__renaming_with_an_invalid_name_returns_EINVALIDSPEC(void)
+{
+	git_reference *master;
+
+	cl_git_pass(git_reference_lookup(&master, g_repo, "refs/heads/master"));
+
+	cl_assert_equal_i(GIT_EINVALIDSPEC,
+		git_reflog_rename(master, "refs/heads/Inv@{id"));
+
+	git_reference_free(master);
+}
diff --git a/tests-clar/refs/rename.c b/tests-clar/refs/rename.c
index ec5c12507..bfdef15fa 100644
--- a/tests-clar/refs/rename.c
+++ b/tests-clar/refs/rename.c
@@ -180,10 +180,14 @@ void test_refs_rename__invalid_name(void)
 	cl_git_pass(git_reference_lookup(&looked_up_ref, g_repo, packed_test_head_name));
 
 	/* Can not be renamed with an invalid name. */
-	cl_git_fail(git_reference_rename(looked_up_ref, "Hello! I'm a very invalid name.", 0));
-
-	/* Can not be renamed outside of the refs hierarchy. */
-	cl_git_fail(git_reference_rename(looked_up_ref, "i-will-sudo-you", 0));
+	cl_assert_equal_i(
+		GIT_EINVALIDSPEC,
+		git_reference_rename(looked_up_ref, "Hello! I'm a very invalid name.", 0));
+
+	/* Can not be renamed outside of the refs hierarchy
+	 * unless it's ALL_CAPS_AND_UNDERSCORES.
+	 */
+	cl_assert_equal_i(GIT_EINVALIDSPEC, git_reference_rename(looked_up_ref, "i-will-sudo-you", 0));
 
 	/* Failure to rename it hasn't corrupted its state */
 	git_reference_free(looked_up_ref);
diff --git a/tests-clar/refs/revparse.c b/tests-clar/refs/revparse.c
index 3698b5197..81a6bc469 100644
--- a/tests-clar/refs/revparse.c
+++ b/tests-clar/refs/revparse.c
@@ -7,9 +7,6 @@
 
 static git_repository *g_repo;
 static git_object *g_obj;
-static char g_orig_tz[16] = {0};
-
-
 
 /* Helpers */
 static void test_object_inrepo(const char *spec, const char *expected_oid, git_repository *repo)
@@ -37,19 +34,12 @@ static void test_object(const char *spec, const char *expected_oid)
 
 void test_refs_revparse__initialize(void)
 {
-	char *tz = cl_getenv("TZ");
-	if (tz)
-		strcpy(g_orig_tz, tz);
-	cl_setenv("TZ", "UTC");
-
 	cl_git_pass(git_repository_open(&g_repo, cl_fixture("testrepo.git")));
 }
 
 void test_refs_revparse__cleanup(void)
 {
 	git_repository_free(g_repo);
-	g_obj = NULL;
-	cl_setenv("TZ", g_orig_tz);
 }
 
 void test_refs_revparse__nonexistant_object(void)
@@ -59,13 +49,17 @@ void test_refs_revparse__nonexistant_object(void)
 	test_object("this-does-not-exist~2", NULL);
 }
 
-void test_refs_revparse__invalid_reference_name(void)
+static void assert_invalid_spec(const char *invalid_spec)
 {
-	cl_git_fail(git_revparse_single(&g_obj, g_repo, "this doesn't make sense"));
-	cl_git_fail(git_revparse_single(&g_obj, g_repo, "this doesn't make sense^1"));
-	cl_git_fail(git_revparse_single(&g_obj, g_repo, "this doesn't make sense~2"));
-	cl_git_fail(git_revparse_single(&g_obj, g_repo, ""));
+	cl_assert_equal_i(
+		GIT_EINVALIDSPEC, git_revparse_single(&g_obj, g_repo, invalid_spec));
+}
 
+void test_refs_revparse__invalid_reference_name(void)
+{
+	assert_invalid_spec("this doesn't make sense");
+	assert_invalid_spec("Inv@{id");
+	assert_invalid_spec("");
 }
 
 void test_refs_revparse__shas(void)
@@ -104,9 +98,11 @@ void test_refs_revparse__describe_output(void)
 
 void test_refs_revparse__nth_parent(void)
 {
-	cl_git_fail(git_revparse_single(&g_obj, g_repo, "be3563a^-1"));
-	cl_git_fail(git_revparse_single(&g_obj, g_repo, "^"));
-	cl_git_fail(git_revparse_single(&g_obj, g_repo, "be3563a^{tree}^"));
+	assert_invalid_spec("be3563a^-1");
+	assert_invalid_spec("^");
+	assert_invalid_spec("be3563a^{tree}^");
+	assert_invalid_spec("point_to_blob^{blob}^");
+	assert_invalid_spec("this doesn't make sense^1");
 
 	test_object("be3563a^1", "9fd738e8f7967c078dceed8190330fc8648ee56a");
 	test_object("be3563a^", "9fd738e8f7967c078dceed8190330fc8648ee56a");
@@ -133,8 +129,10 @@ void test_refs_revparse__not_tag(void)
 
 void test_refs_revparse__to_type(void)
 {
-	cl_git_fail(git_revparse_single(&g_obj, g_repo, "wrapped_tag^{blob}"));
-	cl_git_fail(git_revparse_single(&g_obj, g_repo, "wrapped_tag^{trip}"));
+	assert_invalid_spec("wrapped_tag^{trip}");
+	test_object("point_to_blob^{commit}", NULL);
+	cl_assert_equal_i(
+		GIT_EAMBIGUOUS, git_revparse_single(&g_obj, g_repo, "wrapped_tag^{blob}"));
 
 	test_object("wrapped_tag^{commit}", "a65fedf39aefe402d3bb6e24df4d4f5fe4547750");
 	test_object("wrapped_tag^{tree}", "944c0f6e4dfa41595e6eb3ceecdb14f50fe18162");
@@ -144,11 +142,15 @@ void test_refs_revparse__to_type(void)
 
 void test_refs_revparse__linear_history(void)
 {
-	cl_git_fail(git_revparse_single(&g_obj, g_repo, "~"));
-	cl_git_fail(git_revparse_single(&g_obj, g_repo, "foo~bar"));
-	cl_git_fail(git_revparse_single(&g_obj, g_repo, "master~bar"));
-	cl_git_fail(git_revparse_single(&g_obj, g_repo, "master~-1"));
-	cl_git_fail(git_revparse_single(&g_obj, g_repo, "master~0bar"));
+	assert_invalid_spec("~");
+	test_object("foo~bar", NULL);
+
+	assert_invalid_spec("master~bar");
+	assert_invalid_spec("master~-1");
+	assert_invalid_spec("master~0bar");
+	assert_invalid_spec("this doesn't make sense~2");
+	assert_invalid_spec("be3563a^{tree}~");
+	assert_invalid_spec("point_to_blob^{blob}~");
 
 	test_object("master~0", "a65fedf39aefe402d3bb6e24df4d4f5fe4547750");
 	test_object("master~1", "be3563ae3f795b2b4353bcce3a527ad0a4f7f644");
@@ -159,10 +161,10 @@ void test_refs_revparse__linear_history(void)
 
 void test_refs_revparse__chaining(void)
 {
-	cl_git_fail(git_revparse_single(&g_obj, g_repo, "master@{0}@{0}"));
-	cl_git_fail(git_revparse_single(&g_obj, g_repo, "@{u}@{-1}"));
-	cl_git_fail(git_revparse_single(&g_obj, g_repo, "@{-1}@{-1}"));
-	cl_git_fail(git_revparse_single(&g_obj, g_repo, "@{-3}@{0}"));
+	assert_invalid_spec("master@{0}@{0}");
+	assert_invalid_spec("@{u}@{-1}");
+	assert_invalid_spec("@{-1}@{-1}");
+	assert_invalid_spec("@{-3}@{0}");
 
 	test_object("master@{0}~1^1", "9fd738e8f7967c078dceed8190330fc8648ee56a");
 	test_object("@{u}@{0}", "be3563ae3f795b2b4353bcce3a527ad0a4f7f644");
@@ -178,8 +180,9 @@ void test_refs_revparse__chaining(void)
 
 void test_refs_revparse__upstream(void)
 {
-	cl_git_fail(git_revparse_single(&g_obj, g_repo, "e90810b@{u}"));
-	cl_git_fail(git_revparse_single(&g_obj, g_repo, "refs/tags/e90810b@{u}"));
+	assert_invalid_spec("e90810b@{u}");
+	assert_invalid_spec("refs/tags/e90810b@{u}");
+	test_object("refs/heads/e90810b@{u}", NULL);
 
 	test_object("master@{upstream}", "be3563ae3f795b2b4353bcce3a527ad0a4f7f644");
 	test_object("@{u}", "be3563ae3f795b2b4353bcce3a527ad0a4f7f644");
@@ -190,7 +193,7 @@ void test_refs_revparse__upstream(void)
 
 void test_refs_revparse__ordinal(void)
 {
-	cl_git_fail(git_revparse_single(&g_obj, g_repo, "master@{-2}"));
+	assert_invalid_spec("master@{-2}");
 	
 	/* TODO: make the test below actually fail
 	 * cl_git_fail(git_revparse_single(&g_obj, g_repo, "master@{1a}"));
@@ -212,9 +215,9 @@ void test_refs_revparse__ordinal(void)
 
 void test_refs_revparse__previous_head(void)
 {
-	cl_git_fail(git_revparse_single(&g_obj, g_repo, "@{-xyz}"));
-	cl_git_fail(git_revparse_single(&g_obj, g_repo, "@{-0}"));
-	cl_git_fail(git_revparse_single(&g_obj, g_repo, "@{-1b}"));
+	assert_invalid_spec("@{-xyz}");
+	assert_invalid_spec("@{-0}");
+	assert_invalid_spec("@{-1b}");
 
 	test_object("@{-42}", NULL);
 
@@ -271,9 +274,9 @@ void test_refs_revparse__reflog_of_a_ref_under_refs(void)
 
 void test_refs_revparse__revwalk(void)
 {
-	cl_git_fail(git_revparse_single(&g_obj, g_repo, "master^{/not found in any commit}"));
-	cl_git_fail(git_revparse_single(&g_obj, g_repo, "master^{/merge}"));
-	cl_git_fail(git_revparse_single(&g_obj, g_repo, "master^{/((}"));
+	test_object("master^{/not found in any commit}", NULL);
+	test_object("master^{/merge}", NULL);
+	assert_invalid_spec("master^{/((}");
 
 	test_object("master^{/anoth}", "5b5b025afb0b4c913b4c338a42934a3863bf3644");
 	test_object("master^{/Merge}", "be3563ae3f795b2b4353bcce3a527ad0a4f7f644");
@@ -354,8 +357,9 @@ void test_refs_revparse__date(void)
 
 void test_refs_revparse__colon(void)
 {
-	cl_git_fail(git_revparse_single(&g_obj, g_repo, ":/"));
-	cl_git_fail(git_revparse_single(&g_obj, g_repo, ":2:README"));
+	assert_invalid_spec(":/");
+	assert_invalid_spec("point_to_blob:readme.txt");
+	cl_git_fail(git_revparse_single(&g_obj, g_repo, ":2:README")); /* Not implemented  */
 
 	test_object(":/not found in any commit", NULL);
 	test_object("subtrees:ab/42.txt", NULL);
@@ -445,11 +449,8 @@ void test_refs_revparse__disambiguation(void)
 
 void test_refs_revparse__a_too_short_objectid_returns_EAMBIGUOUS(void)
 {
-	int result;
-	
-	result = git_revparse_single(&g_obj, g_repo, "e90");
-	
-	cl_assert_equal_i(GIT_EAMBIGUOUS, result);
+	cl_assert_equal_i(
+		GIT_EAMBIGUOUS, git_revparse_single(&g_obj, g_repo, "e90"));
 }
 
 void test_refs_revparse__issue_994(void)
diff --git a/tests-clar/refs/update.c b/tests-clar/refs/update.c
new file mode 100644
index 000000000..6c2107ee2
--- /dev/null
+++ b/tests-clar/refs/update.c
@@ -0,0 +1,29 @@
+#include "clar_libgit2.h"
+
+#include "refs.h"
+
+static git_repository *g_repo;
+
+void test_refs_update__initialize(void)
+{
+   g_repo = cl_git_sandbox_init("testrepo.git");
+}
+
+void test_refs_update__cleanup(void)
+{
+   cl_git_sandbox_cleanup();
+}
+
+void test_refs_update__updating_the_target_of_a_symref_with_an_invalid_name_returns_EINVALIDSPEC(void)
+{
+	git_reference *head;
+
+	cl_git_pass(git_reference_lookup(&head, g_repo, GIT_HEAD_FILE));
+
+	cl_assert_equal_i(GIT_REF_SYMBOLIC, git_reference_type(head));
+
+	cl_assert_equal_i(GIT_EINVALIDSPEC, git_reference_symbolic_set_target(
+		head, "refs/heads/inv@{id"));
+
+	git_reference_free(head);
+}