diff options
| author | Carlos Martín Nieto <cmn@dwim.me> | 2015-06-26 18:11:05 +0200 |
|---|---|---|
| committer | Carlos Martín Nieto <cmn@dwim.me> | 2015-06-26 18:11:05 +0200 |
| commit | cfafeb843d3512d2bc06a80511c51bbc70897ac4 (patch) | |
| tree | 7be2ae2affedafd44b84a8d16214cfe71dab9d03 | |
| parent | 354268ca488fc89346d5874b446510f0cc89c007 (diff) | |
| parent | 492851c9a2f98f44d34e5400a4c2ab8a29e312a7 (diff) | |
| download | libgit2-cfafeb843d3512d2bc06a80511c51bbc70897ac4.tar.gz | |
Merge pull request #3263 from git-up/fixes
Fixes
| -rw-r--r-- | src/openssl_stream.c | 2 | ||||
| -rw-r--r-- | src/stransport_stream.c | 2 | ||||
| -rw-r--r-- | tests/diff/binary.c | 1 | ||||
| -rw-r--r-- | tests/diff/workdir.c | 1 |
4 files changed, 2 insertions, 4 deletions
diff --git a/src/openssl_stream.c b/src/openssl_stream.c index 412dee739..90af4ae6e 100644 --- a/src/openssl_stream.c +++ b/src/openssl_stream.c @@ -429,7 +429,7 @@ int git_openssl_stream_new(git_stream **out, const char *host, const char *port) #ifdef GIT_CURL error = git_curl_stream_new(&st->io, host, port); #else - error = git_socket_stream_new(&st->io, host, port) + error = git_socket_stream_new(&st->io, host, port); #endif if (error < 0) diff --git a/src/stransport_stream.c b/src/stransport_stream.c index bbc2d32d6..10e19166c 100644 --- a/src/stransport_stream.c +++ b/src/stransport_stream.c @@ -244,7 +244,7 @@ int git_stransport_stream_new(git_stream **out, const char *host, const char *po #ifdef GIT_CURL error = git_curl_stream_new(&st->io, host, port); #else - error = git_socket_stream_new(&st->io, host, port) + error = git_socket_stream_new(&st->io, host, port); #endif if (error < 0){ diff --git a/tests/diff/binary.c b/tests/diff/binary.c index 6a5f3907b..2d532637c 100644 --- a/tests/diff/binary.c +++ b/tests/diff/binary.c @@ -277,7 +277,6 @@ void test_diff_binary__empty_for_no_diff(void) git_tree *tree; git_diff *diff; git_buf actual = GIT_BUF_INIT; - const char *expected = ""; opts.flags = GIT_DIFF_SHOW_BINARY | GIT_DIFF_FORCE_BINARY; opts.id_abbrev = GIT_OID_HEXSZ; diff --git a/tests/diff/workdir.c b/tests/diff/workdir.c index 34bad48b3..8a23f53ae 100644 --- a/tests/diff/workdir.c +++ b/tests/diff/workdir.c @@ -1791,7 +1791,6 @@ void test_diff_workdir__only_writes_index_when_necessary(void) git_index *index; git_diff_options opts = GIT_DIFF_OPTIONS_INIT; git_diff *diff = NULL; - git_diff_perfdata perf = GIT_DIFF_PERFDATA_INIT; git_reference *head; git_object *head_object; git_oid initial, first, second; |