Merge branch 'js/test-whitespace-fixes'

Test code clean-up.

* js/test-whitespace-fixes:
  t9603: use tabs for indentation
  t5570: remove trailing padding
  t5400,t5402: consistently indent with tabs, not with spaces
  t3427: adjust stale comment
  t3406: indent with tabs, not spaces
  t1004: insert missing "branch" in a message

t/t1004-read-tree-m-u-wf.sh

@@ -20,7 +20,7 @@ test_expect_success 'two-way setup' '
 	git branch side &&
 	git tag -f branch-point &&
 
-	echo file2 is not tracked on the master anymore &&
+	echo file2 is not tracked on the master branch anymore &&
 	rm -f file2 subdir/file2 &&
 	git update-index --remove file2 subdir/file2 &&
 	git commit -a -m "master removes file2 and subdir/file2"

t/t3427-rebase-subtree.sh

@@ -19,7 +19,7 @@ commit_message() {
 #                             \
 # README ---------------------- Add subproject master - topic_4 - files_subtree/topic_5
 #
-# Where the merge moves the files master[123].t into the subdirectory
+# Where the merge moves the files topic_[123].t into the subdirectory
 # files_subtree/ and topic_4 as well as files_subtree/topic_5 add files to that
 # directory directly.
 #

t/t5400-send-pack.sh

@@ -26,7 +26,8 @@ test_expect_success setup '
 		echo "Commit #$i" >mozart/is/pink &&
 		git update-index --add mozart/is/pink &&
 		tree=$(git write-tree) &&
-	    commit=$(echo "Commit #$i" | git commit-tree $tree -p $parent) &&
+		commit=$(echo "Commit #$i" |
+			 git commit-tree $tree -p $parent) &&
 		git update-ref refs/tags/commit$i $commit &&
 		parent=$commit || return 1
 	done &&

t/t9603-cvsimport-patchsets.sh

@@ -17,9 +17,9 @@ test_description='git cvsimport testing for correct patchset estimation'
 setup_cvs_test_repository t9603
 
 test_expect_failure PERL 'import with criss cross times on revisions' '
-
 	git cvsimport -p"-x" -C module-git module &&
-    (cd module-git &&
+	(
+		cd module-git &&
 		git log --pretty=format:%s > ../actual-master &&
 		git log A~2..A --pretty="format:%s %ad" -- > ../actual-A &&
 		echo "" >> ../actual-master &&