Merge branch 'sb/t3600-cleanup' into maint

Code cleanup.

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

diff --cc t/t3600-rm.sh
index 14f0edca2b6f67e6ae98379702b5566e4083d8e0,66092f042dfe64706b8257ab89359bf24efd475e..bcbb68065113f6a2032a3879fabb3353c42e79d0
--- 1/t/t3600-rm.sh
--- 2/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 &&