From: Junio C Hamano <gitster@pobox.com>
Date: Fri, 6 Jun 2014 18:36:06 +0000 (-0700)
Subject: Merge branch 'mt/rebase-i-keep-empty-test'
X-Git-Tag: v2.1.0-rc0~153
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/075652953772dbabd01d471a4c73200b0ab5d8a6?ds=inline;hp=-c

Merge branch 'mt/rebase-i-keep-empty-test'

* mt/rebase-i-keep-empty-test:
rebase --keep-empty -i: add test
---

075652953772dbabd01d471a4c73200b0ab5d8a6
diff --combined t/t3404-rebase-interactive.sh
index c0023a5b4f,9848524aee..8197ed29a9
--- a/t/t3404-rebase-interactive.sh
+++ b/t/t3404-rebase-interactive.sh
@@@ -67,6 -67,14 +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 &&
  	(
@@@ -102,8 -110,12 +110,8 @@@ test_expect_success 'rebase -i with th
  
  test_expect_success 'rebase -i with the exec command checks tree cleanness' '
  	git checkout master &&
 -	(
  	set_fake_editor &&
 -	FAKE_LINES="exec_echo_foo_>file1 1" &&
 -	export FAKE_LINES &&
 -	test_must_fail git rebase -i HEAD^
 -	) &&
 +	test_must_fail env FAKE_LINES="exec_echo_foo_>file1 1" git rebase -i HEAD^ &&
  	test_cmp_rev master^ HEAD &&
  	git reset --hard &&
  	git rebase --continue
@@@ -112,9 -124,12 +120,9 @@@
  test_expect_success 'rebase -i with exec of inexistent command' '
  	git checkout master &&
  	test_when_finished "git rebase --abort" &&
 -	(
  	set_fake_editor &&
 -	FAKE_LINES="exec_this-command-does-not-exist 1" &&
 -	export FAKE_LINES &&
 -	test_must_fail git rebase -i HEAD^ >actual 2>&1
 -	) &&
 +	test_must_fail env FAKE_LINES="exec_this-command-does-not-exist 1" \
 +	git rebase -i HEAD^ >actual 2>&1 &&
  	! grep "Maybe git-rebase is broken" actual
  '
  
@@@ -368,7 -383,11 +376,7 @@@ test_expect_success 'commit message use
  	git checkout -b conflict-fixup conflict-branch &&
  	base=$(git rev-parse HEAD~4) &&
  	set_fake_editor &&
 -	(
 -		FAKE_LINES="1 fixup 3 fixup 4" &&
 -		export FAKE_LINES &&
 -		test_must_fail git rebase -i $base
 -	) &&
 +	test_must_fail env FAKE_LINES="1 fixup 3 fixup 4" git rebase -i $base &&
  	echo three > conflict &&
  	git add conflict &&
  	FAKE_COMMIT_AMEND="ONCE" EXPECT_HEADER_COUNT=2 \
@@@ -383,7 -402,11 +391,7 @@@ test_expect_success 'commit message ret
  	git checkout -b conflict-squash conflict-branch &&
  	base=$(git rev-parse HEAD~4) &&
  	set_fake_editor &&
 -	(
 -		FAKE_LINES="1 fixup 3 squash 4" &&
 -		export FAKE_LINES &&
 -		test_must_fail git rebase -i $base
 -	) &&
 +	test_must_fail env FAKE_LINES="1 fixup 3 squash 4" git rebase -i $base &&
  	echo three > conflict &&
  	git add conflict &&
  	FAKE_COMMIT_AMEND="TWICE" EXPECT_HEADER_COUNT=2 \
@@@ -454,7 -477,11 +462,7 @@@ test_expect_success 'interrupted squas
  	git checkout -b interrupted-squash conflict-branch &&
  	one=$(git rev-parse HEAD~3) &&
  	set_fake_editor &&
 -	(
 -		FAKE_LINES="1 squash 3 2" &&
 -		export FAKE_LINES &&
 -		test_must_fail git rebase -i HEAD~3
 -	) &&
 +	test_must_fail env FAKE_LINES="1 squash 3 2" git rebase -i HEAD~3 &&
  	(echo one; echo two; echo four) > conflict &&
  	git add conflict &&
  	test_must_fail git rebase --continue &&
@@@ -468,7 -495,11 +476,7 @@@ test_expect_success 'interrupted squas
  	git checkout -b interrupted-squash2 conflict-branch &&
  	one=$(git rev-parse HEAD~3) &&
  	set_fake_editor &&
 -	(
 -		FAKE_LINES="3 squash 1 2" &&
 -		export FAKE_LINES &&
 -		test_must_fail git rebase -i HEAD~3
 -	) &&
 +	test_must_fail env FAKE_LINES="3 squash 1 2" git rebase -i HEAD~3 &&
  	(echo one; echo four) > conflict &&
  	git add conflict &&
  	test_must_fail git rebase --continue &&
@@@ -505,7 -536,11 +513,7 @@@ test_expect_success 'aborted --continu
  	FAKE_LINES="edit 1" git rebase -i HEAD^ &&
  	echo "edited again" > file7 &&
  	git add file7 &&
 -	(
 -		FAKE_COMMIT_MESSAGE=" " &&
 -		export FAKE_COMMIT_MESSAGE &&
 -		test_must_fail git rebase --continue
 -	) &&
 +	test_must_fail env FAKE_COMMIT_MESSAGE=" " git rebase --continue &&
  	test $old = $(git rev-parse HEAD) &&
  	git rebase --abort
  '
@@@ -520,7 -555,11 +528,7 @@@ test_expect_success 'auto-amend only ed
  	echo "and again" > file7 &&
  	git add file7 &&
  	test_tick &&
 -	(
 -		FAKE_COMMIT_MESSAGE="and again" &&
 -		export FAKE_COMMIT_MESSAGE &&
 -		test_must_fail git rebase --continue
 -	) &&
 +	test_must_fail env FAKE_COMMIT_MESSAGE="and again" git rebase --continue &&
  	git rebase --abort
  '
  
@@@ -528,7 -567,11 +536,7 @@@ test_expect_success 'clean error after 
  	test_tick &&
  	test_when_finished "git rebase --abort || :" &&
  	set_fake_editor &&
 -	(
 -		FAKE_LINES="1 exec_false" &&
 -		export FAKE_LINES &&
 -		test_must_fail git rebase -i HEAD^
 -	) &&
 +	test_must_fail env FAKE_LINES="1 exec_false" git rebase -i HEAD^ &&
  	echo "edited again" > file7 &&
  	git add file7 &&
  	test_must_fail git rebase --continue 2>error &&
@@@ -912,8 -955,12 +920,8 @@@ test_expect_success 'rebase -i --root r
  
  test_expect_success 'rebase -i --root temporary sentinel commit' '
  	git checkout B &&
 -	(
 -		set_fake_editor &&
 -		FAKE_LINES="2" &&
 -		export FAKE_LINES &&
 -		test_must_fail git rebase -i --root
 -	) &&
 +	set_fake_editor &&
 +	test_must_fail env FAKE_LINES="2" git rebase -i --root &&
  	git cat-file commit HEAD | grep "^tree 4b825dc642cb" &&
  	git rebase --abort
  '
@@@ -1003,7 -1050,11 +1011,7 @@@ test_expect_success 'rebase -i error o
  	test_when_finished "git rebase --abort; git reset --hard $current_head; rm -f error" &&
  	test_commit TO-REMOVE will-conflict old-content &&
  	test_commit "\temp" will-conflict new-content dummy &&
 -	(
 -	EDITOR=true &&
 -	export EDITOR &&
 -	test_must_fail git rebase -i HEAD^ --onto HEAD^^ 2>error
 -	) &&
 +	test_must_fail env EDITOR=true git rebase -i HEAD^ --onto HEAD^^ 2>error &&
  	test_expect_code 1 grep  "	emp" error
  '