Staging
v0.5.1
https://github.com/git/git
Raw File
Tip revision: 685e9d9145a186a4b2036ecf2be73cc86d99a9b7 authored by Junio C Hamano on 05 January 2011, 22:46:07 UTC
Git 1.7.4-rc1
Tip revision: 685e9d9
t3408-rebase-multi-line.sh
#!/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
back to top