kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity

Merge branch 'js/rebase-i-root-fix' 

* js/rebase-i-root-fix:
  t3404: check root commit in 'rebase -i --root reword root commit'
maint
Junio C Hamano 2018-06-19 09:26:28 -07:00
parent 1f2abe68d0 878810552b
commit 6b55779afc
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
t/t3404-rebase-interactive.sh
View File

@ -977,7 +977,8 @@ test_expect_success 'rebase -i --root reword root commit' '
set_fake_editor &&
FAKE_LINES="reword 1 2" FAKE_COMMIT_MESSAGE="A changed" \
git rebase -i --root &&
git show HEAD^ | grep "A changed"
git show HEAD^ | grep "A changed" &&
test -z "$(git show -s --format=%p HEAD^)"
'

test_expect_success C_LOCALE_OUTPUT 'rebase --edit-todo does not work on non-interactive rebase' '