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

Fix broken tests caused by no longer prettifying by default

Browse Source
This commit is contained in:
Tim Clem 2012-06-15 10:15:57 -07:00
parent e4031cb531
commit e00b56eb04
2 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/commit.c
View File

@ -93,7 +93,7 @@ int git_commit_create(
int parent_count, int parent_count,
const git_commit *parents[]) const git_commit *parents[])
{ {
git_buf commit = GIT_BUF_INIT, cleaned_message = GIT_BUF_INIT; git_buf commit = GIT_BUF_INIT;
int i; int i;
git_odb *odb; git_odb *odb;
@ -114,11 +114,9 @@ int git_commit_create(
git_buf_putc(&commit, '\n'); git_buf_putc(&commit, '\n');
if (git_buf_puts(&commit, git_buf_cstr(&cleaned_message)) < 0) if (git_buf_puts(&commit, message) < 0)
goto on_error; goto on_error;
git_buf_free(&cleaned_message);
if (git_repository_odb__weakptr(&odb, repo) < 0) if (git_repository_odb__weakptr(&odb, repo) < 0)
goto on_error; goto on_error;
@ -134,7 +132,6 @@ int git_commit_create(
on_error: on_error:
git_buf_free(&commit); git_buf_free(&commit);
git_buf_free(&cleaned_message);
giterr_set(GITERR_OBJECT, "Failed to create commit."); giterr_set(GITERR_OBJECT, "Failed to create commit.");
return -1; return -1;
} }

2
tests-clar/object/commit/commitstagedfile.c
View File

@ -61,7 +61,7 @@ void test_object_commit_commitstagedfile__generate_predictable_object_ids(void)
* 100644 blob 9daeafb9864cf43055ae93beb0afd6c7d144bfa4 test.txt * 100644 blob 9daeafb9864cf43055ae93beb0afd6c7d144bfa4 test.txt
*/ */
cl_git_pass(git_oid_fromstr(&expected_commit_oid, "1fe3126578fc4eca68c193e4a3a0a14a0704624d")); cl_git_pass(git_oid_fromstr(&expected_commit_oid, "b78d8ac0e448a305bf2806a00947ade8e8966d58"));
cl_git_pass(git_oid_fromstr(&expected_tree_oid, "2b297e643c551e76cfa1f93810c50811382f9117")); cl_git_pass(git_oid_fromstr(&expected_tree_oid, "2b297e643c551e76cfa1f93810c50811382f9117"));
cl_git_pass(git_oid_fromstr(&expected_blob_oid, "9daeafb9864cf43055ae93beb0afd6c7d144bfa4")); cl_git_pass(git_oid_fromstr(&expected_blob_oid, "9daeafb9864cf43055ae93beb0afd6c7d144bfa4"));