proxmox-mirrors/libgit2
1
0
Fork 0
mirror of https://git.proxmox.com/git/libgit2 synced 2025-05-29 00:30:27 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #2950 from libgit2/ntk/reflog_branch_create

Browse Source 
branch: fix generated reflog message upon creation
This commit is contained in:
Carlos Martín Nieto 2015-03-06 22:44:15 +01:00
commit 91de1b0937
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/branch.c
View File

@ -82,11 +82,11 @@ int git_branch_create(
error = -1; error = -1;
goto cleanup; goto cleanup;
} }
if (git_buf_joinpath(&canonical_branch_name, GIT_REFS_HEADS_DIR, branch_name) < 0) if (git_buf_joinpath(&canonical_branch_name, GIT_REFS_HEADS_DIR, branch_name) < 0)
goto cleanup; 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; goto cleanup;
error = git_reference_create(&branch, repository, error = git_reference_create(&branch, repository,
@ -236,7 +236,7 @@ int git_branch_move(
if ((error = git_buf_joinpath(&new_reference_name, GIT_REFS_HEADS_DIR, new_branch_name)) < 0) if ((error = git_buf_joinpath(&new_reference_name, GIT_REFS_HEADS_DIR, new_branch_name)) < 0)
goto done; 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) git_reference_name(branch), git_buf_cstr(&new_reference_name))) < 0)
goto done; goto done;

2
tests/refs/branches/create.c
View File

@ -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)); cl_git_pass(git_reflog_read(&log, repo, "refs/heads/" NEW_BRANCH_NAME));
entry = git_reflog_entry_byindex(log, 0); 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(git_buf_cstr(&buf), git_reflog_entry_message(entry));
cl_assert_equal_s(sig->email, git_reflog_entry_committer(entry)->email); cl_assert_equal_s(sig->email, git_reflog_entry_committer(entry)->email);

2
tests/refs/branches/move.c
View File

@ -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))); cl_git_pass(git_reflog_read(&log, repo, git_reference_name(new_branch)));
entry = git_reflog_entry_byindex(log, 0); 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)); git_reflog_entry_message(entry));
cl_assert_equal_s(sig->email, git_reflog_entry_committer(entry)->email); cl_assert_equal_s(sig->email, git_reflog_entry_committer(entry)->email);