Commit 45c8d3f410157187e12a27e4ebac359870f1fdf3

Patrick Steinhardt 2019-11-05T11:13:34

Merge pull request #5295 from romkatv/fix-diff-res fix a bug introduced in 8a23597b

1
2
3
4
5
6
7
8
9
10
11
12
13
diff --git a/src/diff_generate.c b/src/diff_generate.c
index b68efb6..7ec24d5 100644
--- a/src/diff_generate.c
+++ b/src/diff_generate.c
@@ -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 */