From: Junio C Hamano <gitster@pobox.com>
Date: Fri, 15 Apr 2016 01:37:18 +0000 (-0700)
Subject: Merge branch 'pb/t7502-drop-dup' into maint
X-Git-Tag: v2.8.2~21
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/f1cfacff51f4c72110fd30f39c4c04b15e84eac7?hp=-c

Merge branch 'pb/t7502-drop-dup' into maint

Code clean-up.

* pb/t7502-drop-dup:
t/t7502 : drop duplicate test
---

f1cfacff51f4c72110fd30f39c4c04b15e84eac7
diff --combined t/t7502-commit.sh
index b39e313ac2,4eb1006d68..725687d5d5
--- a/t/t7502-commit.sh
+++ b/t/t7502-commit.sh
@@@ -392,7 -392,7 +392,7 @@@ exit 
  EOF
  
  test_expect_success !AUTOIDENT 'do not fire editor when committer is bogus' '
 -	>.git/result
 +	>.git/result &&
  	>expect &&
  
  	echo >>negative &&
@@@ -527,11 -527,6 +527,6 @@@ try_commit_status_combo () 
  		test_i18ngrep "^# Changes to be committed:" .git/COMMIT_EDITMSG
  	'
  
- 	test_expect_success 'commit' '
- 		try_commit "" &&
- 		test_i18ngrep "^# Changes to be committed:" .git/COMMIT_EDITMSG
- 	'
- 
  	test_expect_success 'commit --status' '
  		try_commit --status &&
  		test_i18ngrep "^# Changes to be committed:" .git/COMMIT_EDITMSG