diff options
| author | Russell Belfer <rb@github.com> | 2013-01-02 17:01:34 -0800 |
|---|---|---|
| committer | Russell Belfer <rb@github.com> | 2013-01-04 15:47:43 -0800 |
| commit | 546d65a8dae8a7af7288163a580c08c827ebda1d (patch) | |
| tree | 4dd9337f19108bbee970a9c5b1258f94fb7d2270 /src/diff.c | |
| parent | a9a730075eee70444db4ab4bbb928c29a812bbbf (diff) | |
| download | libgit2-546d65a8dae8a7af7288163a580c08c827ebda1d.tar.gz | |
Fix up spoolandsort iterator usage
The spoolandsort iterator changes got sort-of cherry picked out of
this branch and so I dropped the commit when rebasing; however,
there were a few small changes that got dropped as well (since the
version merged upstream wasn't quite the same as what I dropped).
Diffstat (limited to 'src/diff.c')
| -rw-r--r-- | src/diff.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/diff.c b/src/diff.c index 042cdf451..82a816465 100644 --- a/src/diff.c +++ b/src/diff.c @@ -589,8 +589,7 @@ int git_diff__from_iterators( *diff_ptr = NULL; - if (!diff || - diff_list_init_from_iterators(diff, old_iter, new_iter) < 0) + if (!diff || diff_list_init_from_iterators(diff, old_iter, new_iter) < 0) goto fail; if (diff->opts.flags & GIT_DIFF_DELTAS_ARE_ICASE) { |