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

revert: correct test that added trailing newline

Browse Source
This commit is contained in:
Edward Thomson 2015-07-07 16:46:20 -05:00
parent ae8f7260ec
commit 43ce8cb52e
1 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
tests/revert/workdir.c
View File

@ -334,16 +334,18 @@ void test_revert_workdir__again_after_edit_two(void)
cl_assert(merge_test_index(repo_index, merge_index_entries, 3)); cl_assert(merge_test_index(repo_index, merge_index_entries, 3));
cl_git_pass(git_futils_readbuffer(&diff_buf, "revert/file.txt")); cl_git_pass(git_futils_readbuffer(&diff_buf, "revert/file.txt"));
cl_assert(strcmp(diff_buf.ptr, "a\n" \ cl_assert_equal_s(
"<<<<<<< HEAD\n" \ "a\n" \
"=======\n" \ "<<<<<<< HEAD\n" \
"a\n" \ "=======\n" \
">>>>>>> parent of 97e52d5... Revert me\n" \ "a\n" \
"a\n" \ ">>>>>>> parent of 97e52d5... Revert me\n" \
"a\n" \ "a\n" \
"a\n" \ "a\n" \
"a\n" \ "a\n" \
"ab\n") == 0); "a\n" \
"ab",
diff_buf.ptr);
git_commit_free(revert_commit); git_commit_free(revert_commit);
git_commit_free(head_commit); git_commit_free(head_commit);