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
45c8d3f4
Unverified
Commit
45c8d3f4
authored
Nov 05, 2019
by
Patrick Steinhardt
Committed by
GitHub
Nov 05, 2019
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #5295 from romkatv/fix-diff-res
fix a bug introduced in
8a23597b
parents
bf2911d7
1886478d
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
1 additions
and
1 deletions
+1
-1
src/diff_generate.c
+1
-1
No files found.
src/diff_generate.c
View file @
45c8d3f4
...
@@ -1371,7 +1371,7 @@ int git_diff_tree_to_index(
...
@@ -1371,7 +1371,7 @@ int git_diff_tree_to_index(
if
((
error
=
diff_prepare_iterator_opts
(
&
prefix
,
&
a_opts
,
iflag
,
&
b_opts
,
iflag
,
opts
))
<
0
||
if
((
error
=
diff_prepare_iterator_opts
(
&
prefix
,
&
a_opts
,
iflag
,
&
b_opts
,
iflag
,
opts
))
<
0
||
(
error
=
git_iterator_for_tree
(
&
a
,
old_tree
,
&
a_opts
))
<
0
||
(
error
=
git_iterator_for_tree
(
&
a
,
old_tree
,
&
a_opts
))
<
0
||
(
error
=
git_iterator_for_index
(
&
b
,
repo
,
index
,
&
b_opts
))
<
0
||
(
error
=
git_iterator_for_index
(
&
b
,
repo
,
index
,
&
b_opts
))
<
0
||
(
error
=
git_diff__from_iterators
(
&
diff
,
repo
,
a
,
b
,
opts
)
<
0
)
)
(
error
=
git_diff__from_iterators
(
&
diff
,
repo
,
a
,
b
,
opts
)
)
<
0
)
goto
out
;
goto
out
;
/* if index is in case-insensitive order, re-sort deltas to match */
/* if index is in case-insensitive order, re-sort deltas to match */
...
...
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