Andrew's git
/
gitweb.git
/ diff
summary
|
log
|
commit
| diff |
tree
commit
grep
author
committer
pickaxe
?
re
Merge branch 'mt/rebase-i-keep-empty-test'
author
Junio C Hamano
<gitster@pobox.com>
Fri, 6 Jun 2014 18:36:06 +0000
(11:36 -0700)
committer
Junio C Hamano
<gitster@pobox.com>
Fri, 6 Jun 2014 18:36:06 +0000
(11:36 -0700)
* mt/rebase-i-keep-empty-test:
rebase --keep-empty -i: add test
t/t3404-rebase-interactive.sh
patch
|
blob
|
history
raw
(from parent 1:
e7cc0ed
)
diff --git
a/t/t3404-rebase-interactive.sh
b/t/t3404-rebase-interactive.sh
index c0023a5b4ff6ef60f5d77e9e54a64adf387bce6e..8197ed29a9ecedb43679200f1485a7b50984fdff 100755
(executable)
--- a/
t/t3404-rebase-interactive.sh
+++ b/
t/t3404-rebase-interactive.sh
@@
-67,6
+67,14
@@
test_expect_success 'setup' '
SHELL=
export SHELL
+test_expect_success 'rebase --keep-empty' '
+ git checkout -b emptybranch master &&
+ git commit --allow-empty -m "empty" &&
+ git rebase --keep-empty -i HEAD~2 &&
+ git log --oneline >actual &&
+ test_line_count = 6 actual
+'
+
test_expect_success 'rebase -i with the exec command' '
git checkout master &&
(