Andrew's git
/
gitweb.git
/ diff
summary
|
log
|
commit
| diff |
tree
commit
grep
author
committer
pickaxe
?
re
t3404: cleanup double empty lines between tests
author
Stefan Beller
<sbeller@google.com>
Thu, 17 Mar 2016 21:44:20 +0000
(14:44 -0700)
committer
Junio C Hamano
<gitster@pobox.com>
Fri, 18 Mar 2016 21:44:32 +0000
(14:44 -0700)
Signed-off-by: Stefan Beller <sbeller@google.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:
78ec240
)
diff --git
a/t/t3404-rebase-interactive.sh
b/t/t3404-rebase-interactive.sh
index 21b1f950251a24f3e0035b05072c2e5f9c2a7572..b79f442acf901db1a9049e46e93f09d44a64e975 100755
(executable)
--- a/
t/t3404-rebase-interactive.sh
+++ b/
t/t3404-rebase-interactive.sh
@@
-771,7
+771,6
@@
test_expect_success 'rebase-i history with funny messages' '
test_cmp expect actual
'
test_cmp expect actual
'
-
test_expect_success 'prepare for rebase -i --exec' '
git checkout master &&
git checkout -b execute &&
test_expect_success 'prepare for rebase -i --exec' '
git checkout master &&
git checkout -b execute &&
@@
-780,7
+779,6
@@
test_expect_success 'prepare for rebase -i --exec' '
test_commit three_exec main.txt three_exec
'
test_commit three_exec main.txt three_exec
'
-
test_expect_success 'running "git rebase -i --exec git show HEAD"' '
set_fake_editor &&
git rebase -i --exec "git show HEAD" HEAD~2 >actual &&
test_expect_success 'running "git rebase -i --exec git show HEAD"' '
set_fake_editor &&
git rebase -i --exec "git show HEAD" HEAD~2 >actual &&
@@
-793,7
+791,6
@@
test_expect_success 'running "git rebase -i --exec git show HEAD"' '
test_cmp expected actual
'
test_cmp expected actual
'
-
test_expect_success 'running "git rebase --exec git show HEAD -i"' '
git reset --hard execute &&
set_fake_editor &&
test_expect_success 'running "git rebase --exec git show HEAD -i"' '
git reset --hard execute &&
set_fake_editor &&
@@
-807,7
+804,6
@@
test_expect_success 'running "git rebase --exec git show HEAD -i"' '
test_cmp expected actual
'
test_cmp expected actual
'
-
test_expect_success 'running "git rebase -ix git show HEAD"' '
git reset --hard execute &&
set_fake_editor &&
test_expect_success 'running "git rebase -ix git show HEAD"' '
git reset --hard execute &&
set_fake_editor &&
@@
-835,7
+831,6
@@
test_expect_success 'rebase -ix with several <CMD>' '
test_cmp expected actual
'
test_cmp expected actual
'
-
test_expect_success 'rebase -ix with several instances of --exec' '
git reset --hard execute &&
set_fake_editor &&
test_expect_success 'rebase -ix with several instances of --exec' '
git reset --hard execute &&
set_fake_editor &&
@@
-850,7
+845,6
@@
test_expect_success 'rebase -ix with several instances of --exec' '
test_cmp expected actual
'
test_cmp expected actual
'
-
test_expect_success 'rebase -ix with --autosquash' '
git reset --hard execute &&
git checkout -b autosquash &&
test_expect_success 'rebase -ix with --autosquash' '
git reset --hard execute &&
git checkout -b autosquash &&