Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
G
git2
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
lvzhengyang
git2
Commits
cfafeb84
Commit
cfafeb84
authored
Jun 26, 2015
by
Carlos Martín Nieto
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #3263 from git-up/fixes
Fixes
parents
354268ca
492851c9
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
2 additions
and
4 deletions
+2
-4
src/openssl_stream.c
+1
-1
src/stransport_stream.c
+1
-1
tests/diff/binary.c
+0
-1
tests/diff/workdir.c
+0
-1
No files found.
src/openssl_stream.c
View file @
cfafeb84
...
@@ -429,7 +429,7 @@ int git_openssl_stream_new(git_stream **out, const char *host, const char *port)
...
@@ -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
)
...
...
src/stransport_stream.c
View file @
cfafeb84
...
@@ -244,7 +244,7 @@ int git_stransport_stream_new(git_stream **out, const char *host, const char *po
...
@@ -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
){
...
...
tests/diff/binary.c
View file @
cfafeb84
...
@@ -277,7 +277,6 @@ void test_diff_binary__empty_for_no_diff(void)
...
@@ -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
;
...
...
tests/diff/workdir.c
View file @
cfafeb84
...
@@ -1791,7 +1791,6 @@ void test_diff_workdir__only_writes_index_when_necessary(void)
...
@@ -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
;
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment