diff options
| author | Russell Belfer <rb@github.com> | 2013-10-16 02:10:07 +0400 |
|---|---|---|
| committer | Russell Belfer <rb@github.com> | 2013-10-16 02:10:07 +0400 |
| commit | 10672e3e455eba2d4ca983070ed427caeeb24a6f (patch) | |
| tree | e812af06091362849e9ecd279c5547e401cb0862 /src/diff_xdiff.c | |
| parent | 3ff1d123736e5686fb9ec16e65828d5b8ffa2b30 (diff) | |
Diff API cleanup
This lays groundwork for separating formatting options from diff
creation options. This groups the formatting flags separately
from the diff list creation flags and reorders the options. This
also tweaks some APIs to further separate code that uses patches
from code that just looks at git_diffs.
Diffstat (limited to 'src/diff_xdiff.c')
| -rw-r--r-- | src/diff_xdiff.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/diff_xdiff.c b/src/diff_xdiff.c index e3aa8f3e1..972039753 100644 --- a/src/diff_xdiff.c +++ b/src/diff_xdiff.c @@ -59,7 +59,7 @@ static int git_xdiff_cb(void *priv, mmbuffer_t *bufs, int len) { git_xdiff_info *info = priv; git_patch *patch = info->patch; - const git_diff_delta *delta = git_patch_delta(patch); + const git_diff_delta *delta = git_patch_get_delta(patch); git_diff_output *output = &info->xo->output; if (len == 1) { @@ -145,7 +145,7 @@ static int git_xdiff(git_diff_output *output, git_patch *patch) void git_xdiff_init(git_xdiff_output *xo, const git_diff_options *opts) { - uint32_t flags = opts ? opts->flags : GIT_DIFF_NORMAL; + uint32_t flags = opts ? opts->flags : 0; xo->output.diff_cb = git_xdiff; |