tests/rebase/setup.c

   1 #include "clar_libgit2.h"
   2 #include "git2/rebase.h"
   3 #include "posix.h"
   4
   5 #include <fcntl.h>
   6
   7 static git_repository *repo;
   8 static git_index *_index;
   9 static git_signature *signature;
  10
  11 /* Fixture setup and teardown */
  12 void test_rebase_setup__initialize(void)
  13 {
  14         repo = cl_git_sandbox_init("rebase");
  15         cl_git_pass(git_repository_index(&_index, repo));
  16         cl_git_pass(git_signature_now(&signature, "Rebaser", "rebaser@rebaser.rb"));
  17 }
  18
  19 void test_rebase_setup__cleanup(void)
  20 {
  21         git_signature_free(signature);
  22         git_index_free(_index);
  23         cl_git_sandbox_cleanup();
  24 }
  25
  26 /* git checkout beef ; git rebase --merge master
  27  * git checkout beef ; git rebase --merge master */
  28 void test_rebase_setup__blocked_when_in_progress(void)
  29 {
  30         git_rebase *rebase;
  31         git_reference *branch_ref, *upstream_ref;
  32         git_annotated_commit *branch_head, *upstream_head;
  33
  34         cl_assert_equal_i(GIT_REPOSITORY_STATE_NONE, git_repository_state(repo));
  35
  36         cl_git_pass(git_reference_lookup(&branch_ref, repo, "refs/heads/beef"));
  37         cl_git_pass(git_reference_lookup(&upstream_ref, repo, "refs/heads/master"));
  38
  39         cl_git_pass(git_annotated_commit_from_ref(&branch_head, repo, branch_ref));
  40         cl_git_pass(git_annotated_commit_from_ref(&upstream_head, repo, upstream_ref));
  41
  42         cl_git_pass(git_rebase_init(&rebase, repo, branch_head, upstream_head, NULL, NULL));
  43         git_rebase_free(rebase);
  44
  45         cl_assert_equal_i(GIT_REPOSITORY_STATE_REBASE_MERGE, git_repository_state(repo));
  46
  47         cl_git_fail(git_rebase_init(&rebase, repo, branch_head, upstream_head, NULL, NULL));
  48
  49         git_annotated_commit_free(branch_head);
  50         git_annotated_commit_free(upstream_head);
  51         git_reference_free(branch_ref);
  52         git_reference_free(upstream_ref);
  53 }
  54
  55 /* git checkout beef ; git rebase --merge master */
  56 void test_rebase_setup__merge(void)
  57 {
  58         git_rebase *rebase;
  59         git_reference *branch_ref, *upstream_ref;
  60         git_annotated_commit *branch_head, *upstream_head;
  61         git_reference *head;
  62         git_commit *head_commit;
  63         git_oid head_id;
  64
  65         cl_assert_equal_i(GIT_REPOSITORY_STATE_NONE, git_repository_state(repo));
  66
  67         cl_git_pass(git_reference_lookup(&branch_ref, repo, "refs/heads/beef"));
  68         cl_git_pass(git_reference_lookup(&upstream_ref, repo, "refs/heads/master"));
  69
  70         cl_git_pass(git_annotated_commit_from_ref(&branch_head, repo, branch_ref));
  71         cl_git_pass(git_annotated_commit_from_ref(&upstream_head, repo, upstream_ref));
  72
  73         cl_git_pass(git_rebase_init(&rebase, repo, branch_head, upstream_head, NULL, NULL));
  74
  75         cl_assert_equal_i(GIT_REPOSITORY_STATE_REBASE_MERGE, git_repository_state(repo));
  76
  77         git_oid_fromstr(&head_id, "efad0b11c47cb2f0220cbd6f5b0f93bb99064b00");
  78         cl_git_pass(git_repository_head(&head, repo));
  79         cl_git_pass(git_reference_peel((git_object **)&head_commit, head, GIT_OBJECT_COMMIT));
  80         cl_assert_equal_oid(&head_id, git_commit_id(head_commit));
  81
  82         cl_assert_equal_file("b146bd7608eac53d9bf9e1a6963543588b555c64\n", 41, "rebase/.git/ORIG_HEAD");
  83
  84         cl_assert_equal_file("da9c51a23d02d931a486f45ad18cda05cf5d2b94\n", 41, "rebase/.git/rebase-merge/cmt.1");
  85         cl_assert_equal_file("8d1f13f93c4995760ac07d129246ac1ff64c0be9\n", 41, "rebase/.git/rebase-merge/cmt.2");
  86         cl_assert_equal_file("3069cc907e6294623e5917ef6de663928c1febfb\n", 41, "rebase/.git/rebase-merge/cmt.3");
  87         cl_assert_equal_file("588e5d2f04d49707fe4aab865e1deacaf7ef6787\n", 41, "rebase/.git/rebase-merge/cmt.4");
  88         cl_assert_equal_file("b146bd7608eac53d9bf9e1a6963543588b555c64\n", 41, "rebase/.git/rebase-merge/cmt.5");
  89         cl_assert_equal_file("5\n", 2, "rebase/.git/rebase-merge/end");
  90         cl_assert_equal_file("efad0b11c47cb2f0220cbd6f5b0f93bb99064b00\n", 41, "rebase/.git/rebase-merge/onto");
  91         cl_assert_equal_file("master\n", 7, "rebase/.git/rebase-merge/onto_name");
  92         cl_assert_equal_file("b146bd7608eac53d9bf9e1a6963543588b555c64\n", 41, "rebase/.git/rebase-merge/orig-head");
  93
  94         git_commit_free(head_commit);
  95         git_reference_free(head);
  96         git_annotated_commit_free(branch_head);
  97         git_annotated_commit_free(upstream_head);
  98         git_reference_free(branch_ref);
  99         git_reference_free(upstream_ref);
 100         git_rebase_free(rebase);
 101 }
 102
 103 /* git checkout beef && git rebase --merge --root --onto master */
 104 void test_rebase_setup__merge_root(void)
 105 {
 106         git_rebase *rebase;
 107         git_reference *branch_ref, *onto_ref;
 108         git_annotated_commit *branch_head, *onto_head;
 109         git_reference *head;
 110         git_commit *head_commit;
 111         git_oid head_id;
 112
 113         cl_assert_equal_i(GIT_REPOSITORY_STATE_NONE, git_repository_state(repo));
 114
 115         cl_git_pass(git_reference_lookup(&branch_ref, repo, "refs/heads/beef"));
 116         cl_git_pass(git_reference_lookup(&onto_ref, repo, "refs/heads/master"));
 117
 118         cl_git_pass(git_annotated_commit_from_ref(&branch_head, repo, branch_ref));
 119         cl_git_pass(git_annotated_commit_from_ref(&onto_head, repo, onto_ref));
 120
 121         cl_git_pass(git_rebase_init(&rebase, repo, branch_head, NULL, onto_head, NULL));
 122
 123         git_oid_fromstr(&head_id, "efad0b11c47cb2f0220cbd6f5b0f93bb99064b00");
 124         cl_git_pass(git_repository_head(&head, repo));
 125         cl_git_pass(git_reference_peel((git_object **)&head_commit, head, GIT_OBJECT_COMMIT));
 126         cl_assert_equal_oid(&head_id, git_commit_id(head_commit));
 127
 128         cl_assert_equal_file("b146bd7608eac53d9bf9e1a6963543588b555c64\n", 41, "rebase/.git/ORIG_HEAD");
 129
 130         cl_assert_equal_i(GIT_REPOSITORY_STATE_REBASE_MERGE, git_repository_state(repo));
 131
 132         cl_assert_equal_file("da9c51a23d02d931a486f45ad18cda05cf5d2b94\n", 41, "rebase/.git/rebase-merge/cmt.1");
 133         cl_assert_equal_file("8d1f13f93c4995760ac07d129246ac1ff64c0be9\n", 41, "rebase/.git/rebase-merge/cmt.2");
 134         cl_assert_equal_file("3069cc907e6294623e5917ef6de663928c1febfb\n", 41, "rebase/.git/rebase-merge/cmt.3");
 135         cl_assert_equal_file("588e5d2f04d49707fe4aab865e1deacaf7ef6787\n", 41, "rebase/.git/rebase-merge/cmt.4");
 136         cl_assert_equal_file("b146bd7608eac53d9bf9e1a6963543588b555c64\n", 41, "rebase/.git/rebase-merge/cmt.5");
 137         cl_assert_equal_file("5\n", 2, "rebase/.git/rebase-merge/end");
 138         cl_assert_equal_file("efad0b11c47cb2f0220cbd6f5b0f93bb99064b00\n", 41, "rebase/.git/rebase-merge/onto");
 139         cl_assert_equal_file("master\n", 7, "rebase/.git/rebase-merge/onto_name");
 140         cl_assert_equal_file("b146bd7608eac53d9bf9e1a6963543588b555c64\n", 41, "rebase/.git/rebase-merge/orig-head");
 141
 142         git_commit_free(head_commit);
 143         git_reference_free(head);
 144         git_annotated_commit_free(branch_head);
 145         git_annotated_commit_free(onto_head);
 146         git_reference_free(branch_ref);
 147         git_reference_free(onto_ref);
 148         git_rebase_free(rebase);
 149 }
 150
 151 /* git checkout gravy && git rebase --merge --onto master veal */
 152 void test_rebase_setup__merge_onto_and_upstream(void)
 153 {
 154         git_rebase *rebase;
 155         git_reference *branch1_ref, *branch2_ref, *onto_ref;
 156         git_annotated_commit *branch1_head, *branch2_head, *onto_head;
 157         git_reference *head;
 158         git_commit *head_commit;
 159         git_oid head_id;
 160
 161         cl_assert_equal_i(GIT_REPOSITORY_STATE_NONE, git_repository_state(repo));
 162
 163         cl_git_pass(git_reference_lookup(&branch1_ref, repo, "refs/heads/gravy"));
 164         cl_git_pass(git_reference_lookup(&branch2_ref, repo, "refs/heads/veal"));
 165         cl_git_pass(git_reference_lookup(&onto_ref, repo, "refs/heads/master"));
 166
 167         cl_git_pass(git_annotated_commit_from_ref(&branch1_head, repo, branch1_ref));
 168         cl_git_pass(git_annotated_commit_from_ref(&branch2_head, repo, branch2_ref));
 169         cl_git_pass(git_annotated_commit_from_ref(&onto_head, repo, onto_ref));
 170
 171         cl_git_pass(git_rebase_init(&rebase, repo, branch1_head, branch2_head, onto_head, NULL));
 172
 173         git_oid_fromstr(&head_id, "efad0b11c47cb2f0220cbd6f5b0f93bb99064b00");
 174         cl_git_pass(git_repository_head(&head, repo));
 175         cl_git_pass(git_reference_peel((git_object **)&head_commit, head, GIT_OBJECT_COMMIT));
 176         cl_assert_equal_oid(&head_id, git_commit_id(head_commit));
 177
 178         cl_assert_equal_file("d616d97082eb7bb2dc6f180a7cca940993b7a56f\n", 41, "rebase/.git/ORIG_HEAD");
 179
 180         cl_assert_equal_i(GIT_REPOSITORY_STATE_REBASE_MERGE, git_repository_state(repo));
 181
 182         cl_assert_equal_file("d616d97082eb7bb2dc6f180a7cca940993b7a56f\n", 41, "rebase/.git/rebase-merge/cmt.1");
 183         cl_assert_equal_file("1\n", 2, "rebase/.git/rebase-merge/end");
 184         cl_assert_equal_file("efad0b11c47cb2f0220cbd6f5b0f93bb99064b00\n", 41, "rebase/.git/rebase-merge/onto");
 185         cl_assert_equal_file("master\n", 7, "rebase/.git/rebase-merge/onto_name");
 186         cl_assert_equal_file("d616d97082eb7bb2dc6f180a7cca940993b7a56f\n", 41, "rebase/.git/rebase-merge/orig-head");
 187
 188         git_commit_free(head_commit);
 189         git_reference_free(head);
 190         git_annotated_commit_free(branch1_head);
 191         git_annotated_commit_free(branch2_head);
 192         git_annotated_commit_free(onto_head);
 193         git_reference_free(branch1_ref);
 194         git_reference_free(branch2_ref);
 195         git_reference_free(onto_ref);
 196         git_rebase_free(rebase);
 197 }
 198
 199 /* git checkout beef && git rebase --merge --onto master gravy veal */
 200 void test_rebase_setup__merge_onto_upstream_and_branch(void)
 201 {
 202         git_rebase *rebase;
 203         git_reference *upstream_ref, *branch_ref, *onto_ref;
 204         git_annotated_commit *upstream_head, *branch_head, *onto_head;
 205         git_reference *head;
 206         git_commit *head_commit;
 207         git_oid head_id;
 208         git_checkout_options checkout_opts = GIT_CHECKOUT_OPTIONS_INIT;
 209
 210         checkout_opts.checkout_strategy = GIT_CHECKOUT_FORCE;
 211
 212         cl_assert_equal_i(GIT_REPOSITORY_STATE_NONE, git_repository_state(repo));
 213
 214         cl_git_pass(git_repository_set_head(repo, "refs/heads/beef"));
 215         cl_git_pass(git_checkout_head(repo, &checkout_opts));
 216
 217         cl_git_pass(git_reference_lookup(&branch_ref, repo, "refs/heads/veal"));
 218         cl_git_pass(git_reference_lookup(&upstream_ref, repo, "refs/heads/gravy"));
 219         cl_git_pass(git_reference_lookup(&onto_ref, repo, "refs/heads/master"));
 220
 221         cl_git_pass(git_annotated_commit_from_ref(&branch_head, repo, branch_ref));
 222         cl_git_pass(git_annotated_commit_from_ref(&upstream_head, repo, upstream_ref));
 223         cl_git_pass(git_annotated_commit_from_ref(&onto_head, repo, onto_ref));
 224
 225         cl_git_pass(git_rebase_init(&rebase, repo, branch_head, upstream_head, onto_head, NULL));
 226
 227         git_oid_fromstr(&head_id, "efad0b11c47cb2f0220cbd6f5b0f93bb99064b00");
 228         cl_git_pass(git_repository_head(&head, repo));
 229         cl_git_pass(git_reference_peel((git_object **)&head_commit, head, GIT_OBJECT_COMMIT));
 230         cl_assert_equal_oid(&head_id, git_commit_id(head_commit));
 231
 232         cl_assert_equal_file("f87d14a4a236582a0278a916340a793714256864\n", 41, "rebase/.git/ORIG_HEAD");
 233
 234         cl_assert_equal_i(GIT_REPOSITORY_STATE_REBASE_MERGE, git_repository_state(repo));
 235
 236         cl_assert_equal_file("3e8989b5a16d5258c935d998ef0e6bb139cc4757\n", 41, "rebase/.git/rebase-merge/cmt.1");
 237         cl_assert_equal_file("4cacc6f6e740a5bc64faa33e04b8ef0733d8a127\n", 41, "rebase/.git/rebase-merge/cmt.2");
 238         cl_assert_equal_file("f87d14a4a236582a0278a916340a793714256864\n", 41, "rebase/.git/rebase-merge/cmt.3");
 239         cl_assert_equal_file("3\n", 2, "rebase/.git/rebase-merge/end");
 240         cl_assert_equal_file("efad0b11c47cb2f0220cbd6f5b0f93bb99064b00\n", 41, "rebase/.git/rebase-merge/onto");
 241         cl_assert_equal_file("master\n", 7, "rebase/.git/rebase-merge/onto_name");
 242         cl_assert_equal_file("f87d14a4a236582a0278a916340a793714256864\n", 41, "rebase/.git/rebase-merge/orig-head");
 243
 244         git_commit_free(head_commit);
 245         git_reference_free(head);
 246         git_annotated_commit_free(upstream_head);
 247         git_annotated_commit_free(branch_head);
 248         git_annotated_commit_free(onto_head);
 249         git_reference_free(upstream_ref);
 250         git_reference_free(branch_ref);
 251         git_reference_free(onto_ref);
 252         git_rebase_free(rebase);
 253 }
 254
 255 /* git checkout beef && git rebase --merge --onto `git rev-parse master`
 256  *   `git rev-parse veal` `git rev-parse gravy`
 257  */
 258 void test_rebase_setup__merge_onto_upstream_and_branch_by_id(void)
 259 {
 260         git_rebase *rebase;
 261         git_oid upstream_id, branch_id, onto_id;
 262         git_annotated_commit *upstream_head, *branch_head, *onto_head;
 263         git_reference *head;
 264         git_commit *head_commit;
 265         git_oid head_id;
 266         git_checkout_options checkout_opts = GIT_CHECKOUT_OPTIONS_INIT;
 267
 268         checkout_opts.checkout_strategy = GIT_CHECKOUT_FORCE;
 269
 270         cl_assert_equal_i(GIT_REPOSITORY_STATE_NONE, git_repository_state(repo));
 271
 272         cl_git_pass(git_repository_set_head(repo, "refs/heads/beef"));
 273         cl_git_pass(git_checkout_head(repo, &checkout_opts));
 274
 275         cl_git_pass(git_oid_fromstr(&upstream_id, "f87d14a4a236582a0278a916340a793714256864"));
 276         cl_git_pass(git_oid_fromstr(&branch_id, "d616d97082eb7bb2dc6f180a7cca940993b7a56f"));
 277         cl_git_pass(git_oid_fromstr(&onto_id, "efad0b11c47cb2f0220cbd6f5b0f93bb99064b00"));
 278
 279         cl_git_pass(git_annotated_commit_lookup(&upstream_head, repo, &upstream_id));
 280         cl_git_pass(git_annotated_commit_lookup(&branch_head, repo, &branch_id));
 281         cl_git_pass(git_annotated_commit_lookup(&onto_head, repo, &onto_id));
 282
 283         cl_git_pass(git_rebase_init(&rebase, repo, branch_head, upstream_head, onto_head, NULL));
 284
 285         git_oid_fromstr(&head_id, "efad0b11c47cb2f0220cbd6f5b0f93bb99064b00");
 286         cl_git_pass(git_repository_head(&head, repo));
 287         cl_git_pass(git_reference_peel((git_object **)&head_commit, head, GIT_OBJECT_COMMIT));
 288         cl_assert_equal_oid(&head_id, git_commit_id(head_commit));
 289
 290         cl_assert_equal_file("d616d97082eb7bb2dc6f180a7cca940993b7a56f\n", 41, "rebase/.git/ORIG_HEAD");
 291
 292         cl_assert_equal_i(GIT_REPOSITORY_STATE_REBASE_MERGE, git_repository_state(repo));
 293
 294         cl_assert_equal_file("d616d97082eb7bb2dc6f180a7cca940993b7a56f\n", 41, "rebase/.git/rebase-merge/cmt.1");
 295         cl_assert_equal_file("1\n", 2, "rebase/.git/rebase-merge/end");
 296         cl_assert_equal_file("efad0b11c47cb2f0220cbd6f5b0f93bb99064b00\n", 41, "rebase/.git/rebase-merge/onto");
 297         cl_assert_equal_file("efad0b11c47cb2f0220cbd6f5b0f93bb99064b00\n", 41, "rebase/.git/rebase-merge/onto_name");
 298         cl_assert_equal_file("d616d97082eb7bb2dc6f180a7cca940993b7a56f\n", 41, "rebase/.git/rebase-merge/orig-head");
 299
 300         git_commit_free(head_commit);
 301         git_reference_free(head);
 302         git_annotated_commit_free(upstream_head);
 303         git_annotated_commit_free(branch_head);
 304         git_annotated_commit_free(onto_head);
 305         git_rebase_free(rebase);
 306 }
 307
 308 /* Ensure merge commits are dropped in a rebase */
 309 /* git checkout veal && git rebase --merge master */
 310 void test_rebase_setup__branch_with_merges(void)
 311 {
 312         git_rebase *rebase;
 313         git_reference *branch_ref, *upstream_ref;
 314         git_annotated_commit *branch_head, *upstream_head;
 315         git_reference *head;
 316         git_commit *head_commit;
 317         git_oid head_id;
 318
 319         cl_assert_equal_i(GIT_REPOSITORY_STATE_NONE, git_repository_state(repo));
 320
 321         cl_git_pass(git_reference_lookup(&branch_ref, repo, "refs/heads/veal"));
 322         cl_git_pass(git_reference_lookup(&upstream_ref, repo, "refs/heads/master"));
 323
 324         cl_git_pass(git_annotated_commit_from_ref(&branch_head, repo, branch_ref));
 325         cl_git_pass(git_annotated_commit_from_ref(&upstream_head, repo, upstream_ref));
 326
 327         cl_git_pass(git_rebase_init(&rebase, repo, branch_head, upstream_head, NULL, NULL));
 328
 329         cl_assert_equal_i(GIT_REPOSITORY_STATE_REBASE_MERGE, git_repository_state(repo));
 330
 331         git_oid_fromstr(&head_id, "efad0b11c47cb2f0220cbd6f5b0f93bb99064b00");
 332         cl_git_pass(git_repository_head(&head, repo));
 333         cl_git_pass(git_reference_peel((git_object **)&head_commit, head, GIT_OBJECT_COMMIT));
 334         cl_assert_equal_oid(&head_id, git_commit_id(head_commit));
 335
 336         cl_assert_equal_file("f87d14a4a236582a0278a916340a793714256864\n", 41, "rebase/.git/ORIG_HEAD");
 337
 338         cl_assert_equal_file("4bed71df7017283cac61bbf726197ad6a5a18b84\n", 41, "rebase/.git/rebase-merge/cmt.1");
 339         cl_assert_equal_file("2aa3ce842094e08ebac152b3d6d5b0fff39f9c6e\n", 41, "rebase/.git/rebase-merge/cmt.2");
 340         cl_assert_equal_file("3e8989b5a16d5258c935d998ef0e6bb139cc4757\n", 41, "rebase/.git/rebase-merge/cmt.3");
 341         cl_assert_equal_file("4cacc6f6e740a5bc64faa33e04b8ef0733d8a127\n", 41, "rebase/.git/rebase-merge/cmt.4");
 342         cl_assert_equal_file("f87d14a4a236582a0278a916340a793714256864\n", 41, "rebase/.git/rebase-merge/cmt.5");
 343         cl_assert_equal_file("5\n", 2, "rebase/.git/rebase-merge/end");
 344         cl_assert_equal_file("efad0b11c47cb2f0220cbd6f5b0f93bb99064b00\n", 41, "rebase/.git/rebase-merge/onto");
 345         cl_assert_equal_file("master\n", 7, "rebase/.git/rebase-merge/onto_name");
 346         cl_assert_equal_file("f87d14a4a236582a0278a916340a793714256864\n", 41, "rebase/.git/rebase-merge/orig-head");
 347
 348         git_commit_free(head_commit);
 349         git_reference_free(head);
 350         git_annotated_commit_free(branch_head);
 351         git_annotated_commit_free(upstream_head);
 352         git_reference_free(branch_ref);
 353         git_reference_free(upstream_ref);
 354         git_rebase_free(rebase);
 355 }
 356
 357 /* git checkout barley && git rebase --merge master */
 358 void test_rebase_setup__orphan_branch(void)
 359 {
 360         git_rebase *rebase;
 361         git_reference *branch_ref, *upstream_ref;
 362         git_annotated_commit *branch_head, *upstream_head;
 363         git_reference *head;
 364         git_commit *head_commit;
 365         git_oid head_id;
 366
 367         cl_assert_equal_i(GIT_REPOSITORY_STATE_NONE, git_repository_state(repo));
 368
 369         cl_git_pass(git_reference_lookup(&branch_ref, repo, "refs/heads/barley"));
 370         cl_git_pass(git_reference_lookup(&upstream_ref, repo, "refs/heads/master"));
 371
 372         cl_git_pass(git_annotated_commit_from_ref(&branch_head, repo, branch_ref));
 373         cl_git_pass(git_annotated_commit_from_ref(&upstream_head, repo, upstream_ref));
 374
 375         cl_git_pass(git_rebase_init(&rebase, repo, branch_head, upstream_head, NULL, NULL));
 376
 377         cl_assert_equal_i(GIT_REPOSITORY_STATE_REBASE_MERGE, git_repository_state(repo));
 378
 379         git_oid_fromstr(&head_id, "efad0b11c47cb2f0220cbd6f5b0f93bb99064b00");
 380         cl_git_pass(git_repository_head(&head, repo));
 381         cl_git_pass(git_reference_peel((git_object **)&head_commit, head, GIT_OBJECT_COMMIT));
 382         cl_assert_equal_oid(&head_id, git_commit_id(head_commit));
 383
 384         cl_assert_equal_file("12c084412b952396962eb420716df01022b847cc\n", 41, "rebase/.git/ORIG_HEAD");
 385
 386         cl_assert_equal_file("aa4c42aecdfc7cd989bbc3209934ea7cda3f4d88\n", 41, "rebase/.git/rebase-merge/cmt.1");
 387         cl_assert_equal_file("e4f809f826c1a9fc929874bc0e4644dd2f2a1af4\n", 41, "rebase/.git/rebase-merge/cmt.2");
 388         cl_assert_equal_file("9539b2cc291d6a6b1b266df8474d31fdd344dd79\n", 41, "rebase/.git/rebase-merge/cmt.3");
 389         cl_assert_equal_file("013cc32d341bab0e6f039f50f153c18986f16c58\n", 41, "rebase/.git/rebase-merge/cmt.4");
 390         cl_assert_equal_file("12c084412b952396962eb420716df01022b847cc\n", 41, "rebase/.git/rebase-merge/cmt.5");
 391         cl_assert_equal_file("5\n", 2, "rebase/.git/rebase-merge/end");
 392         cl_assert_equal_file("efad0b11c47cb2f0220cbd6f5b0f93bb99064b00\n", 41, "rebase/.git/rebase-merge/onto");
 393         cl_assert_equal_file("master\n", 7, "rebase/.git/rebase-merge/onto_name");
 394         cl_assert_equal_file("12c084412b952396962eb420716df01022b847cc\n", 41, "rebase/.git/rebase-merge/orig-head");
 395
 396         git_commit_free(head_commit);
 397         git_reference_free(head);
 398         git_annotated_commit_free(branch_head);
 399         git_annotated_commit_free(upstream_head);
 400         git_reference_free(branch_ref);
 401         git_reference_free(upstream_ref);
 402         git_rebase_free(rebase);
 403 }
 404
 405 /* git checkout beef && git rebase --merge master */
 406 void test_rebase_setup__merge_null_branch_uses_HEAD(void)
 407 {
 408         git_rebase *rebase;
 409         git_reference *upstream_ref;
 410         git_annotated_commit *upstream_head;
 411         git_reference *head;
 412         git_commit *head_commit;
 413         git_oid head_id;
 414         git_checkout_options checkout_opts = GIT_CHECKOUT_OPTIONS_INIT;
 415
 416         checkout_opts.checkout_strategy = GIT_CHECKOUT_FORCE;
 417
 418         cl_assert_equal_i(GIT_REPOSITORY_STATE_NONE, git_repository_state(repo));
 419
 420         cl_git_pass(git_repository_set_head(repo, "refs/heads/beef"));
 421         cl_git_pass(git_checkout_head(repo, &checkout_opts));
 422
 423         cl_git_pass(git_reference_lookup(&upstream_ref, repo, "refs/heads/master"));
 424         cl_git_pass(git_annotated_commit_from_ref(&upstream_head, repo, upstream_ref));
 425
 426         cl_git_pass(git_rebase_init(&rebase, repo, NULL, upstream_head, NULL, NULL));
 427
 428         cl_assert_equal_i(GIT_REPOSITORY_STATE_REBASE_MERGE, git_repository_state(repo));
 429
 430         git_oid_fromstr(&head_id, "efad0b11c47cb2f0220cbd6f5b0f93bb99064b00");
 431         cl_git_pass(git_repository_head(&head, repo));
 432         cl_git_pass(git_reference_peel((git_object **)&head_commit, head, GIT_OBJECT_COMMIT));
 433         cl_assert_equal_oid(&head_id, git_commit_id(head_commit));
 434
 435         cl_assert_equal_file("b146bd7608eac53d9bf9e1a6963543588b555c64\n", 41, "rebase/.git/ORIG_HEAD");
 436
 437         cl_assert_equal_file("da9c51a23d02d931a486f45ad18cda05cf5d2b94\n", 41, "rebase/.git/rebase-merge/cmt.1");
 438         cl_assert_equal_file("8d1f13f93c4995760ac07d129246ac1ff64c0be9\n", 41, "rebase/.git/rebase-merge/cmt.2");
 439         cl_assert_equal_file("3069cc907e6294623e5917ef6de663928c1febfb\n", 41, "rebase/.git/rebase-merge/cmt.3");
 440         cl_assert_equal_file("588e5d2f04d49707fe4aab865e1deacaf7ef6787\n", 41, "rebase/.git/rebase-merge/cmt.4");
 441         cl_assert_equal_file("b146bd7608eac53d9bf9e1a6963543588b555c64\n", 41, "rebase/.git/rebase-merge/cmt.5");
 442         cl_assert_equal_file("5\n", 2, "rebase/.git/rebase-merge/end");
 443         cl_assert_equal_file("efad0b11c47cb2f0220cbd6f5b0f93bb99064b00\n", 41, "rebase/.git/rebase-merge/onto");
 444         cl_assert_equal_file("master\n", 7, "rebase/.git/rebase-merge/onto_name");
 445         cl_assert_equal_file("b146bd7608eac53d9bf9e1a6963543588b555c64\n", 41, "rebase/.git/rebase-merge/orig-head");
 446
 447         git_commit_free(head_commit);
 448         git_reference_free(head);
 449         git_annotated_commit_free(upstream_head);
 450         git_reference_free(upstream_ref);
 451         git_rebase_free(rebase);
 452 }
 453
 454 /* git checkout b146bd7608eac53d9bf9e1a6963543588b555c64 && git rebase --merge master */
 455 void test_rebase_setup__merge_from_detached(void)
 456 {
 457         git_rebase *rebase;
 458         git_reference *upstream_ref;
 459         git_annotated_commit *branch_head, *upstream_head;
 460         git_reference *head;
 461         git_commit *head_commit;
 462         git_oid branch_id, head_id;
 463
 464         cl_assert_equal_i(GIT_REPOSITORY_STATE_NONE, git_repository_state(repo));
 465
 466         cl_git_pass(git_reference_lookup(&upstream_ref, repo, "refs/heads/master"));
 467
 468         cl_git_pass(git_oid_fromstr(&branch_id, "b146bd7608eac53d9bf9e1a6963543588b555c64"));
 469
 470         cl_git_pass(git_annotated_commit_lookup(&branch_head, repo, &branch_id));
 471         cl_git_pass(git_annotated_commit_from_ref(&upstream_head, repo, upstream_ref));
 472
 473         cl_git_pass(git_rebase_init(&rebase, repo, branch_head, upstream_head, NULL, NULL));
 474
 475         cl_assert_equal_i(GIT_REPOSITORY_STATE_REBASE_MERGE, git_repository_state(repo));
 476
 477         git_oid_fromstr(&head_id, "efad0b11c47cb2f0220cbd6f5b0f93bb99064b00");
 478         cl_git_pass(git_repository_head(&head, repo));
 479         cl_git_pass(git_reference_peel((git_object **)&head_commit, head, GIT_OBJECT_COMMIT));
 480         cl_assert_equal_oid(&head_id, git_commit_id(head_commit));
 481
 482         cl_assert_equal_file("b146bd7608eac53d9bf9e1a6963543588b555c64\n", 41, "rebase/.git/ORIG_HEAD");
 483
 484         cl_assert_equal_file("da9c51a23d02d931a486f45ad18cda05cf5d2b94\n", 41, "rebase/.git/rebase-merge/cmt.1");
 485         cl_assert_equal_file("8d1f13f93c4995760ac07d129246ac1ff64c0be9\n", 41, "rebase/.git/rebase-merge/cmt.2");
 486         cl_assert_equal_file("3069cc907e6294623e5917ef6de663928c1febfb\n", 41, "rebase/.git/rebase-merge/cmt.3");
 487         cl_assert_equal_file("588e5d2f04d49707fe4aab865e1deacaf7ef6787\n", 41, "rebase/.git/rebase-merge/cmt.4");
 488         cl_assert_equal_file("b146bd7608eac53d9bf9e1a6963543588b555c64\n", 41, "rebase/.git/rebase-merge/cmt.5");
 489         cl_assert_equal_file("5\n", 2, "rebase/.git/rebase-merge/end");
 490         cl_assert_equal_file("efad0b11c47cb2f0220cbd6f5b0f93bb99064b00\n", 41, "rebase/.git/rebase-merge/onto");
 491         cl_assert_equal_file("master\n", 7, "rebase/.git/rebase-merge/onto_name");
 492         cl_assert_equal_file("b146bd7608eac53d9bf9e1a6963543588b555c64\n", 41, "rebase/.git/rebase-merge/orig-head");
 493
 494         git_commit_free(head_commit);
 495         git_reference_free(head);
 496         git_annotated_commit_free(branch_head);
 497         git_annotated_commit_free(upstream_head);
 498         git_reference_free(upstream_ref);
 499         git_rebase_free(rebase);
 500 }
 501
 502 /* git checkout beef && git rebase --merge efad0b11c47cb2f0220cbd6f5b0f93bb99064b00 */
 503 void test_rebase_setup__merge_branch_by_id(void)
 504 {
 505         git_rebase *rebase;
 506         git_reference *branch_ref;
 507         git_annotated_commit *branch_head, *upstream_head;
 508         git_reference *head;
 509         git_commit *head_commit;
 510         git_oid head_id, upstream_id;
 511
 512         cl_assert_equal_i(GIT_REPOSITORY_STATE_NONE, git_repository_state(repo));
 513
 514         cl_git_pass(git_reference_lookup(&branch_ref, repo, "refs/heads/beef"));
 515
 516         cl_git_pass(git_oid_fromstr(&upstream_id, "efad0b11c47cb2f0220cbd6f5b0f93bb99064b00"));
 517
 518         cl_git_pass(git_annotated_commit_from_ref(&branch_head, repo, branch_ref));
 519         cl_git_pass(git_annotated_commit_lookup(&upstream_head, repo, &upstream_id));
 520
 521         cl_git_pass(git_rebase_init(&rebase, repo, branch_head, upstream_head, NULL, NULL));
 522
 523         cl_assert_equal_i(GIT_REPOSITORY_STATE_REBASE_MERGE, git_repository_state(repo));
 524
 525         git_oid_fromstr(&head_id, "efad0b11c47cb2f0220cbd6f5b0f93bb99064b00");
 526         cl_git_pass(git_repository_head(&head, repo));
 527         cl_git_pass(git_reference_peel((git_object **)&head_commit, head, GIT_OBJECT_COMMIT));
 528         cl_assert_equal_oid(&head_id, git_commit_id(head_commit));
 529
 530         cl_assert_equal_file("b146bd7608eac53d9bf9e1a6963543588b555c64\n", 41, "rebase/.git/ORIG_HEAD");
 531
 532         cl_assert_equal_file("da9c51a23d02d931a486f45ad18cda05cf5d2b94\n", 41, "rebase/.git/rebase-merge/cmt.1");
 533         cl_assert_equal_file("8d1f13f93c4995760ac07d129246ac1ff64c0be9\n", 41, "rebase/.git/rebase-merge/cmt.2");
 534         cl_assert_equal_file("3069cc907e6294623e5917ef6de663928c1febfb\n", 41, "rebase/.git/rebase-merge/cmt.3");
 535         cl_assert_equal_file("588e5d2f04d49707fe4aab865e1deacaf7ef6787\n", 41, "rebase/.git/rebase-merge/cmt.4");
 536         cl_assert_equal_file("b146bd7608eac53d9bf9e1a6963543588b555c64\n", 41, "rebase/.git/rebase-merge/cmt.5");
 537         cl_assert_equal_file("5\n", 2, "rebase/.git/rebase-merge/end");
 538         cl_assert_equal_file("efad0b11c47cb2f0220cbd6f5b0f93bb99064b00\n", 41, "rebase/.git/rebase-merge/onto");
 539         cl_assert_equal_file("efad0b11c47cb2f0220cbd6f5b0f93bb99064b00\n", 41, "rebase/.git/rebase-merge/onto_name");
 540         cl_assert_equal_file("b146bd7608eac53d9bf9e1a6963543588b555c64\n", 41, "rebase/.git/rebase-merge/orig-head");
 541
 542         git_commit_free(head_commit);
 543         git_reference_free(head);
 544         git_annotated_commit_free(branch_head);
 545         git_annotated_commit_free(upstream_head);
 546         git_reference_free(branch_ref);
 547         git_rebase_free(rebase);
 548 }
 549
 550 static int rebase_is_blocked(void)
 551 {
 552         git_rebase *rebase = NULL;
 553         int error;
 554
 555         git_reference *branch_ref, *upstream_ref;
 556         git_annotated_commit *branch_head, *upstream_head;
 557
 558         cl_assert_equal_i(GIT_REPOSITORY_STATE_NONE, git_repository_state(repo));
 559
 560         cl_git_pass(git_reference_lookup(&branch_ref, repo, "refs/heads/beef"));
 561         cl_git_pass(git_reference_lookup(&upstream_ref, repo, "refs/heads/master"));
 562
 563         cl_git_pass(git_annotated_commit_from_ref(&branch_head, repo, branch_ref));
 564         cl_git_pass(git_annotated_commit_from_ref(&upstream_head, repo, upstream_ref));
 565
 566         error = git_rebase_init(&rebase, repo, branch_head, upstream_head, NULL, NULL);
 567
 568         git_annotated_commit_free(branch_head);
 569         git_annotated_commit_free(upstream_head);
 570
 571         git_reference_free(branch_ref);
 572         git_reference_free(upstream_ref);
 573         git_rebase_free(rebase);
 574
 575         return error;
 576 }
 577
 578 void test_rebase_setup__blocked_for_staged_change(void)
 579 {
 580         cl_git_rewritefile("rebase/newfile.txt", "Stage an add");
 581         git_index_add_bypath(_index, "newfile.txt");
 582         cl_git_fail(rebase_is_blocked());
 583 }
 584
 585 void test_rebase_setup__blocked_for_unstaged_change(void)
 586 {
 587         cl_git_rewritefile("rebase/asparagus.txt", "Unstaged change");
 588         cl_git_fail(rebase_is_blocked());
 589 }
 590
 591 void test_rebase_setup__not_blocked_for_untracked_add(void)
 592 {
 593         cl_git_rewritefile("rebase/newfile.txt", "Untracked file");
 594         cl_git_pass(rebase_is_blocked());
 595 }
 596