Andrew's git
/
gitweb.git
/ diff
summary
|
log
|
commit
| diff |
tree
commit
grep
author
committer
pickaxe
?
re
t3404: Add test case for auto-amending only edited commits after "edit"
author
Stephan Beyer
<s-beyer@gmx.net>
Thu, 15 Jan 2009 12:56:16 +0000
(13:56 +0100)
committer
Junio C Hamano
<gitster@pobox.com>
Thu, 15 Jan 2009 22:22:53 +0000
(14:22 -0800)
Add a test case for the bugfix introduced by commit
c14c3c82d
"git-rebase--interactive: auto amend only edited commit".
Signed-off-by: Stephan Beyer <s-beyer@gmx.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
t/t3404-rebase-interactive.sh
patch
|
blob
|
history
raw
|
patch
|
inline
| side by side (parent:
dc7f55c
)
diff --git
a/t/t3404-rebase-interactive.sh
b/t/t3404-rebase-interactive.sh
index 1182b4615b8de7139e16ce6ec35d3eb472b868b7..2cc8e7abe1b9244b2d6520cdbb0e0769e2a6d986 100755
(executable)
--- a/
t/t3404-rebase-interactive.sh
+++ b/
t/t3404-rebase-interactive.sh
@@
-388,6
+388,23
@@
test_expect_success 'aborted --continue does not squash commits after "edit"' '
git rebase --abort
'
git rebase --abort
'
+test_expect_success 'auto-amend only edited commits after "edit"' '
+ test_tick &&
+ FAKE_LINES="edit 1" git rebase -i HEAD^ &&
+ echo "edited again" > file7 &&
+ git add file7 &&
+ FAKE_COMMIT_MESSAGE="edited file7 again" git commit &&
+ echo "and again" > file7 &&
+ git add file7 &&
+ test_tick &&
+ (
+ FAKE_COMMIT_MESSAGE="and again" &&
+ export FAKE_COMMIT_MESSAGE &&
+ test_must_fail git rebase --continue
+ ) &&
+ git rebase --abort
+'
+
test_expect_success 'rebase a detached HEAD' '
grandparent=$(git rev-parse HEAD~2) &&
git checkout $(git rev-parse HEAD) &&
test_expect_success 'rebase a detached HEAD' '
grandparent=$(git rev-parse HEAD~2) &&
git checkout $(git rev-parse HEAD) &&