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

Fix reflog message when creating commits

Browse Source
This commit is contained in:
Ben Straub 2014-02-04 15:32:57 -08:00
parent 86746b4b3a
commit 0adb06065b
2 changed files with 35 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/commit.c
View File

@ -111,8 +111,27 @@ int git_commit_create_from_ids(
git_buf_free(&commit); git_buf_free(&commit);
if (update_ref != NULL) if (update_ref != NULL) {
return git_reference__update_terminal(repo, update_ref, oid, NULL, NULL); int error;
git_commit *c;
const char *shortmsg;
git_buf reflog_msg = GIT_BUF_INIT;
if (git_commit_lookup(&c, repo, oid) < 0)
goto on_error;
shortmsg = git_commit_summary(c);
git_buf_printf(&reflog_msg, "commit%s: %s",
git_commit_parentcount(c) == 0 ? " (initial)" : "",
shortmsg);
git_commit_free(c);
error = git_reference__update_terminal(repo, update_ref, oid,
committer, git_buf_cstr(&reflog_msg));
git_buf_free(&reflog_msg);
return error;
}
return 0; return 0;

15
tests/commit/write.c
View File

@ -7,6 +7,8 @@ static const char *commit_message = "This commit has been created in memory\n\
static const char *tree_oid = "1810dff58d8a660512d4832e740f692884338ccd"; static const char *tree_oid = "1810dff58d8a660512d4832e740f692884338ccd";
static const char *root_commit_message = "This is a root commit\n\ static const char *root_commit_message = "This is a root commit\n\
This is a root commit and should be the only one in this branch\n"; This is a root commit and should be the only one in this branch\n";
static const char *root_reflog_message = "commit (initial): This is a root commit \
This is a root commit and should be the only one in this branch";
static char *head_old; static char *head_old;
static git_reference *head, *branch; static git_reference *head, *branch;
static git_commit *commit; static git_commit *commit;
@ -101,6 +103,8 @@ void test_commit_write__root(void)
git_signature *author, *committer; git_signature *author, *committer;
const char *branch_name = "refs/heads/root-commit-branch"; const char *branch_name = "refs/heads/root-commit-branch";
git_tree *tree; git_tree *tree;
git_reflog *log;
const git_reflog_entry *entry;
git_oid_fromstr(&tree_id, tree_oid); git_oid_fromstr(&tree_id, tree_oid);
cl_git_pass(git_tree_lookup(&tree, g_repo, &tree_id)); cl_git_pass(git_tree_lookup(&tree, g_repo, &tree_id));
@ -130,7 +134,6 @@ void test_commit_write__root(void)
0)); 0));
git_object_free((git_object *)tree); git_object_free((git_object *)tree);
git_signature_free(committer);
git_signature_free(author); git_signature_free(author);
/* /*
@ -144,4 +147,14 @@ void test_commit_write__root(void)
branch_oid = git_reference_target(branch); branch_oid = git_reference_target(branch);
cl_git_pass(git_oid_cmp(branch_oid, &commit_id)); cl_git_pass(git_oid_cmp(branch_oid, &commit_id));
cl_assert_equal_s(root_commit_message, git_commit_message(commit)); cl_assert_equal_s(root_commit_message, git_commit_message(commit));
cl_git_pass(git_reflog_read(&log, g_repo, branch_name));
cl_assert_equal_i(1, git_reflog_entrycount(log));
entry = git_reflog_entry_byindex(log, 0);
cl_assert_equal_s(committer->email, git_reflog_entry_committer(entry)->email);
cl_assert_equal_s(committer->name, git_reflog_entry_committer(entry)->name);
cl_assert_equal_s(root_reflog_message, git_reflog_entry_message(entry));
git_signature_free(committer);
git_reflog_free(log);
} }