From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 19 Dec 2016 22:45:39 +0000 (-0800)
Subject: Merge branch 'sb/t3600-cleanup'
X-Git-Tag: v2.12.0-rc0~121
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=2d91cb79355077c69b9dc9a7df1a6df2924ee462;p=thirdparty%2Fgit.git

Merge branch 'sb/t3600-cleanup'

Code cleanup.

* sb/t3600-cleanup:
  t3600: slightly modernize style
  t3600: remove useless redirect
---

2d91cb79355077c69b9dc9a7df1a6df2924ee462
diff --cc t/t3600-rm.sh
index 14f0edca2b,66092f042d..bcbb680651
--- a/t/t3600-rm.sh
+++ b/t/t3600-rm.sh
@@@ -709,9 -687,10 +687,9 @@@ test_expect_success 'checking out a com
  	git commit -m "submodule removal" submod &&
  	git checkout HEAD^ &&
  	git submodule update &&
- 	git checkout -q HEAD^ 2>actual &&
+ 	git checkout -q HEAD^ &&
  	git checkout -q master 2>actual &&
 -	echo "warning: unable to rmdir submod: Directory not empty" >expected &&
 -	test_i18ncmp expected actual &&
 +	test_i18ngrep "^warning: unable to rmdir submod:" actual &&
  	git status -s submod >actual &&
  	echo "?? submod/" >expected &&
  	test_cmp expected actual &&