From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 1 Mar 2021 22:02:57 +0000 (-0800)
Subject: Merge branch 'sv/t7001-modernize'
X-Git-Tag: v2.31.0-rc1~6
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=fbad3505eee2f58ec010b01bdd005ff4d36b5c01;p=thirdparty%2Fgit.git

Merge branch 'sv/t7001-modernize'

Test script modernization.

* sv/t7001-modernize:
  t7001: use `test` rather than `[`
  t7001: use here-docs instead of echo
  t7001: put each command on a separate line
  t7001: use '>' rather than 'touch'
  t7001: avoid using `cd` outside of subshells
  t7001: remove whitespace after redirect operators
  t7001: modernize subshell formatting
  t7001: remove unnecessary blank lines
  t7001: indent with TABs instead of spaces
  t7001: modernize test formatting
---

fbad3505eee2f58ec010b01bdd005ff4d36b5c01
diff --cc t/t7001-mv.sh
index 080a653083,63d779d886..25bb9bbb89
--- a/t/t7001-mv.sh
+++ b/t/t7001-mv.sh
@@@ -446,13 -425,10 +425,10 @@@ test_expect_success 'mv issues a warnin
  	echo "warning: Could not find section in .gitmodules where path=sub" >expect.err &&
  	mkdir mod &&
  	git mv sub mod/sub 2>actual.err &&
 -	test_i18ncmp expect.err actual.err &&
 +	test_cmp expect.err actual.err &&
  	! test -e sub &&
- 	[ "$entry" = "$(git ls-files --stage mod/sub | cut -f 1)" ] &&
- 	(
- 		cd mod/sub &&
- 		git status
- 	) &&
+ 	test "$entry" = "$(git ls-files --stage mod/sub | cut -f 1)" &&
+ 	git -C mod/sub status &&
  	git update-index --refresh &&
  	git diff-files --quiet
  '