diff options
author | Patrick Steinhardt <ps@pks.im> | 2018-06-25 11:56:52 +0200 |
---|---|---|
committer | Patrick Steinhardt <ps@pks.im> | 2018-07-13 08:25:12 +0200 |
commit | 9994cd3f0ffcd7b28d26c82ecb6564bc4072dc2a (patch) | |
tree | f053f0a7f44be547e208d35447623617dfbd0340 /tests/merge | |
parent | f347a441c81c4e16dd54de07c5070eca8fccd5c8 (diff) | |
download | libgit2-9994cd3f0ffcd7b28d26c82ecb6564bc4072dc2a.tar.gz |
treewide: remove use of C++ style comments
C++ style comment ("//") are not specified by the ISO C90 standard and
thus do not conform to it. While libgit2 aims to conform to C90, we did
not enforce it until now, which is why quite a lot of these
non-conforming comments have snuck into our codebase. Do a tree-wide
conversion of all C++ style comments to the supported C style comments
to allow us enforcing strict C90 compliance in a later commit.
Diffstat (limited to 'tests/merge')
-rw-r--r-- | tests/merge/files.c | 2 | ||||
-rw-r--r-- | tests/merge/trees/automerge.c | 2 | ||||
-rw-r--r-- | tests/merge/trees/modeconflict.c | 2 | ||||
-rw-r--r-- | tests/merge/trees/renames.c | 2 | ||||
-rw-r--r-- | tests/merge/trees/trivial.c | 2 | ||||
-rw-r--r-- | tests/merge/trees/whitespace.c | 2 | ||||
-rw-r--r-- | tests/merge/workdir/analysis.c | 2 | ||||
-rw-r--r-- | tests/merge/workdir/renames.c | 2 | ||||
-rw-r--r-- | tests/merge/workdir/setup.c | 2 | ||||
-rw-r--r-- | tests/merge/workdir/simple.c | 2 | ||||
-rw-r--r-- | tests/merge/workdir/submodules.c | 2 | ||||
-rw-r--r-- | tests/merge/workdir/trivial.c | 2 |
12 files changed, 12 insertions, 12 deletions
diff --git a/tests/merge/files.c b/tests/merge/files.c index 6f5a1fd9c..27c96363f 100644 --- a/tests/merge/files.c +++ b/tests/merge/files.c @@ -15,7 +15,7 @@ static git_repository *repo; static git_index *repo_index; -// Fixture setup and teardown +/* Fixture setup and teardown */ void test_merge_files__initialize(void) { git_config *cfg; diff --git a/tests/merge/trees/automerge.c b/tests/merge/trees/automerge.c index 67f2cf786..e16b829ee 100644 --- a/tests/merge/trees/automerge.c +++ b/tests/merge/trees/automerge.c @@ -55,7 +55,7 @@ static git_repository *repo; "", \ "5c3b68a71fc4fa5d362fd3875e53137c6a5ab7a5" } -// Fixture setup and teardown +/* Fixture setup and teardown */ void test_merge_trees_automerge__initialize(void) { repo = cl_git_sandbox_init(TEST_REPO_PATH); diff --git a/tests/merge/trees/modeconflict.c b/tests/merge/trees/modeconflict.c index d858b8f66..e85e340b9 100644 --- a/tests/merge/trees/modeconflict.c +++ b/tests/merge/trees/modeconflict.c @@ -13,7 +13,7 @@ static git_repository *repo; #define DF_SIDE1_BRANCH "df_side1" #define DF_SIDE2_BRANCH "df_side2" -// Fixture setup and teardown +/* Fixture setup and teardown */ void test_merge_trees_modeconflict__initialize(void) { repo = cl_git_sandbox_init(TEST_REPO_PATH); diff --git a/tests/merge/trees/renames.c b/tests/merge/trees/renames.c index 853bf2fa0..fbcfd2d3b 100644 --- a/tests/merge/trees/renames.c +++ b/tests/merge/trees/renames.c @@ -13,7 +13,7 @@ static git_repository *repo; #define BRANCH_RENAME_OURS "rename_conflict_ours" #define BRANCH_RENAME_THEIRS "rename_conflict_theirs" -// Fixture setup and teardown +/* Fixture setup and teardown */ void test_merge_trees_renames__initialize(void) { repo = cl_git_sandbox_init(TEST_REPO_PATH); diff --git a/tests/merge/trees/trivial.c b/tests/merge/trees/trivial.c index c7f8d2423..4a8255624 100644 --- a/tests/merge/trees/trivial.c +++ b/tests/merge/trees/trivial.c @@ -13,7 +13,7 @@ static git_repository *repo; #define TEST_INDEX_PATH TEST_REPO_PATH "/.git/index" -// Fixture setup and teardown +/* Fixture setup and teardown */ void test_merge_trees_trivial__initialize(void) { repo = cl_git_sandbox_init(TEST_REPO_PATH); diff --git a/tests/merge/trees/whitespace.c b/tests/merge/trees/whitespace.c index b99583cb3..fdb11253b 100644 --- a/tests/merge/trees/whitespace.c +++ b/tests/merge/trees/whitespace.c @@ -16,7 +16,7 @@ static git_repository *repo; #define BRANCH_A_CHANGE "branch_a_change" #define BRANCH_B_CHANGE "branch_b_change" -// Fixture setup and teardown +/* Fixture setup and teardown */ void test_merge_trees_whitespace__initialize(void) { repo = cl_git_sandbox_init(TEST_REPO_PATH); diff --git a/tests/merge/workdir/analysis.c b/tests/merge/workdir/analysis.c index 84885c4fa..f87fc58b0 100644 --- a/tests/merge/workdir/analysis.c +++ b/tests/merge/workdir/analysis.c @@ -24,7 +24,7 @@ static git_index *repo_index; #define NOFASTFORWARD_ID "7cb63eed597130ba4abb87b3e544b85021905520" -// Fixture setup and teardown +/* Fixture setup and teardown */ void test_merge_workdir_analysis__initialize(void) { repo = cl_git_sandbox_init(TEST_REPO_PATH); diff --git a/tests/merge/workdir/renames.c b/tests/merge/workdir/renames.c index fabcda2a8..a8ee59a44 100644 --- a/tests/merge/workdir/renames.c +++ b/tests/merge/workdir/renames.c @@ -14,7 +14,7 @@ static git_repository *repo; #define BRANCH_RENAME_OURS "rename_conflict_ours" #define BRANCH_RENAME_THEIRS "rename_conflict_theirs" -// Fixture setup and teardown +/* Fixture setup and teardown */ void test_merge_workdir_renames__initialize(void) { git_config *cfg; diff --git a/tests/merge/workdir/setup.c b/tests/merge/workdir/setup.c index 92524e2ed..3a8f9d987 100644 --- a/tests/merge/workdir/setup.c +++ b/tests/merge/workdir/setup.c @@ -31,7 +31,7 @@ static git_index *repo_index; #define OCTO5_BRANCH "octo5" #define OCTO5_OID "e4f618a2c3ed0669308735727df5ebf2447f022f" -// Fixture setup and teardown +/* Fixture setup and teardown */ void test_merge_workdir_setup__initialize(void) { repo = cl_git_sandbox_init(TEST_REPO_PATH); diff --git a/tests/merge/workdir/simple.c b/tests/merge/workdir/simple.c index 32b20623f..cff1a5765 100644 --- a/tests/merge/workdir/simple.c +++ b/tests/merge/workdir/simple.c @@ -73,7 +73,7 @@ static git_index *repo_index; "5c3b68a71fc4fa5d362fd3875e53137c6a5ab7a5" } -// Fixture setup and teardown +/* Fixture setup and teardown */ void test_merge_workdir_simple__initialize(void) { git_config *cfg; diff --git a/tests/merge/workdir/submodules.c b/tests/merge/workdir/submodules.c index c4cc188a8..35280e61e 100644 --- a/tests/merge/workdir/submodules.c +++ b/tests/merge/workdir/submodules.c @@ -16,7 +16,7 @@ static git_repository *repo; #define TEST_INDEX_PATH TEST_REPO_PATH "/.git/index" -// Fixture setup and teardown +/* Fixture setup and teardown */ void test_merge_workdir_submodules__initialize(void) { repo = cl_git_sandbox_init(TEST_REPO_PATH); diff --git a/tests/merge/workdir/trivial.c b/tests/merge/workdir/trivial.c index 85cce493a..39d1ddc9b 100644 --- a/tests/merge/workdir/trivial.c +++ b/tests/merge/workdir/trivial.c @@ -14,7 +14,7 @@ static git_index *repo_index; #define TEST_INDEX_PATH TEST_REPO_PATH "/.git/index" -// Fixture setup and teardown +/* Fixture setup and teardown */ void test_merge_workdir_trivial__initialize(void) { repo = cl_git_sandbox_init(TEST_REPO_PATH); |