diff options
| author | Edward Thomson <ethomson@edwardthomson.com> | 2015-11-21 01:57:04 +0300 |
|---|---|---|
| committer | Edward Thomson <ethomson@edwardthomson.com> | 2015-11-21 01:57:04 +0300 |
| commit | c4f60543b7ccfce852ebdc8c12b62c99a5d4c2a5 (patch) | |
| tree | bc987a96682f790b323204150bca93c93e967a0d | |
| parent | 7a612b53cfcd9325178597882cddada412432b18 (diff) | |
| parent | 87428c556f36066040a79ffab416939a0ff9bae1 (diff) | |
Merge pull request #3517 from jacquesg/warnings-fixes
Fix some warnings
| -rw-r--r-- | tests/checkout/crlf.c | 2 | ||||
| -rw-r--r-- | tests/core/filebuf.c | 2 | ||||
| -rw-r--r-- | tests/diff/notify.c | 1 | ||||
| -rw-r--r-- | tests/index/racy.c | 1 |
4 files changed, 3 insertions, 3 deletions
diff --git a/tests/checkout/crlf.c b/tests/checkout/crlf.c index 347c22198..d467eaadd 100644 --- a/tests/checkout/crlf.c +++ b/tests/checkout/crlf.c @@ -278,7 +278,7 @@ void test_checkout_crlf__autocrlf_true_index_size_is_filtered_size(void) void test_checkout_crlf__with_ident(void) { git_index *index; - git_index_entry *entry; + const git_index_entry *entry; git_blob *blob; git_checkout_options opts = GIT_CHECKOUT_OPTIONS_INIT; opts.checkout_strategy = GIT_CHECKOUT_FORCE; diff --git a/tests/core/filebuf.c b/tests/core/filebuf.c index 93aaed759..04a380b20 100644 --- a/tests/core/filebuf.c +++ b/tests/core/filebuf.c @@ -233,7 +233,7 @@ void test_core_filebuf__hidden_file(void) void test_core_filebuf__detects_directory(void) { - git_filebuf file = GIT_FILEBUF_INIT, fail = GIT_FILEBUF_INIT; + git_filebuf file = GIT_FILEBUF_INIT; cl_must_pass(p_mkdir("foo", 0777)); cl_git_fail_with(GIT_EDIRECTORY, git_filebuf_open(&file, "foo", 0, 0666)); diff --git a/tests/diff/notify.c b/tests/diff/notify.c index 74abbc93b..653512795 100644 --- a/tests/diff/notify.c +++ b/tests/diff/notify.c @@ -235,6 +235,7 @@ static int progress_abort_diff( const char *new_path, void *payload) { + GIT_UNUSED(diff_so_far); GIT_UNUSED(old_path); GIT_UNUSED(new_path); GIT_UNUSED(payload); diff --git a/tests/index/racy.c b/tests/index/racy.c index f7440c3af..862c5ab7e 100644 --- a/tests/index/racy.c +++ b/tests/index/racy.c @@ -305,7 +305,6 @@ void test_index_racy__read_index_clears_uptodate_bit(void) { git_index *index, *newindex; const git_index_entry *entry; - git_oid id; setup_uptodate_files(); |