diff options
| author | Edward Thomson <ethomson@edwardthomson.com> | 2015-07-07 16:46:20 -0500 |
|---|---|---|
| committer | Edward Thomson <ethomson@edwardthomson.com> | 2015-07-07 17:01:49 -0500 |
| commit | 43ce8cb52e86373711e8ec361c3052c8c39e7a2c (patch) | |
| tree | 38d31415a9c3c4483c534e4c0de7240f105b161b | |
| parent | ae8f7260ecbfc64e49d77ac2e86122971a560670 (diff) | |
| download | libgit2-43ce8cb52e86373711e8ec361c3052c8c39e7a2c.tar.gz | |
revert: correct test that added trailing newline
| -rw-r--r-- | tests/revert/workdir.c | 22 |
1 files changed, 12 insertions, 10 deletions
diff --git a/tests/revert/workdir.c b/tests/revert/workdir.c index 7ccf0f937..9f83bd842 100644 --- a/tests/revert/workdir.c +++ b/tests/revert/workdir.c @@ -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_git_pass(git_futils_readbuffer(&diff_buf, "revert/file.txt")); - cl_assert(strcmp(diff_buf.ptr, "a\n" \ - "<<<<<<< HEAD\n" \ - "=======\n" \ - "a\n" \ - ">>>>>>> parent of 97e52d5... Revert me\n" \ - "a\n" \ - "a\n" \ - "a\n" \ - "a\n" \ - "ab\n") == 0); + cl_assert_equal_s( + "a\n" \ + "<<<<<<< HEAD\n" \ + "=======\n" \ + "a\n" \ + ">>>>>>> parent of 97e52d5... Revert me\n" \ + "a\n" \ + "a\n" \ + "a\n" \ + "a\n" \ + "ab", + diff_buf.ptr); git_commit_free(revert_commit); git_commit_free(head_commit); |