Skip to content

Commit

Permalink
revert: correct test that added trailing newline
Browse files Browse the repository at this point in the history
  • Loading branch information
ethomson committed Jul 7, 2015
1 parent ae8f726 commit 43ce8cb
Showing 1 changed file with 12 additions and 10 deletions.
22 changes: 12 additions & 10 deletions tests/revert/workdir.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down

0 comments on commit 43ce8cb

Please sign in to comment.