mirror of
https://github.com/git/git.git
synced 2024-11-05 08:47:56 +01:00
a230949409
Rebasing a commit that contains a diff in the commit message results in a failure with output such as First, rewinding head to replay your work on top of it... Applying: My cool patch. fatal: sha1 information is lacking or useless (app/controllers/settings_controller.rb). Repository lacks necessary blobs to fall back on 3-way merge. Cannot fall back to three-way merge. Patch failed at 0001 My cool patch. The reason is that 'git rebase' without -p/-i/-m internally calls 'git format-patch' and pipes the output to 'git am --rebasing', which has no way of knowing what is a real patch and what is a commit message that contains a patch. Make 'git am' while in --rebasing mode get the patch body from the commit object instead of extracting it from the mailbox. Patch by Junio, test case and commit log message by Martin. Reported-by: anikey <arty.anikey@gmail.com> Helped-by: Junio C Hamano <gitster@pobox.com> Signed-off-by: Martin von Zweigbergk <martin.von.zweigbergk@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
72 lines
1.4 KiB
Bash
Executable file
72 lines
1.4 KiB
Bash
Executable file
#!/bin/sh
|
|
|
|
test_description='rebase should handle arbitrary git message'
|
|
|
|
. ./test-lib.sh
|
|
|
|
cat >F <<\EOF
|
|
This is an example of a commit log message
|
|
that does not conform to git commit convention.
|
|
|
|
It has two paragraphs, but its first paragraph is not friendly
|
|
to oneline summary format.
|
|
EOF
|
|
|
|
cat >G <<\EOF
|
|
commit log message containing a diff
|
|
EOF
|
|
|
|
|
|
test_expect_success setup '
|
|
|
|
>file1 &&
|
|
>file2 &&
|
|
git add file1 file2 &&
|
|
test_tick &&
|
|
git commit -m "Initial commit" &&
|
|
git branch diff-in-message
|
|
|
|
git checkout -b multi-line-subject &&
|
|
cat F >file2 &&
|
|
git add file2 &&
|
|
test_tick &&
|
|
git commit -F F &&
|
|
|
|
git cat-file commit HEAD | sed -e "1,/^\$/d" >F0 &&
|
|
|
|
git checkout diff-in-message &&
|
|
echo "commit log message containing a diff" >G &&
|
|
echo "" >>G
|
|
cat G >file2 &&
|
|
git add file2 &&
|
|
git diff --cached >>G &&
|
|
test_tick &&
|
|
git commit -F G &&
|
|
|
|
git cat-file commit HEAD | sed -e "1,/^\$/d" >G0 &&
|
|
|
|
git checkout master &&
|
|
|
|
echo One >file1 &&
|
|
test_tick &&
|
|
git add file1 &&
|
|
git commit -m "Second commit"
|
|
'
|
|
|
|
test_expect_success 'rebase commit with multi-line subject' '
|
|
|
|
git rebase master multi-line-subject &&
|
|
git cat-file commit HEAD | sed -e "1,/^\$/d" >F1 &&
|
|
|
|
test_cmp F0 F1 &&
|
|
test_cmp F F0
|
|
'
|
|
|
|
test_expect_success 'rebase commit with diff in message' '
|
|
git rebase master diff-in-message &&
|
|
git cat-file commit HEAD | sed -e "1,/^$/d" >G1 &&
|
|
test_cmp G0 G1 &&
|
|
test_cmp G G0
|
|
'
|
|
|
|
test_done
|