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
7826d577
Commit
7826d577
authored
Mar 21, 2012
by
schu
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
diff_output: remove unused parameter
Signed-off-by: schu <schu-github@schulog.org>
parent
e71b78b0
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
4 additions
and
8 deletions
+4
-8
include/git2/diff.h
+0
-1
src/diff_output.c
+0
-3
tests-clar/diff/blob.c
+4
-4
No files found.
include/git2/diff.h
View file @
7826d577
...
@@ -340,7 +340,6 @@ GIT_EXTERN(int) git_diff_print_patch(
...
@@ -340,7 +340,6 @@ GIT_EXTERN(int) git_diff_print_patch(
* Directly run a text diff on two blobs.
* Directly run a text diff on two blobs.
*/
*/
GIT_EXTERN
(
int
)
git_diff_blobs
(
GIT_EXTERN
(
int
)
git_diff_blobs
(
git_repository
*
repo
,
git_blob
*
old_blob
,
git_blob
*
old_blob
,
git_blob
*
new_blob
,
git_blob
*
new_blob
,
git_diff_options
*
options
,
git_diff_options
*
options
,
...
...
src/diff_output.c
View file @
7826d577
...
@@ -671,7 +671,6 @@ int git_diff_print_patch(
...
@@ -671,7 +671,6 @@ int git_diff_print_patch(
int
git_diff_blobs
(
int
git_diff_blobs
(
git_repository
*
repo
,
git_blob
*
old_blob
,
git_blob
*
old_blob
,
git_blob
*
new_blob
,
git_blob
*
new_blob
,
git_diff_options
*
options
,
git_diff_options
*
options
,
...
@@ -686,8 +685,6 @@ int git_diff_blobs(
...
@@ -686,8 +685,6 @@ int git_diff_blobs(
xdemitconf_t
xdiff_config
;
xdemitconf_t
xdiff_config
;
xdemitcb_t
xdiff_callback
;
xdemitcb_t
xdiff_callback
;
assert
(
repo
);
if
(
options
&&
(
options
->
flags
&
GIT_DIFF_REVERSE
))
{
if
(
options
&&
(
options
->
flags
&
GIT_DIFF_REVERSE
))
{
git_blob
*
swap
=
old_blob
;
git_blob
*
swap
=
old_blob
;
old_blob
=
new_blob
;
old_blob
=
new_blob
;
...
...
tests-clar/diff/blob.c
View file @
7826d577
...
@@ -43,7 +43,7 @@ void test_diff_blob__0(void)
...
@@ -43,7 +43,7 @@ void test_diff_blob__0(void)
memset
(
&
exp
,
0
,
sizeof
(
exp
));
memset
(
&
exp
,
0
,
sizeof
(
exp
));
cl_git_pass
(
git_diff_blobs
(
cl_git_pass
(
git_diff_blobs
(
g_repo
,
a
,
b
,
&
opts
,
&
exp
,
diff_hunk_fn
,
diff_line_fn
));
a
,
b
,
&
opts
,
&
exp
,
diff_hunk_fn
,
diff_line_fn
));
cl_assert
(
exp
.
hunks
==
1
);
cl_assert
(
exp
.
hunks
==
1
);
cl_assert
(
exp
.
lines
==
6
);
cl_assert
(
exp
.
lines
==
6
);
...
@@ -53,7 +53,7 @@ void test_diff_blob__0(void)
...
@@ -53,7 +53,7 @@ void test_diff_blob__0(void)
memset
(
&
exp
,
0
,
sizeof
(
exp
));
memset
(
&
exp
,
0
,
sizeof
(
exp
));
cl_git_pass
(
git_diff_blobs
(
cl_git_pass
(
git_diff_blobs
(
g_repo
,
b
,
c
,
&
opts
,
&
exp
,
diff_hunk_fn
,
diff_line_fn
));
b
,
c
,
&
opts
,
&
exp
,
diff_hunk_fn
,
diff_line_fn
));
cl_assert
(
exp
.
hunks
==
1
);
cl_assert
(
exp
.
hunks
==
1
);
cl_assert
(
exp
.
lines
==
15
);
cl_assert
(
exp
.
lines
==
15
);
...
@@ -63,7 +63,7 @@ void test_diff_blob__0(void)
...
@@ -63,7 +63,7 @@ void test_diff_blob__0(void)
memset
(
&
exp
,
0
,
sizeof
(
exp
));
memset
(
&
exp
,
0
,
sizeof
(
exp
));
cl_git_pass
(
git_diff_blobs
(
cl_git_pass
(
git_diff_blobs
(
g_repo
,
a
,
c
,
&
opts
,
&
exp
,
diff_hunk_fn
,
diff_line_fn
));
a
,
c
,
&
opts
,
&
exp
,
diff_hunk_fn
,
diff_line_fn
));
cl_assert
(
exp
.
hunks
==
1
);
cl_assert
(
exp
.
hunks
==
1
);
cl_assert
(
exp
.
lines
==
13
);
cl_assert
(
exp
.
lines
==
13
);
...
@@ -75,7 +75,7 @@ void test_diff_blob__0(void)
...
@@ -75,7 +75,7 @@ void test_diff_blob__0(void)
memset
(
&
exp
,
0
,
sizeof
(
exp
));
memset
(
&
exp
,
0
,
sizeof
(
exp
));
cl_git_pass
(
git_diff_blobs
(
cl_git_pass
(
git_diff_blobs
(
g_repo
,
c
,
d
,
&
opts
,
&
exp
,
diff_hunk_fn
,
diff_line_fn
));
c
,
d
,
&
opts
,
&
exp
,
diff_hunk_fn
,
diff_line_fn
));
cl_assert
(
exp
.
hunks
==
2
);
cl_assert
(
exp
.
hunks
==
2
);
cl_assert
(
exp
.
lines
==
14
);
cl_assert
(
exp
.
lines
==
14
);
...
...
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