From 015d4b7b386ac799416f58b52549b2201dd4f2c3 Mon Sep 17 00:00:00 2001 From: nulltoken Date: Wed, 4 Mar 2015 21:48:54 +0100 Subject: [PATCH 1/3] branch: fix generated reflog message upon creation --- src/branch.c | 2 +- tests/refs/branches/create.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/branch.c b/src/branch.c index 06602c525..e2a451518 100644 --- a/src/branch.c +++ b/src/branch.c @@ -86,7 +86,7 @@ int git_branch_create( if (git_buf_joinpath(&canonical_branch_name, GIT_REFS_HEADS_DIR, branch_name) < 0) goto cleanup; - if (git_buf_printf(&log_message, "Branch: created from %s", git_oid_tostr_s(git_commit_id(commit))) < 0) + if (git_buf_printf(&log_message, "branch: Created from %s", git_oid_tostr_s(git_commit_id(commit))) < 0) goto cleanup; error = git_reference_create(&branch, repository, diff --git a/tests/refs/branches/create.c b/tests/refs/branches/create.c index dc805789f..d4cf4c29f 100644 --- a/tests/refs/branches/create.c +++ b/tests/refs/branches/create.c @@ -112,7 +112,7 @@ void test_refs_branches_create__default_reflog_message(void) cl_git_pass(git_reflog_read(&log, repo, "refs/heads/" NEW_BRANCH_NAME)); entry = git_reflog_entry_byindex(log, 0); - cl_git_pass(git_buf_printf(&buf, "Branch: created from %s", git_oid_tostr_s(git_commit_id(target)))); + cl_git_pass(git_buf_printf(&buf, "branch: Created from %s", git_oid_tostr_s(git_commit_id(target)))); cl_assert_equal_s(git_buf_cstr(&buf), git_reflog_entry_message(entry)); cl_assert_equal_s(sig->email, git_reflog_entry_committer(entry)->email); From 7eb7673406dea6ba9524af3987eb4a147b3b6718 Mon Sep 17 00:00:00 2001 From: nulltoken Date: Wed, 4 Mar 2015 22:01:20 +0100 Subject: [PATCH 2/3] branch: fix generated reflog message upon renaming --- src/branch.c | 2 +- tests/refs/branches/move.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/branch.c b/src/branch.c index e2a451518..70efd6a25 100644 --- a/src/branch.c +++ b/src/branch.c @@ -236,7 +236,7 @@ int git_branch_move( if ((error = git_buf_joinpath(&new_reference_name, GIT_REFS_HEADS_DIR, new_branch_name)) < 0) goto done; - if ((error = git_buf_printf(&log_message, "Branch: renamed %s to %s", + if ((error = git_buf_printf(&log_message, "branch: renamed %s to %s", git_reference_name(branch), git_buf_cstr(&new_reference_name))) < 0) goto done; diff --git a/tests/refs/branches/move.c b/tests/refs/branches/move.c index 6e335d1fa..fa0b2faca 100644 --- a/tests/refs/branches/move.c +++ b/tests/refs/branches/move.c @@ -216,7 +216,7 @@ void test_refs_branches_move__default_reflog_message(void) cl_git_pass(git_reflog_read(&log, repo, git_reference_name(new_branch))); entry = git_reflog_entry_byindex(log, 0); - cl_assert_equal_s("Branch: renamed refs/heads/master to refs/heads/master2", + cl_assert_equal_s("branch: renamed refs/heads/master to refs/heads/master2", git_reflog_entry_message(entry)); cl_assert_equal_s(sig->email, git_reflog_entry_committer(entry)->email); From 05e644dd7e0e5694805b25d315b6a0945dcbc4e8 Mon Sep 17 00:00:00 2001 From: nulltoken Date: Wed, 4 Mar 2015 22:01:39 +0100 Subject: [PATCH 3/3] Drop trailing whitespaces --- src/branch.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/branch.c b/src/branch.c index 70efd6a25..a16d3a3f9 100644 --- a/src/branch.c +++ b/src/branch.c @@ -82,7 +82,7 @@ int git_branch_create( error = -1; goto cleanup; } - + if (git_buf_joinpath(&canonical_branch_name, GIT_REFS_HEADS_DIR, branch_name) < 0) goto cleanup;