mirror of
https://github.com/git/git.git
synced 2024-11-18 23:14:51 +01:00
5e835cac86
Traditionally git-rebase was implemented in terms of "format-patch" piped to "am -3", to strike balance between speed (because it avoids a rather expensive read-tree/merge-recursive machinery most of the time) and flexibility (the magic "-3" allows it to fall back to 3-way merge as necessary). However, this combination has one flaw when dealing with a nonstandard commit log message format that has more than one lines in the first paragraph. This teaches "git am --rebasing" to take advantage of the fact that the mbox message "git rebase" prepares for it records the original commit object name, to get the log message from the original commit object instead. Signed-off-by: Junio C Hamano <gitster@pobox.com>
41 lines
720 B
Bash
Executable file
41 lines
720 B
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
|
|
|
|
'
|
|
|
|
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_done
|