repository: remove log message override for switching the active branch

We want to use the "checkout: moving from ..." message in order to let
git know when a change of branch has happened. Make the convenience
functions for this goal write this message.

3 files changed, 34 insertions, 48 deletions

diff --git a/tests/repo/head.c b/tests/repo/head.c
index b838ff565..b26d6acc7 100644
--- a/tests/repo/head.c
+++ b/tests/repo/head.c
@@ -38,8 +38,8 @@ void test_repo_head__head_detached(void)
 
 	cl_assert_equal_i(false, git_repository_head_detached(repo));
 
-	cl_git_pass(git_repository_detach_head(repo, "CABLE DETACHED"));
-	check_last_reflog_entry(g_email, "CABLE DETACHED");
+	cl_git_pass(git_repository_detach_head(repo));
+	check_last_reflog_entry(g_email, "checkout: moving from master to a65fedf39aefe402d3bb6e24df4d4f5fe4547750");
 	cl_assert_equal_i(true, git_repository_head_detached(repo));
 
 	/* take the repo back to it's original state */
@@ -73,7 +73,7 @@ void test_repo_head__set_head_Attaches_HEAD_to_un_unborn_branch_when_the_branch_
 {
 	git_reference *head;
 
-	cl_git_pass(git_repository_set_head(repo, "refs/heads/doesnt/exist/yet", NULL));
+	cl_git_pass(git_repository_set_head(repo, "refs/heads/doesnt/exist/yet"));
 
 	cl_assert_equal_i(false, git_repository_head_detached(repo));
 
@@ -82,19 +82,19 @@ void test_repo_head__set_head_Attaches_HEAD_to_un_unborn_branch_when_the_branch_
 
 void test_repo_head__set_head_Returns_ENOTFOUND_when_the_reference_doesnt_exist(void)
 {
-	cl_assert_equal_i(GIT_ENOTFOUND, git_repository_set_head(repo, "refs/tags/doesnt/exist/yet", NULL));
+	cl_assert_equal_i(GIT_ENOTFOUND, git_repository_set_head(repo, "refs/tags/doesnt/exist/yet"));
 }
 
 void test_repo_head__set_head_Fails_when_the_reference_points_to_a_non_commitish(void)
 {
-	cl_git_fail(git_repository_set_head(repo, "refs/tags/point_to_blob", NULL));
+	cl_git_fail(git_repository_set_head(repo, "refs/tags/point_to_blob"));
 }
 
 void test_repo_head__set_head_Attaches_HEAD_when_the_reference_points_to_a_branch(void)
 {
 	git_reference *head;
 
-	cl_git_pass(git_repository_set_head(repo, "refs/heads/br2", NULL));
+	cl_git_pass(git_repository_set_head(repo, "refs/heads/br2"));
 
 	cl_assert_equal_i(false, git_repository_head_detached(repo));
 
@@ -121,7 +121,7 @@ static void assert_head_is_correctly_detached(void)
 
 void test_repo_head__set_head_Detaches_HEAD_when_the_reference_doesnt_point_to_a_branch(void)
 {
-	cl_git_pass(git_repository_set_head(repo, "refs/tags/test", NULL));
+	cl_git_pass(git_repository_set_head(repo, "refs/tags/test"));
 
 	cl_assert_equal_i(true, git_repository_head_detached(repo));
 
@@ -134,7 +134,7 @@ void test_repo_head__set_head_detached_Return_ENOTFOUND_when_the_object_doesnt_e
 
 	cl_git_pass(git_oid_fromstr(&oid, "deadbeefdeadbeefdeadbeefdeadbeefdeadbeef"));
 
-	cl_assert_equal_i(GIT_ENOTFOUND, git_repository_set_head_detached(repo, &oid, NULL));
+	cl_assert_equal_i(GIT_ENOTFOUND, git_repository_set_head_detached(repo, &oid));
 }
 
 void test_repo_head__set_head_detached_Fails_when_the_object_isnt_a_commitish(void)
@@ -143,7 +143,7 @@ void test_repo_head__set_head_detached_Fails_when_the_object_isnt_a_commitish(vo
 
 	cl_git_pass(git_revparse_single(&blob, repo, "point_to_blob"));
 
-	cl_git_fail(git_repository_set_head_detached(repo, git_object_id(blob), NULL));
+	cl_git_fail(git_repository_set_head_detached(repo, git_object_id(blob)));
 
 	git_object_free(blob);
 }
@@ -155,7 +155,7 @@ void test_repo_head__set_head_detached_Detaches_HEAD_and_make_it_point_to_the_pe
 	cl_git_pass(git_revparse_single(&tag, repo, "tags/test"));
 	cl_assert_equal_i(GIT_OBJ_TAG, git_object_type(tag));
 
-	cl_git_pass(git_repository_set_head_detached(repo, git_object_id(tag), NULL));
+	cl_git_pass(git_repository_set_head_detached(repo, git_object_id(tag)));
 
 	assert_head_is_correctly_detached();
 
@@ -166,7 +166,7 @@ void test_repo_head__detach_head_Detaches_HEAD_and_make_it_point_to_the_peeled_c
 {
 	cl_assert_equal_i(false, git_repository_head_detached(repo));
 
-	cl_git_pass(git_repository_detach_head(repo, NULL));
+	cl_git_pass(git_repository_detach_head(repo));
 
 	assert_head_is_correctly_detached();
 }
@@ -177,7 +177,7 @@ void test_repo_head__detach_head_Fails_if_HEAD_and_point_to_a_non_commitish(void
 
 	cl_git_pass(git_reference_symbolic_create(&head, repo, GIT_HEAD_FILE, "refs/tags/point_to_blob", 1, NULL));
 
-	cl_git_fail(git_repository_detach_head(repo, NULL));
+	cl_git_fail(git_repository_detach_head(repo));
 
 	git_reference_free(head);
 }
@@ -186,7 +186,7 @@ void test_repo_head__detaching_an_unborn_branch_returns_GIT_EUNBORNBRANCH(void)
 {
 	make_head_unborn(repo, NON_EXISTING_HEAD);
 
-	cl_assert_equal_i(GIT_EUNBORNBRANCH, git_repository_detach_head(repo, NULL));
+	cl_assert_equal_i(GIT_EUNBORNBRANCH, git_repository_detach_head(repo));
 }
 
 void test_repo_head__retrieving_an_unborn_branch_returns_GIT_EUNBORNBRANCH(void)
@@ -254,15 +254,15 @@ void test_repo_head__setting_head_updates_reflog(void)
 
 	cl_git_pass(git_signature_now(&sig, "me", "foo@example.com"));
 
-	cl_git_pass(git_repository_set_head(repo, "refs/heads/haacked", "message1"));
-	cl_git_pass(git_repository_set_head(repo, "refs/heads/unborn", "message2"));
+	cl_git_pass(git_repository_set_head(repo, "refs/heads/haacked"));
+	cl_git_pass(git_repository_set_head(repo, "refs/heads/unborn"));
 	cl_git_pass(git_revparse_single(&tag, repo, "tags/test"));
-	cl_git_pass(git_repository_set_head_detached(repo, git_object_id(tag),"message3"));
-	cl_git_pass(git_repository_set_head(repo, "refs/heads/haacked", "message4"));
+	cl_git_pass(git_repository_set_head_detached(repo, git_object_id(tag)));
+	cl_git_pass(git_repository_set_head(repo, "refs/heads/haacked"));
 
-	test_reflog(repo, 2, NULL, "refs/heads/haacked", "foo@example.com", "message1");
-	test_reflog(repo, 1, NULL, "tags/test^{commit}", "foo@example.com", "message3");
-	test_reflog(repo, 0, "tags/test^{commit}", "refs/heads/haacked", "foo@example.com", "message4");
+	test_reflog(repo, 2, NULL, "refs/heads/haacked", "foo@example.com", "checkout: moving from master to haacked");
+	test_reflog(repo, 1, NULL, "tags/test^{commit}", "foo@example.com", "checkout: moving from unborn to e90810b8df3e80c413d903f631643c716887138d");
+	test_reflog(repo, 0, "tags/test^{commit}", "refs/heads/haacked", "foo@example.com", "checkout: moving from e90810b8df3e80c413d903f631643c716887138d to haacked");
 
 	git_object_free(tag);
 	git_signature_free(sig);
@@ -297,14 +297,14 @@ void test_repo_head__detaching_writes_reflog(void)
 
 	cl_git_pass(git_signature_now(&sig, "me", "foo@example.com"));
 
-	msg = "message1";
+	msg = "checkout: moving from master to e90810b8df3e80c413d903f631643c716887138d";
 	git_oid_fromstr(&id, "e90810b8df3e80c413d903f631643c716887138d");
-	cl_git_pass(git_repository_set_head_detached(repo, &id, msg));
+	cl_git_pass(git_repository_set_head_detached(repo, &id));
 	assert_head_reflog(repo, 0, "a65fedf39aefe402d3bb6e24df4d4f5fe4547750",
 			   "e90810b8df3e80c413d903f631643c716887138d", msg);
 
-	msg = "message2";
-	cl_git_pass(git_repository_set_head(repo, "refs/heads/haacked", msg));
+	msg = "checkout: moving from e90810b8df3e80c413d903f631643c716887138d to haacked";
+	cl_git_pass(git_repository_set_head(repo, "refs/heads/haacked"));
 	assert_head_reflog(repo, 0, "e90810b8df3e80c413d903f631643c716887138d",
 			   "258f0e2a959a364e40ed6603d5d44fbb24765b10", msg);
 
@@ -313,37 +313,30 @@ void test_repo_head__detaching_writes_reflog(void)
 
 void test_repo_head__orphan_branch_does_not_count(void)
 {
-	git_signature *sig;
 	git_oid id;
 	const char *msg;
 
-	cl_git_pass(git_signature_now(&sig, "me", "foo@example.com"));
-
 	/* Have something known */
-	msg = "message1";
+	msg = "checkout: moving from master to e90810b8df3e80c413d903f631643c716887138d";
 	git_oid_fromstr(&id, "e90810b8df3e80c413d903f631643c716887138d");
-	cl_git_pass(git_repository_set_head_detached(repo, &id, msg));
+	cl_git_pass(git_repository_set_head_detached(repo, &id));
 	assert_head_reflog(repo, 0, "a65fedf39aefe402d3bb6e24df4d4f5fe4547750",
 			   "e90810b8df3e80c413d903f631643c716887138d", msg);
 
 	/* Switching to an orphan branch does not write tot he reflog */
-	cl_git_pass(git_repository_set_head(repo, "refs/heads/orphan", "ignored message"));
+	cl_git_pass(git_repository_set_head(repo, "refs/heads/orphan"));
 	assert_head_reflog(repo, 0, "a65fedf39aefe402d3bb6e24df4d4f5fe4547750",
 			   "e90810b8df3e80c413d903f631643c716887138d", msg);
 
 	/* And coming back, we set the source to zero */
-	msg = "message2";
-	cl_git_pass(git_repository_set_head(repo, "refs/heads/haacked", msg));
+	msg = "checkout: moving from orphan to haacked";
+	cl_git_pass(git_repository_set_head(repo, "refs/heads/haacked"));
 	assert_head_reflog(repo, 0, "0000000000000000000000000000000000000000",
 			   "258f0e2a959a364e40ed6603d5d44fbb24765b10", msg);
-
-	git_signature_free(sig);
 }
 
 void test_repo_head__set_to_current_target(void)
 {
-	git_signature *sig;
-	const char *msg;
 	git_reflog *log;
 	size_t nentries, nentries_after;
 
@@ -351,20 +344,14 @@ void test_repo_head__set_to_current_target(void)
 	nentries = git_reflog_entrycount(log);
 	git_reflog_free(log);
 
-	cl_git_pass(git_signature_now(&sig, "me", "foo@example.com"));
-
-	msg = "message 1";
-	cl_git_pass(git_repository_set_head(repo, "refs/heads/haacked", msg));
-	cl_git_pass(git_repository_set_head(repo, "refs/heads/haacked", msg));
+	cl_git_pass(git_repository_set_head(repo, "refs/heads/haacked"));
+	cl_git_pass(git_repository_set_head(repo, "refs/heads/haacked"));
 
 	cl_git_pass(git_reflog_read(&log, repo, GIT_HEAD_FILE));
 	nentries_after = git_reflog_entrycount(log);
 	git_reflog_free(log);
 
 	cl_assert_equal_i(nentries + 1, nentries_after);
-
-	git_signature_free(sig);
-
 }
 
 void test_repo_head__branch_birth(void)
@@ -387,8 +374,7 @@ void test_repo_head__branch_birth(void)
 	cl_git_pass(git_reference_peel((git_object **) &tree, ref, GIT_OBJ_TREE));
 	git_reference_free(ref);
 
-	msg = "message 1";
-	cl_git_pass(git_repository_set_head(repo, "refs/heads/orphan", msg));
+	cl_git_pass(git_repository_set_head(repo, "refs/heads/orphan"));
 
 	cl_git_pass(git_reflog_read(&log, repo, GIT_HEAD_FILE));
 	nentries_after = git_reflog_entrycount(log);
diff --git a/tests/repo/headtree.c b/tests/repo/headtree.c
index e8721b7a3..e899ac399 100644
--- a/tests/repo/headtree.c
+++ b/tests/repo/headtree.c
@@ -20,7 +20,7 @@ void test_repo_headtree__cleanup(void)
 
 void test_repo_headtree__can_retrieve_the_root_tree_from_a_detached_head(void)
 {
-	cl_git_pass(git_repository_detach_head(repo, NULL));
+	cl_git_pass(git_repository_detach_head(repo));
 
 	cl_git_pass(git_repository_head_tree(&tree, repo));
 
diff --git a/tests/repo/state.c b/tests/repo/state.c
index 8e03f5bc3..bf2633c17 100644
--- a/tests/repo/state.c
+++ b/tests/repo/state.c
@@ -37,7 +37,7 @@ void test_repo_state__none_with_HEAD_attached(void)
 
 void test_repo_state__none_with_HEAD_detached(void)
 {
-	cl_git_pass(git_repository_detach_head(_repo, NULL));
+	cl_git_pass(git_repository_detach_head(_repo));
 	assert_repo_state(GIT_REPOSITORY_STATE_NONE);
 }