3 test_description='git rebase tests for -Xsubtree
5 This test runs git rebase and tests the subtree strategy.
8 . "$TEST_DIRECTORY"/lib-rebase.sh
11 git log --pretty=format:%s -1 "$1"
14 # There are a few bugs in the rebase with regards to the subtree strategy, and
15 # this test script tries to document them. First, the following commit history
16 # is generated (the onelines are shown, time flows from left to right):
18 # master1 - master2 - master3
20 # README ---------------------- Add subproject master - master4 - files_subtree/master5
22 # Where the merge moves the files master[123].t into the subdirectory
23 # files_subtree/ and master4 as well as files_subtree/master5 add files to that
26 # Then, in subsequent test cases, `git filter-branch` is used to distill just
27 # the commits that touch files_subtree/. To give it a final pre-rebase touch,
28 # an empty commit is added on top. The pre-rebase commit history looks like
31 # Add subproject master - master4 - files_subtree/master5 - Empty commit
33 # where the root commit adds three files: master1.t, master2.t and master3.t.
35 # This commit history is then rebased onto `master3` with the
36 # `-Xsubtree=files_subtree` option in three different ways:
38 # 1. using `--preserve-merges`
39 # 2. using `--preserve-merges` and --keep-empty
40 # 3. without specifying a rebase backend
42 test_expect_success 'setup' '
46 test_commit -C files master1 &&
47 test_commit -C files master2 &&
48 test_commit -C files master3 &&
50 : perform subtree merge into files_subtree/ &&
51 git fetch files refs/heads/master:refs/heads/files-master &&
52 git merge -s ours --no-commit --allow-unrelated-histories \
54 git read-tree --prefix=files_subtree -u files-master &&
55 git commit -m "Add subproject master" &&
57 : add two extra commits to rebase &&
58 test_commit -C files_subtree master4 &&
59 test_commit files_subtree/master5 &&
61 git checkout -b to-rebase &&
62 git filter-branch --prune-empty -f --subdirectory-filter files_subtree &&
63 git commit -m "Empty commit" --allow-empty
66 # FAILURE: Does not preserve master4.
67 test_expect_failure REBASE_P 'Rebase -Xsubtree --preserve-merges --onto commit' '
69 git checkout -b rebase-preserve-merges to-rebase &&
70 git rebase -Xsubtree=files_subtree --preserve-merges --onto files-master master &&
71 verbose test "$(commit_message HEAD~)" = "master4" &&
72 verbose test "$(commit_message HEAD)" = "files_subtree/master5"
75 # FAILURE: Does not preserve master4.
76 test_expect_failure REBASE_P 'Rebase -Xsubtree --keep-empty --preserve-merges --onto commit' '
78 git checkout -b rebase-keep-empty to-rebase &&
79 git rebase -Xsubtree=files_subtree --keep-empty --preserve-merges --onto files-master master &&
80 verbose test "$(commit_message HEAD~2)" = "master4" &&
81 verbose test "$(commit_message HEAD~)" = "files_subtree/master5" &&
82 verbose test "$(commit_message HEAD)" = "Empty commit"
85 # FAILURE: fatal: Could not parse object
86 test_expect_failure 'Rebase -Xsubtree --onto commit' '
88 git checkout -b rebase-onto to-rebase &&
89 git rebase -Xsubtree=files_subtree --onto files-master master &&
90 verbose test "$(commit_message HEAD~2)" = "master4" &&
91 verbose test "$(commit_message HEAD~)" = "files_subtree/master5" &&
92 verbose test "$(commit_message HEAD)" = "Empty commit"