diff options
| author | Vicent Martà <vicent@github.com> | 2013-11-04 08:05:55 -0800 |
|---|---|---|
| committer | Vicent Martà <vicent@github.com> | 2013-11-04 08:05:55 -0800 |
| commit | 5a0b88036f612ce7e9cdc24517c9b9eb6100a3d7 (patch) | |
| tree | 835825d113deeceef856702bfd7b427648579b4d /tests-clar/diff/tree.c | |
| parent | becb13c0f04c4ba54cf27303136293dbf8abfd73 (diff) | |
| parent | 3e57069e821ecf966c3de9c79923cd77657e923b (diff) | |
| download | libgit2-5a0b88036f612ce7e9cdc24517c9b9eb6100a3d7.tar.gz | |
Merge pull request #1929 from libgit2/rb/misc-diff-fixes
Fix some observed problems with incorrect diffs
Diffstat (limited to 'tests-clar/diff/tree.c')
| -rw-r--r-- | tests-clar/diff/tree.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/tests-clar/diff/tree.c b/tests-clar/diff/tree.c index ca2daf5fb..582174b8b 100644 --- a/tests-clar/diff/tree.c +++ b/tests-clar/diff/tree.c @@ -9,9 +9,7 @@ static diff_expects expect; void test_diff_tree__initialize(void) { - GIT_INIT_STRUCTURE(&opts, GIT_DIFF_OPTIONS_VERSION); - /* The default context lines is set by _INIT which we can't use here */ - opts.context_lines = 3; + cl_git_pass(git_diff_options_init(&opts, GIT_DIFF_OPTIONS_VERSION)); memset(&expect, 0, sizeof(expect)); @@ -91,7 +89,8 @@ void test_diff_tree__0(void) } #define DIFF_OPTS(FLAGS, CTXT) \ - {GIT_DIFF_OPTIONS_VERSION, (FLAGS), 0, {NULL,0}, NULL, NULL, (CTXT), 1} + {GIT_DIFF_OPTIONS_VERSION, (FLAGS), GIT_SUBMODULE_IGNORE_DEFAULT, \ + {NULL,0}, NULL, NULL, (CTXT), 1} void test_diff_tree__options(void) { |