Unverified Commit 0a79012e by Edward Thomson Committed by GitHub

Merge pull request #6015 from boretrk/c89-comments

parents ffb0763b d17e67e6
...@@ -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);
......
...@@ -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);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment