diff options
| author | Jacques Germishuys <jacquesg@striata.com> | 2015-03-12 12:36:09 +0200 |
|---|---|---|
| committer | Jacques Germishuys <jacquesg@striata.com> | 2015-03-16 09:53:27 +0200 |
| commit | 13de93631664cd6eec3afedabb7145d5562a3e01 (patch) | |
| tree | af7eadb3ace1e871f458156bf7524b0c4fcf1f6a /tests/merge | |
| parent | f29dde682866c293292ce405fcfef1511ced3f55 (diff) | |
| download | libgit2-13de93631664cd6eec3afedabb7145d5562a3e01.tar.gz | |
Collapse whitespace flags into git_merge_file_flags_t
Diffstat (limited to 'tests/merge')
| -rw-r--r-- | tests/merge/files.c | 4 | ||||
| -rw-r--r-- | tests/merge/trees/whitespace.c | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/tests/merge/files.c b/tests/merge/files.c index cb9e8d195..7f461abff 100644 --- a/tests/merge/files.c +++ b/tests/merge/files.c @@ -198,7 +198,7 @@ void test_merge_files__automerge_whitespace_eol(void) theirs.path = "testfile.txt"; theirs.mode = 0100755; - opts.whitespace_flags |= GIT_MERGE_FILE_IGNORE_WHITESPACE_EOL; + opts.flags |= GIT_MERGE_FILE_IGNORE_WHITESPACE_EOL; cl_git_pass(git_merge_file(&result, &ancestor, &ours, &theirs, &opts)); cl_assert_equal_i(1, result.automergeable); @@ -236,7 +236,7 @@ void test_merge_files__automerge_whitespace_change(void) theirs.path = "testfile.txt"; theirs.mode = 0100755; - opts.whitespace_flags |= GIT_MERGE_FILE_IGNORE_WHITESPACE_CHANGE; + opts.flags |= GIT_MERGE_FILE_IGNORE_WHITESPACE_CHANGE; cl_git_pass(git_merge_file(&result, &ancestor, &ours, &theirs, &opts)); cl_assert_equal_i(1, result.automergeable); diff --git a/tests/merge/trees/whitespace.c b/tests/merge/trees/whitespace.c index 77e362c9c..b99583cb3 100644 --- a/tests/merge/trees/whitespace.c +++ b/tests/merge/trees/whitespace.c @@ -54,7 +54,7 @@ void test_merge_trees_whitespace__eol(void) { 0100644, "ee3c2aac8e03224c323b58ecb1f9eef616745467", 0, "test.txt" }, }; - opts.whitespace_flags |= GIT_MERGE_FILE_IGNORE_WHITESPACE_EOL; + opts.file_flags |= GIT_MERGE_FILE_IGNORE_WHITESPACE_EOL; cl_git_pass(merge_trees_from_branches(&index, repo, BRANCH_A_EOL, BRANCH_B_EOL, &opts)); @@ -72,7 +72,7 @@ void test_merge_trees_whitespace__change(void) { 0100644, "a827eab4fd66ab37a6ebcfaa7b7e341abfd55947", 0, "test.txt" }, }; - opts.whitespace_flags |= GIT_MERGE_FILE_IGNORE_WHITESPACE_CHANGE; + opts.file_flags |= GIT_MERGE_FILE_IGNORE_WHITESPACE_CHANGE; cl_git_pass(merge_trees_from_branches(&index, repo, BRANCH_A_CHANGE, BRANCH_B_CHANGE, &opts)); |