From: Junio C Hamano <gitster@pobox.com>
Date: Thu, 28 Jul 2016 18:25:58 +0000 (-0700)
Subject: Merge branch 'js/t3404-grammo-fix' into maint
X-Git-Tag: v2.9.3~52
X-Git-Url: http://git.ipfire.org/?p=thirdparty%2Fgit.git;a=commitdiff_plain;h=8a81d5f5f81c8e42927b4361bc93ddfc345393b7

Merge branch 'js/t3404-grammo-fix' into maint

Grammofix.

* js/t3404-grammo-fix:
  t3404: fix a grammo (commands are ran -> commands are run)
---

8a81d5f5f81c8e42927b4361bc93ddfc345393b7
diff --cc t/t3404-rebase-interactive.sh
index 66348f11d1,84c3a62475..c7ea8bacf4
--- a/t/t3404-rebase-interactive.sh
+++ b/t/t3404-rebase-interactive.sh
@@@ -43,37 -46,29 +43,37 @@@ test_expect_success 'setup' 
  	test_commit G file1 &&
  	test_commit H file5 &&
  	git checkout -b branch2 F &&
 -	test_commit I file6
 +	test_commit I file6 &&
  	git checkout -b conflict-branch A &&
 -	for n in one two three four
 -	do
 -		test_commit $n conflict
 -	done &&
 +	test_commit one conflict &&
 +	test_commit two conflict &&
 +	test_commit three conflict &&
 +	test_commit four conflict &&
  	git checkout -b no-conflict-branch A &&
 -	for n in J K L M
 -	do
 -		test_commit $n file$n
 -	done &&
 +	test_commit J fileJ &&
 +	test_commit K fileK &&
 +	test_commit L fileL &&
 +	test_commit M fileM &&
  	git checkout -b no-ff-branch A &&
 -	for n in N O P
 -	do
 -		test_commit $n file$n
 -	done
 +	test_commit N fileN &&
 +	test_commit O fileO &&
 +	test_commit P fileP
  '
  
- # "exec" commands are ran with the user shell by default, but this may
+ # "exec" commands are run with the user shell by default, but this may
  # be non-POSIX. For example, if SHELL=zsh then ">file" doesn't work
 -# to create a file. Unseting SHELL avoids such non-portable behavior
 -# in tests.
 +# to create a file. Unsetting SHELL avoids such non-portable behavior
 +# in tests. It must be exported for it to take effect where needed.
  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 &&