diff options
| author | Pierre-Olivier Latour <pol@mac.com> | 2015-06-02 18:36:15 +0300 |
|---|---|---|
| committer | Pierre-Olivier Latour <pol@mac.com> | 2015-06-02 21:49:38 +0300 |
| commit | 9f3c18e2ac082454c955761f10f4a0d06390c27f (patch) | |
| tree | 05ad8c3289df5f6ea3583127db3395aa9314b944 /tests/diff | |
| parent | be5fda75879f7ed89c7a72adc257872d1ea13803 (diff) | |
Fixed build warnings on Xcode 6.1
Diffstat (limited to 'tests/diff')
| -rw-r--r-- | tests/diff/index.c | 2 | ||||
| -rw-r--r-- | tests/diff/workdir.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/tests/diff/index.c b/tests/diff/index.c index a544b83c7..cf883f12a 100644 --- a/tests/diff/index.c +++ b/tests/diff/index.c @@ -168,7 +168,7 @@ static void do_conflicted_diff(diff_expects *exp, unsigned long flags) const char *a_commit = "26a125ee1bf"; /* the current HEAD */ git_tree *a = resolve_commit_oid_to_tree(g_repo, a_commit); git_diff_options opts = GIT_DIFF_OPTIONS_INIT; - git_index_entry ancestor = {0}, ours = {0}, theirs = {0}; + git_index_entry ancestor = {{0}}, ours = {{0}}, theirs = {{0}}; git_diff *diff = NULL; git_index *index; diff --git a/tests/diff/workdir.c b/tests/diff/workdir.c index 460f1b592..65005f927 100644 --- a/tests/diff/workdir.c +++ b/tests/diff/workdir.c @@ -73,7 +73,7 @@ void test_diff_workdir__to_index_with_conflicts(void) git_diff_options opts = GIT_DIFF_OPTIONS_INIT; git_diff *diff = NULL; git_index *index; - git_index_entry our_entry = {0}, their_entry = {0}; + git_index_entry our_entry = {{0}}, their_entry = {{0}}; diff_expects exp = {0}; g_repo = cl_git_sandbox_init("status"); |