Unverified Commit 45c8d3f4 by Patrick Steinhardt Committed by GitHub

Merge pull request #5295 from romkatv/fix-diff-res

fix a bug introduced in 8a23597b
parents bf2911d7 1886478d
......@@ -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 ||
(error = git_iterator_for_tree(&a, old_tree, &a_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;
/* if index is in case-insensitive order, re-sort deltas to match */
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment