11aad46432
The `--preserve-merges` mode of the `rebase` command is slated to be deprecated soon, as the more powerful `--rebase-merges` mode is available now, and the latter was designed with the express intent to address the shortcomings of `--preserve-merges`' design (e.g. the inability to reorder commits in an interactive rebase). As such, we will eventually even remove the `--preserve-merges` support, and along with it, its tests. In preparation for this, and also to allow the Windows phase of our automated tests to save some well-needed time when running the test suite, this commit introduces a new prerequisite REBASE_P, which can be forced to being unmet by setting the environment variable `GIT_TEST_SKIP_REBASE_P` to any non-empty string. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>
66 lines
1.3 KiB
Bash
Executable File
66 lines
1.3 KiB
Bash
Executable File
#!/bin/sh
|
|
|
|
test_description='rebasing a commit with multi-line first paragraph.'
|
|
|
|
. ./test-lib.sh
|
|
|
|
test_expect_success setup '
|
|
|
|
>file &&
|
|
git add file &&
|
|
test_tick &&
|
|
git commit -m initial &&
|
|
|
|
echo hello >file &&
|
|
test_tick &&
|
|
git commit -a -m "A sample commit log message that has a long
|
|
summary that spills over multiple lines.
|
|
|
|
But otherwise with a sane description." &&
|
|
|
|
git branch side &&
|
|
|
|
git reset --hard HEAD^ &&
|
|
>elif &&
|
|
git add elif &&
|
|
test_tick &&
|
|
git commit -m second &&
|
|
|
|
git checkout -b side2 &&
|
|
>afile &&
|
|
git add afile &&
|
|
test_tick &&
|
|
git commit -m third &&
|
|
echo hello >afile &&
|
|
test_tick &&
|
|
git commit -a -m fourth &&
|
|
git checkout -b side-merge &&
|
|
git reset --hard HEAD^^ &&
|
|
git merge --no-ff -m "A merge commit log message that has a long
|
|
summary that spills over multiple lines.
|
|
|
|
But otherwise with a sane description." side2 &&
|
|
git branch side-merge-original
|
|
'
|
|
|
|
test_expect_success rebase '
|
|
|
|
git checkout side &&
|
|
git rebase master &&
|
|
git cat-file commit HEAD | sed -e "1,/^\$/d" >actual &&
|
|
git cat-file commit side@{1} | sed -e "1,/^\$/d" >expect &&
|
|
test_cmp expect actual
|
|
|
|
'
|
|
test_expect_success REBASE_P rebasep '
|
|
|
|
git checkout side-merge &&
|
|
git rebase -p side &&
|
|
git cat-file commit HEAD | sed -e "1,/^\$/d" >actual &&
|
|
git cat-file commit side-merge-original | sed -e "1,/^\$/d" >expect &&
|
|
test_cmp expect actual
|
|
|
|
'
|
|
|
|
test_done
|