proxmox-mirrors/libgit2
1
0
Fork 0
mirror of https://git.proxmox.com/git/libgit2 synced 2025-06-20 07:52:43 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #3263 from git-up/fixes

Browse Source 
Fixes
This commit is contained in:
Carlos Martín Nieto 2015-06-26 18:11:05 +02:00
commit cfafeb843d
4 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/openssl_stream.c
View File

@ -429,7 +429,7 @@ int git_openssl_stream_new(git_stream **out, const char *host, const char *port)
#ifdef GIT_CURL #ifdef GIT_CURL
error = git_curl_stream_new(&st->io, host, port); error = git_curl_stream_new(&st->io, host, port);
#else #else
error = git_socket_stream_new(&st->io, host, port) error = git_socket_stream_new(&st->io, host, port);
#endif #endif
if (error < 0) if (error < 0)

2
src/stransport_stream.c
View File

@ -244,7 +244,7 @@ int git_stransport_stream_new(git_stream **out, const char *host, const char *po
#ifdef GIT_CURL #ifdef GIT_CURL
error = git_curl_stream_new(&st->io, host, port); error = git_curl_stream_new(&st->io, host, port);
#else #else
error = git_socket_stream_new(&st->io, host, port) error = git_socket_stream_new(&st->io, host, port);
#endif #endif
if (error < 0){ if (error < 0){

1
tests/diff/binary.c
View File

@ -277,7 +277,6 @@ void test_diff_binary__empty_for_no_diff(void)
git_tree *tree; git_tree *tree;
git_diff *diff; git_diff *diff;
git_buf actual = GIT_BUF_INIT; git_buf actual = GIT_BUF_INIT;
const char *expected = "";
opts.flags = GIT_DIFF_SHOW_BINARY | GIT_DIFF_FORCE_BINARY; opts.flags = GIT_DIFF_SHOW_BINARY | GIT_DIFF_FORCE_BINARY;
opts.id_abbrev = GIT_OID_HEXSZ; opts.id_abbrev = GIT_OID_HEXSZ;

1
tests/diff/workdir.c
View File

@ -1791,7 +1791,6 @@ void test_diff_workdir__only_writes_index_when_necessary(void)
git_index *index; git_index *index;
git_diff_options opts = GIT_DIFF_OPTIONS_INIT; git_diff_options opts = GIT_DIFF_OPTIONS_INIT;
git_diff *diff = NULL; git_diff *diff = NULL;
git_diff_perfdata perf = GIT_DIFF_PERFDATA_INIT;
git_reference *head; git_reference *head;
git_object *head_object; git_object *head_object;
git_oid initial, first, second; git_oid initial, first, second;