Commit 3a8ef8240f2bf93876d867d4db98c1f30180fe67
2019-01-14T17:06:52
Update formatting of newly added rebase sign test suite
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192 193 194 195 196 197 198 199 200 201 202 203 204 205 206 207 208 209 210 211 212 213 214 215 216 217 218 219 220 221 222 223 224 225 226 227 228 229 230 231 232 233 234 235 236 237 238 239 240 241 242 243 244 245 246 247 248 249 250 251 252 253 254 255 256 257 258 259 260 261 262 263 264 265 266 267 268 269 270 271 272 273 274 275 276 277 278 279 280 281 282 283 284 285 286 287 288 289 290 291 292 293 294 295 296 297 298 299 300 301 302 303 304 305 306 307 308 309 310 311 312 313 314 315 316 317 318 319 320 321 322 323 324 325 326 327 328 329 330 331 332 333 334 335 336 337 338 339 340
diff --git a/tests/rebase/sign.c b/tests/rebase/sign.c
index 05b7e76..d10a66b 100644
--- a/tests/rebase/sign.c
+++ b/tests/rebase/sign.c
@@ -7,8 +7,8 @@ static git_signature *signature;
/* Fixture setup and teardown */
void test_rebase_sign__initialize(void)
{
- repo = cl_git_sandbox_init("rebase");
- cl_git_pass(git_signature_new(&signature, "Rebaser",
+ repo = cl_git_sandbox_init("rebase");
+ cl_git_pass(git_signature_new(&signature, "Rebaser",
"rebaser@rebaser.rb", 1405694510, 0));
}
@@ -26,71 +26,71 @@ committer Rebaser <rebaser@rebaser.rb> 1405694510 +0000\n\
Modification 3 to gravy\n";
int signature_cb_passthrough(
- git_buf *signature,
- git_buf *signature_field,
- const char *commit_content,
- void *payload)
+ git_buf *signature,
+ git_buf *signature_field,
+ const char *commit_content,
+ void *payload)
{
- cl_assert_equal_b(false, git_buf_is_allocated(signature));
- cl_assert_equal_b(false, git_buf_is_allocated(signature_field));
- cl_assert_equal_s(expected_commit_content, commit_content);
- cl_assert_equal_p(NULL, payload);
- return GIT_PASSTHROUGH;
+ cl_assert_equal_b(false, git_buf_is_allocated(signature));
+ cl_assert_equal_b(false, git_buf_is_allocated(signature_field));
+ cl_assert_equal_s(expected_commit_content, commit_content);
+ cl_assert_equal_p(NULL, payload);
+ return GIT_PASSTHROUGH;
}
/* git checkout gravy ; git rebase --merge veal */
void test_rebase_sign__passthrough_signature_cb(void)
{
- git_rebase *rebase;
- git_reference *branch_ref, *upstream_ref;
- git_annotated_commit *branch_head, *upstream_head;
- git_rebase_operation *rebase_operation;
- git_oid commit_id, expected_id;
- git_rebase_options rebase_opts = GIT_REBASE_OPTIONS_INIT;
- git_commit *commit;
- int error;
- const char *expected_commit_raw_header = "tree cd99b26250099fc38d30bfaed7797a7275ed3366\n\
+ git_rebase *rebase;
+ git_reference *branch_ref, *upstream_ref;
+ git_annotated_commit *branch_head, *upstream_head;
+ git_rebase_operation *rebase_operation;
+ git_oid commit_id, expected_id;
+ git_rebase_options rebase_opts = GIT_REBASE_OPTIONS_INIT;
+ git_commit *commit;
+ int error;
+ const char *expected_commit_raw_header = "tree cd99b26250099fc38d30bfaed7797a7275ed3366\n\
parent f87d14a4a236582a0278a916340a793714256864\n\
author Edward Thomson <ethomson@edwardthomson.com> 1405625055 -0400\n\
committer Rebaser <rebaser@rebaser.rb> 1405694510 +0000\n";
- rebase_opts.signature_cb = signature_cb_passthrough;
+ rebase_opts.signature_cb = signature_cb_passthrough;
- cl_git_pass(git_reference_lookup(&branch_ref, repo, "refs/heads/gravy"));
- cl_git_pass(git_reference_lookup(&upstream_ref, repo, "refs/heads/veal"));
+ cl_git_pass(git_reference_lookup(&branch_ref, repo, "refs/heads/gravy"));
+ cl_git_pass(git_reference_lookup(&upstream_ref, repo, "refs/heads/veal"));
- cl_git_pass(git_annotated_commit_from_ref(&branch_head, repo, branch_ref));
- cl_git_pass(git_annotated_commit_from_ref(&upstream_head, repo, upstream_ref));
+ cl_git_pass(git_annotated_commit_from_ref(&branch_head, repo, branch_ref));
+ cl_git_pass(git_annotated_commit_from_ref(&upstream_head, repo, upstream_ref));
- cl_git_pass(git_rebase_init(&rebase, repo, branch_head, upstream_head, NULL, &rebase_opts));
+ cl_git_pass(git_rebase_init(&rebase, repo, branch_head, upstream_head, NULL, &rebase_opts));
- cl_git_pass(git_rebase_next(&rebase_operation, rebase));
- cl_git_pass(git_rebase_commit(&commit_id, rebase, NULL, signature, NULL, NULL));
+ cl_git_pass(git_rebase_next(&rebase_operation, rebase));
+ cl_git_pass(git_rebase_commit(&commit_id, rebase, NULL, signature, NULL, NULL));
- git_oid_fromstr(&expected_id, "129183968a65abd6c52da35bff43325001bfc630");
- cl_assert_equal_oid(&expected_id, &commit_id);
+ git_oid_fromstr(&expected_id, "129183968a65abd6c52da35bff43325001bfc630");
+ cl_assert_equal_oid(&expected_id, &commit_id);
- cl_git_pass(git_commit_lookup(&commit, repo, &commit_id));
- cl_assert_equal_s(expected_commit_raw_header, git_commit_raw_header(commit));
+ cl_git_pass(git_commit_lookup(&commit, repo, &commit_id));
+ cl_assert_equal_s(expected_commit_raw_header, git_commit_raw_header(commit));
- cl_git_fail(error = git_rebase_next(&rebase_operation, rebase));
- cl_assert_equal_i(GIT_ITEROVER, error);
+ cl_git_fail(error = git_rebase_next(&rebase_operation, rebase));
+ cl_assert_equal_i(GIT_ITEROVER, error);
- git_reference_free(branch_ref);
- git_reference_free(upstream_ref);
- git_annotated_commit_free(branch_head);
- git_annotated_commit_free(upstream_head);
- git_commit_free(commit);
- git_rebase_free(rebase);
+ git_reference_free(branch_ref);
+ git_reference_free(upstream_ref);
+ git_annotated_commit_free(branch_head);
+ git_annotated_commit_free(upstream_head);
+ git_commit_free(commit);
+ git_rebase_free(rebase);
}
int signature_cb_gpg(
- git_buf *signature,
- git_buf *signature_field,
- const char *commit_content,
- void *payload)
+ git_buf *signature,
+ git_buf *signature_field,
+ const char *commit_content,
+ void *payload)
{
- const char *gpg_signature = "-----BEGIN PGP SIGNATURE-----\n\
+ const char *gpg_signature = "-----BEGIN PGP SIGNATURE-----\n\
\n\
iQIzBAEBCgAdFiEEgVlDEfSlmKn0fvGgK++h5T2/ctIFAlwZcrAACgkQK++h5T2/\n\
ctIPVhAA42RyZhMdKl5Bm0KtQco2scsukIg2y7tjSwhti91zDu3HQgpusjjo0fQx\n\
@@ -107,27 +107,27 @@ cttVRsdOoego+fiy08eFE+aJIeYiINRGhqOBTsuqG4jIdpdKxPE=\n\
=KbsY\n\
-----END PGP SIGNATURE-----";
- cl_assert_equal_b(false, git_buf_is_allocated(signature));
- cl_assert_equal_b(false, git_buf_is_allocated(signature_field));
- cl_assert_equal_s(expected_commit_content, commit_content);
- cl_assert_equal_p(NULL, payload);
+ cl_assert_equal_b(false, git_buf_is_allocated(signature));
+ cl_assert_equal_b(false, git_buf_is_allocated(signature_field));
+ cl_assert_equal_s(expected_commit_content, commit_content);
+ cl_assert_equal_p(NULL, payload);
- cl_git_pass(git_buf_set(signature, gpg_signature, strlen(gpg_signature) + 1));
- return GIT_OK;
+ cl_git_pass(git_buf_set(signature, gpg_signature, strlen(gpg_signature) + 1));
+ return GIT_OK;
}
/* git checkout gravy ; git rebase --merge veal */
void test_rebase_sign__gpg_with_no_field(void)
{
- git_rebase *rebase;
- git_reference *branch_ref, *upstream_ref;
- git_annotated_commit *branch_head, *upstream_head;
- git_rebase_operation *rebase_operation;
- git_oid commit_id, expected_id;
- git_rebase_options rebase_opts = GIT_REBASE_OPTIONS_INIT;
- git_commit *commit;
- int error;
- const char *expected_commit_raw_header = "tree cd99b26250099fc38d30bfaed7797a7275ed3366\n\
+ git_rebase *rebase;
+ git_reference *branch_ref, *upstream_ref;
+ git_annotated_commit *branch_head, *upstream_head;
+ git_rebase_operation *rebase_operation;
+ git_oid commit_id, expected_id;
+ git_rebase_options rebase_opts = GIT_REBASE_OPTIONS_INIT;
+ git_commit *commit;
+ int error;
+ const char *expected_commit_raw_header = "tree cd99b26250099fc38d30bfaed7797a7275ed3366\n\
parent f87d14a4a236582a0278a916340a793714256864\n\
author Edward Thomson <ethomson@edwardthomson.com> 1405625055 -0400\n\
committer Rebaser <rebaser@rebaser.rb> 1405694510 +0000\n\
@@ -148,102 +148,102 @@ gpgsig -----BEGIN PGP SIGNATURE-----\n\
=KbsY\n\
-----END PGP SIGNATURE-----\n";
- rebase_opts.signature_cb = signature_cb_gpg;
+ rebase_opts.signature_cb = signature_cb_gpg;
- cl_git_pass(git_reference_lookup(&branch_ref, repo, "refs/heads/gravy"));
- cl_git_pass(git_reference_lookup(&upstream_ref, repo, "refs/heads/veal"));
+ cl_git_pass(git_reference_lookup(&branch_ref, repo, "refs/heads/gravy"));
+ cl_git_pass(git_reference_lookup(&upstream_ref, repo, "refs/heads/veal"));
- cl_git_pass(git_annotated_commit_from_ref(&branch_head, repo, branch_ref));
- cl_git_pass(git_annotated_commit_from_ref(&upstream_head, repo, upstream_ref));
+ cl_git_pass(git_annotated_commit_from_ref(&branch_head, repo, branch_ref));
+ cl_git_pass(git_annotated_commit_from_ref(&upstream_head, repo, upstream_ref));
- cl_git_pass(git_rebase_init(&rebase, repo, branch_head, upstream_head, NULL, &rebase_opts));
+ cl_git_pass(git_rebase_init(&rebase, repo, branch_head, upstream_head, NULL, &rebase_opts));
- cl_git_pass(git_rebase_next(&rebase_operation, rebase));
- cl_git_pass(git_rebase_commit(&commit_id, rebase, NULL, signature, NULL, NULL));
+ cl_git_pass(git_rebase_next(&rebase_operation, rebase));
+ cl_git_pass(git_rebase_commit(&commit_id, rebase, NULL, signature, NULL, NULL));
- git_oid_fromstr(&expected_id, "bf78348e45c8286f52b760f1db15cb6da030f2ef");
- cl_assert_equal_oid(&expected_id, &commit_id);
+ git_oid_fromstr(&expected_id, "bf78348e45c8286f52b760f1db15cb6da030f2ef");
+ cl_assert_equal_oid(&expected_id, &commit_id);
- cl_git_pass(git_commit_lookup(&commit, repo, &commit_id));
- cl_assert_equal_s(expected_commit_raw_header, git_commit_raw_header(commit));
+ cl_git_pass(git_commit_lookup(&commit, repo, &commit_id));
+ cl_assert_equal_s(expected_commit_raw_header, git_commit_raw_header(commit));
- cl_git_fail(error = git_rebase_next(&rebase_operation, rebase));
- cl_assert_equal_i(GIT_ITEROVER, error);
+ cl_git_fail(error = git_rebase_next(&rebase_operation, rebase));
+ cl_assert_equal_i(GIT_ITEROVER, error);
- git_reference_free(branch_ref);
- git_reference_free(upstream_ref);
- git_annotated_commit_free(branch_head);
- git_annotated_commit_free(upstream_head);
- git_commit_free(commit);
- git_rebase_free(rebase);
+ git_reference_free(branch_ref);
+ git_reference_free(upstream_ref);
+ git_annotated_commit_free(branch_head);
+ git_annotated_commit_free(upstream_head);
+ git_commit_free(commit);
+ git_rebase_free(rebase);
}
int signature_cb_magic_field(
- git_buf *signature,
- git_buf *signature_field,
- const char *commit_content,
- void *payload)
+ git_buf *signature,
+ git_buf *signature_field,
+ const char *commit_content,
+ void *payload)
{
- const char *signature_content = "magic word: pretty please";
- const char * signature_field_content = "magicsig";
+ const char *signature_content = "magic word: pretty please";
+ const char * signature_field_content = "magicsig";
- cl_assert_equal_b(false, git_buf_is_allocated(signature));
- cl_assert_equal_b(false, git_buf_is_allocated(signature_field));
- cl_assert_equal_s(expected_commit_content, commit_content);
- cl_assert_equal_p(NULL, payload);
+ cl_assert_equal_b(false, git_buf_is_allocated(signature));
+ cl_assert_equal_b(false, git_buf_is_allocated(signature_field));
+ cl_assert_equal_s(expected_commit_content, commit_content);
+ cl_assert_equal_p(NULL, payload);
- cl_git_pass(git_buf_set(signature, signature_content,
- strlen(signature_content) + 1));
- cl_git_pass(git_buf_set(signature_field, signature_field_content,
- strlen(signature_field_content) + 1));
+ cl_git_pass(git_buf_set(signature, signature_content,
+ strlen(signature_content) + 1));
+ cl_git_pass(git_buf_set(signature_field, signature_field_content,
+ strlen(signature_field_content) + 1));
- return GIT_OK;
+ return GIT_OK;
}
/* git checkout gravy ; git rebase --merge veal */
void test_rebase_sign__custom_signature_field(void)
{
- git_rebase *rebase;
- git_reference *branch_ref, *upstream_ref;
- git_annotated_commit *branch_head, *upstream_head;
- git_rebase_operation *rebase_operation;
- git_oid commit_id, expected_id;
- git_rebase_options rebase_opts = GIT_REBASE_OPTIONS_INIT;
- git_commit *commit;
- int error;
- const char *expected_commit_raw_header = "tree cd99b26250099fc38d30bfaed7797a7275ed3366\n\
+ git_rebase *rebase;
+ git_reference *branch_ref, *upstream_ref;
+ git_annotated_commit *branch_head, *upstream_head;
+ git_rebase_operation *rebase_operation;
+ git_oid commit_id, expected_id;
+ git_rebase_options rebase_opts = GIT_REBASE_OPTIONS_INIT;
+ git_commit *commit;
+ int error;
+ const char *expected_commit_raw_header = "tree cd99b26250099fc38d30bfaed7797a7275ed3366\n\
parent f87d14a4a236582a0278a916340a793714256864\n\
author Edward Thomson <ethomson@edwardthomson.com> 1405625055 -0400\n\
committer Rebaser <rebaser@rebaser.rb> 1405694510 +0000\n\
magicsig magic word: pretty please\n";
- rebase_opts.signature_cb = signature_cb_magic_field;
+ rebase_opts.signature_cb = signature_cb_magic_field;
- cl_git_pass(git_reference_lookup(&branch_ref, repo, "refs/heads/gravy"));
- cl_git_pass(git_reference_lookup(&upstream_ref, repo, "refs/heads/veal"));
+ cl_git_pass(git_reference_lookup(&branch_ref, repo, "refs/heads/gravy"));
+ cl_git_pass(git_reference_lookup(&upstream_ref, repo, "refs/heads/veal"));
- cl_git_pass(git_annotated_commit_from_ref(&branch_head, repo, branch_ref));
- cl_git_pass(git_annotated_commit_from_ref(&upstream_head, repo, upstream_ref));
+ cl_git_pass(git_annotated_commit_from_ref(&branch_head, repo, branch_ref));
+ cl_git_pass(git_annotated_commit_from_ref(&upstream_head, repo, upstream_ref));
- cl_git_pass(git_rebase_init(&rebase, repo, branch_head, upstream_head, NULL, &rebase_opts));
+ cl_git_pass(git_rebase_init(&rebase, repo, branch_head, upstream_head, NULL, &rebase_opts));
- cl_git_pass(git_rebase_next(&rebase_operation, rebase));
- cl_git_pass(git_rebase_commit(&commit_id, rebase, NULL, signature, NULL, NULL));
+ cl_git_pass(git_rebase_next(&rebase_operation, rebase));
+ cl_git_pass(git_rebase_commit(&commit_id, rebase, NULL, signature, NULL, NULL));
- git_oid_fromstr(&expected_id, "f46a4a8d26ae411b02aa61b7d69576627f4a1e1c");
- cl_assert_equal_oid(&expected_id, &commit_id);
+ git_oid_fromstr(&expected_id, "f46a4a8d26ae411b02aa61b7d69576627f4a1e1c");
+ cl_assert_equal_oid(&expected_id, &commit_id);
- cl_git_pass(git_commit_lookup(&commit, repo, &commit_id));
- cl_assert_equal_s(expected_commit_raw_header, git_commit_raw_header(commit));
+ cl_git_pass(git_commit_lookup(&commit, repo, &commit_id));
+ cl_assert_equal_s(expected_commit_raw_header, git_commit_raw_header(commit));
- cl_git_fail(error = git_rebase_next(&rebase_operation, rebase));
- cl_assert_equal_i(GIT_ITEROVER, error);
+ cl_git_fail(error = git_rebase_next(&rebase_operation, rebase));
+ cl_assert_equal_i(GIT_ITEROVER, error);
- git_reference_free(branch_ref);
- git_reference_free(upstream_ref);
- git_annotated_commit_free(branch_head);
- git_annotated_commit_free(upstream_head);
- git_commit_free(commit);
- git_rebase_free(rebase);
+ git_reference_free(branch_ref);
+ git_reference_free(upstream_ref);
+ git_annotated_commit_free(branch_head);
+ git_annotated_commit_free(upstream_head);
+ git_commit_free(commit);
+ git_rebase_free(rebase);
}