Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
G
git2
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
lvzhengyang
git2
Commits
ba6b2884
Commit
ba6b2884
authored
Jul 07, 2015
by
Edward Thomson
Committed by
Carlos Martín Nieto
Jul 28, 2015
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
revert: correct test that added trailing newline
parent
9ff89eaa
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
12 additions
and
10 deletions
+12
-10
tests/revert/workdir.c
+12
-10
No files found.
tests/revert/workdir.c
View file @
ba6b2884
...
...
@@ -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
);
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment