diff options
| author | Russell Belfer <rb@github.com> | 2012-09-25 21:48:50 +0400 |
|---|---|---|
| committer | Russell Belfer <rb@github.com> | 2012-09-26 03:35:05 +0400 |
| commit | 642863086575a61b3ed0bbbe909f4f07d87ff9db (patch) | |
| tree | 22cb6c0d2355e4a15edd645104b39fe2c33c97ac /src/diff.h | |
| parent | 5f69a31f7d706aa5788ad9937391577a66e3c77d (diff) | |
Fix bugs in new diff patch code
This fixes all the bugs in the new diff patch code. The only
really interesting one is that when we merge two diffs, we now
have to actually exclude diff delta records that are not supposed
to be tracked, as opposed to before where they could be included
because they would be skipped silently by `git_diff_foreach()`.
Other than that, there are just minor errors.
Diffstat (limited to 'src/diff.h')
| -rw-r--r-- | src/diff.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/diff.h b/src/diff.h index 862c33c1b..64fe00928 100644 --- a/src/diff.h +++ b/src/diff.h @@ -50,5 +50,8 @@ extern void git_diff__cleanup_modes( extern void git_diff_list_addref(git_diff_list *diff); +extern bool git_diff_delta__should_skip( + git_diff_options *opts, git_diff_delta *delta); + #endif |