Andrew's git
/
gitweb.git
/ diff
summary
|
log
|
commit
| diff |
tree
commit
grep
author
committer
pickaxe
?
re
t3404: check root commit in 'rebase -i --root reword root commit'
author
Todd Zullinger
<tmz@pobox.com>
Mon, 18 Jun 2018 22:19:42 +0000
(18:19 -0400)
committer
Junio C Hamano
<gitster@pobox.com>
Tue, 19 Jun 2018 16:14:33 +0000
(09:14 -0700)
When testing a reworded root commit, ensure that the squash-onto commit
which is created and amended is still the root commit.
Suggested-by: Phillip Wood <phillip.wood@talktalk.net>
Helped-by: Johannes Schindelin <Johannes.Schindelin@gmx.de>
Signed-off-by: Todd Zullinger <tmz@pobox.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
t/t3404-rebase-interactive.sh
patch
|
blob
|
history
raw
|
patch
| inline |
side by side
(parent:
76fda6e
)
diff --git
a/t/t3404-rebase-interactive.sh
b/t/t3404-rebase-interactive.sh
index e500d7c3203cdfd7d69e5869d0010cb4a3bb2fa8..352a52e59d1a25d6fe50c5001ba3c84e2fc4a30c 100755
(executable)
--- a/
t/t3404-rebase-interactive.sh
+++ b/
t/t3404-rebase-interactive.sh
@@
-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' '