Commit 5b524d6902b50dc2eebcce760de614edc2ab4cf4
2013-01-12T19:37:14
Fix Travis compilation warnings
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52
diff --git a/src/diff_output.c b/src/diff_output.c
index 933d44e..e79bf30 100644
--- a/src/diff_output.c
+++ b/src/diff_output.c
@@ -842,7 +842,7 @@ static int diff_patch_line_cb(
{
git_diff_patch *patch = payload;
diff_patch_hunk *hunk;
- diff_patch_line *last, *line;
+ diff_patch_line *line;
GIT_UNUSED(delta);
GIT_UNUSED(range);
@@ -872,8 +872,6 @@ static int diff_patch_line_cb(
patch->lines_asize = new_size;
}
- last = (patch->lines_size > 0) ?
- &patch->lines[patch->lines_size - 1] : NULL;
line = &patch->lines[patch->lines_size++];
line->ptr = content;
diff --git a/tests-clar/checkout/tree.c b/tests-clar/checkout/tree.c
index 34ac1ed..b877b2e 100644
--- a/tests-clar/checkout/tree.c
+++ b/tests-clar/checkout/tree.c
@@ -367,7 +367,6 @@ void assert_conflict(
git_object *hack_tree;
git_reference *branch, *head;
git_buf file_path = GIT_BUF_INIT;
- git_checkout_opts opts = GIT_CHECKOUT_OPTS_INIT;
cl_git_pass(git_repository_index(&index, g_repo));
@@ -383,7 +382,7 @@ void assert_conflict(
git_reference_free(branch);
/* Checkout the parent */
- opts.checkout_strategy = GIT_CHECKOUT_FORCE;
+ g_opts.checkout_strategy = GIT_CHECKOUT_FORCE;
cl_git_pass(git_checkout_tree(g_repo, g_object, &g_opts));
/* Hack-ishy workaound to ensure *all* the index entries
@@ -403,7 +402,7 @@ void assert_conflict(
/* Trying to checkout the original commit */
cl_git_pass(git_revparse_single(&g_object, g_repo, commit_sha));
- opts.checkout_strategy = GIT_CHECKOUT_SAFE;
+ g_opts.checkout_strategy = GIT_CHECKOUT_SAFE;
cl_assert_equal_i(
GIT_EMERGECONFLICT, git_checkout_tree(g_repo, g_object, &g_opts));