2008-04-16 19:50:48 +00:00
|
|
|
#!/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.
|
|
|
|
|
2010-10-31 01:46:54 +00:00
|
|
|
But otherwise with a sane description." &&
|
2008-04-16 19:50:48 +00:00
|
|
|
|
|
|
|
git branch side &&
|
|
|
|
|
|
|
|
git reset --hard HEAD^ &&
|
|
|
|
>elif &&
|
|
|
|
git add elif &&
|
|
|
|
test_tick &&
|
2018-02-08 20:42:41 +00:00
|
|
|
git commit -m second &&
|
2008-04-16 19:50:48 +00:00
|
|
|
|
2018-02-08 20:42:41 +00:00
|
|
|
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
|
2008-04-16 19:50:48 +00:00
|
|
|
'
|
|
|
|
|
|
|
|
test_expect_success rebase '
|
|
|
|
|
|
|
|
git checkout side &&
|
|
|
|
git rebase master &&
|
2010-01-26 23:08:31 +00:00
|
|
|
git cat-file commit HEAD | sed -e "1,/^\$/d" >actual &&
|
|
|
|
git cat-file commit side@{1} | sed -e "1,/^\$/d" >expect &&
|
2008-04-16 19:50:48 +00:00
|
|
|
test_cmp expect actual
|
|
|
|
|
2018-02-08 20:42:41 +00:00
|
|
|
'
|
2018-10-31 20:02:02 +00:00
|
|
|
test_expect_success REBASE_P rebasep '
|
2018-02-08 20:42:41 +00:00
|
|
|
|
|
|
|
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
|
|
|
|
|
2008-04-16 19:50:48 +00:00
|
|
|
'
|
|
|
|
|
|
|
|
test_done
|