diff-highlight: prefer "echo" to "cat" in tests

diff --git a/contrib/diff-highlight/t/t9400-diff-highlight.sh b/contrib/diff-highlight/t/t9400-diff-highlight.sh
index 3b43dbed7488c5f4a5f05809725ffd0bcd7e61b5..3f02d314673de54ca2d1d86dc9b3fbb90730a9ba 100755 (executable)
--- a/contrib/diff-highlight/t/t9400-diff-highlight.sh
+++ b/contrib/diff-highlight/t/t9400-diff-highlight.sh
@@ -52,9 +52,9 @@ test_strip_patch_header () {
 # dh_test_setup_history generates a contrived graph such that we have at least
 # 1 nesting (E) and 2 nestings (F).
 #
-#            A branch
-#           /
-#      D---E---F master
+#        A master
+#       /
+#      D---E---F branch
 #
 #      git log --all --graph
 #      * commit
@@ -68,24 +68,24 @@ test_strip_patch_header () {
 #           D
 #
 dh_test_setup_history () {
-       echo "file1" >file1 &&
-       echo "file2" >file2 &&
-       echo "file3" >file3 &&
-
-       cat file1 >file &&
+       echo file1 >file &&
        git add file &&
+       test_tick &&
        git commit -m "D" &&
 
        git checkout -b branch &&
-       cat file2 >file &&
-       git commit -a -m "A" &&
-
-       git checkout master &&
-       cat file2 >file &&
+       echo file2 >file &&
+       test_tick &&
        git commit -a -m "E" &&
 
-       cat file3 >file &&
-       git commit -a -m "F"
+       echo file3 >file &&
+       test_tick &&
+       git commit -a -m "F" &&
+
+       git checkout master &&
+       echo file2 >file &&
+       test_tick &&
+       git commit -a -m "A"
 }
 
 left_trim () {