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
0a79012e
Unverified
Commit
0a79012e
authored
Aug 29, 2021
by
Edward Thomson
Committed by
GitHub
Aug 29, 2021
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #6015 from boretrk/c89-comments
parents
ffb0763b
d17e67e6
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
9 additions
and
9 deletions
+9
-9
tests/config/read.c
+2
-2
tests/remote/fetch.c
+7
-7
No files found.
tests/config/read.c
View file @
0a79012e
...
@@ -964,7 +964,7 @@ void test_config_read__get_mapped(void)
...
@@ -964,7 +964,7 @@ void test_config_read__get_mapped(void)
" key9 = off
\n
"
);
" key9 = off
\n
"
);
cl_git_pass
(
git_config_open_ondisk
(
&
cfg
,
"./testconfig"
));
cl_git_pass
(
git_config_open_ondisk
(
&
cfg
,
"./testconfig"
));
/
/ check parsing bool and string
/
* check parsing bool and string */
cl_git_pass
(
git_config_get_mapped
(
&
val
,
cfg
,
"header.key1"
,
_test_map1
,
ARRAY_SIZE
(
_test_map1
)));
cl_git_pass
(
git_config_get_mapped
(
&
val
,
cfg
,
"header.key1"
,
_test_map1
,
ARRAY_SIZE
(
_test_map1
)));
cl_assert_equal_i
(
val
,
MAP_TRUE
);
cl_assert_equal_i
(
val
,
MAP_TRUE
);
cl_git_pass
(
git_config_get_mapped
(
&
val
,
cfg
,
"header.key2"
,
_test_map1
,
ARRAY_SIZE
(
_test_map1
)));
cl_git_pass
(
git_config_get_mapped
(
&
val
,
cfg
,
"header.key2"
,
_test_map1
,
ARRAY_SIZE
(
_test_map1
)));
...
@@ -986,7 +986,7 @@ void test_config_read__get_mapped(void)
...
@@ -986,7 +986,7 @@ void test_config_read__get_mapped(void)
cl_git_fail
(
git_config_get_mapped
(
&
val
,
cfg
,
"header.key7"
,
_test_map1
,
ARRAY_SIZE
(
_test_map1
)));
cl_git_fail
(
git_config_get_mapped
(
&
val
,
cfg
,
"header.key7"
,
_test_map1
,
ARRAY_SIZE
(
_test_map1
)));
/
/ check parsing int values
/
* check parsing int values */
cl_git_pass
(
git_config_get_mapped
(
&
val
,
cfg
,
"header.key1"
,
_test_map2
,
ARRAY_SIZE
(
_test_map2
)));
cl_git_pass
(
git_config_get_mapped
(
&
val
,
cfg
,
"header.key1"
,
_test_map2
,
ARRAY_SIZE
(
_test_map2
)));
cl_git_pass
(
git_config_get_int32
(
&
known_good
,
cfg
,
"header.key1"
));
cl_git_pass
(
git_config_get_int32
(
&
known_good
,
cfg
,
"header.key1"
));
cl_assert_equal_i
(
val
,
known_good
);
cl_assert_equal_i
(
val
,
known_good
);
...
...
tests/remote/fetch.c
View file @
0a79012e
...
@@ -72,7 +72,7 @@ void do_time_travelling_fetch(git_oid *commit1id, git_oid *commit2id,
...
@@ -72,7 +72,7 @@ void do_time_travelling_fetch(git_oid *commit1id, git_oid *commit2id,
.
strings
=
&
refspec_strs
,
.
strings
=
&
refspec_strs
,
};
};
/
/ create two commits in repo 1 and a reference to them
/
* create two commits in repo 1 and a reference to them */
{
{
git_oid
empty_tree_id
;
git_oid
empty_tree_id
;
git_tree
*
empty_tree
;
git_tree
*
empty_tree
;
...
@@ -92,7 +92,7 @@ void do_time_travelling_fetch(git_oid *commit1id, git_oid *commit2id,
...
@@ -92,7 +92,7 @@ void do_time_travelling_fetch(git_oid *commit1id, git_oid *commit2id,
git_treebuilder_free
(
tb
);
git_treebuilder_free
(
tb
);
}
}
/
/ fetch the reference via the remote
/
* fetch the reference via the remote */
{
{
git_remote
*
remote
;
git_remote
*
remote
;
...
@@ -103,7 +103,7 @@ void do_time_travelling_fetch(git_oid *commit1id, git_oid *commit2id,
...
@@ -103,7 +103,7 @@ void do_time_travelling_fetch(git_oid *commit1id, git_oid *commit2id,
git_remote_free
(
remote
);
git_remote_free
(
remote
);
}
}
/
/ assert that repo2 references the second commit
/
* assert that repo2 references the second commit */
{
{
const
git_oid
*
target
;
const
git_oid
*
target
;
git_reference
*
ref
;
git_reference
*
ref
;
...
@@ -113,7 +113,7 @@ void do_time_travelling_fetch(git_oid *commit1id, git_oid *commit2id,
...
@@ -113,7 +113,7 @@ void do_time_travelling_fetch(git_oid *commit1id, git_oid *commit2id,
git_reference_free
(
ref
);
git_reference_free
(
ref
);
}
}
/
/ set the reference in repo1 to point to the older commit
/
* set the reference in repo1 to point to the older commit */
{
{
git_reference
*
ref
;
git_reference
*
ref
;
git_reference
*
ref2
;
git_reference
*
ref2
;
...
@@ -124,7 +124,7 @@ void do_time_travelling_fetch(git_oid *commit1id, git_oid *commit2id,
...
@@ -124,7 +124,7 @@ void do_time_travelling_fetch(git_oid *commit1id, git_oid *commit2id,
git_reference_free
(
ref2
);
git_reference_free
(
ref2
);
}
}
/
/ fetch the reference again
/
* fetch the reference again */
{
{
git_remote
*
remote
;
git_remote
*
remote
;
...
@@ -144,7 +144,7 @@ void test_remote_fetch__dont_update_refs_if_not_descendant_and_not_force(void) {
...
@@ -144,7 +144,7 @@ void test_remote_fetch__dont_update_refs_if_not_descendant_and_not_force(void) {
do_time_travelling_fetch
(
&
commit1id
,
&
commit2id
,
false
);
do_time_travelling_fetch
(
&
commit1id
,
&
commit2id
,
false
);
/
/ assert that the reference in repo2 has not changed
/
* assert that the reference in repo2 has not changed */
cl_git_pass
(
git_reference_lookup
(
&
ref
,
repo2
,
REPO2_REFNAME
));
cl_git_pass
(
git_reference_lookup
(
&
ref
,
repo2
,
REPO2_REFNAME
));
target
=
git_reference_target
(
ref
);
target
=
git_reference_target
(
ref
);
cl_assert_equal_b
(
git_oid_cmp
(
target
,
&
commit2id
),
0
);
cl_assert_equal_b
(
git_oid_cmp
(
target
,
&
commit2id
),
0
);
...
@@ -160,7 +160,7 @@ void test_remote_fetch__do_update_refs_if_not_descendant_and_force(void) {
...
@@ -160,7 +160,7 @@ void test_remote_fetch__do_update_refs_if_not_descendant_and_force(void) {
do_time_travelling_fetch
(
&
commit1id
,
&
commit2id
,
true
);
do_time_travelling_fetch
(
&
commit1id
,
&
commit2id
,
true
);
/
/ assert that the reference in repo2 has changed
/
* assert that the reference in repo2 has changed */
cl_git_pass
(
git_reference_lookup
(
&
ref
,
repo2
,
REPO2_REFNAME
));
cl_git_pass
(
git_reference_lookup
(
&
ref
,
repo2
,
REPO2_REFNAME
));
target
=
git_reference_target
(
ref
);
target
=
git_reference_target
(
ref
);
cl_assert_equal_b
(
git_oid_cmp
(
target
,
&
commit1id
),
0
);
cl_assert_equal_b
(
git_oid_cmp
(
target
,
&
commit1id
),
0
);
...
...
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