Merge branch 'ss/test-on-mingw-rsync-path-no-absolute'

diff --git a/t/t7060-wtstatus.sh b/t/t7060-wtstatus.sh
index 52ef06b0005aabf2a201d20dbb5f232e3a26766a..741ec085767c9469f8ba15408af37cd558df1559 100755 (executable)
--- a/t/t7060-wtstatus.sh
+++ b/t/t7060-wtstatus.sh
@@ -29,20 +29,19 @@ test_expect_success 'Report new path with conflict' '
        test_cmp expect actual
 '
 
-cat >expect <<EOF
-# On branch side
-# You have unmerged paths.
-#   (fix conflicts and run "git commit")
-#
-# Unmerged paths:
-#   (use "git add/rm <file>..." as appropriate to mark resolution)
-#
-#      deleted by us:      foo
-#
+test_expect_success 'M/D conflict does not segfault' '
+       cat >expect <<EOF &&
+On branch side
+You have unmerged paths.
+  (fix conflicts and run "git commit")
+
+Unmerged paths:
+  (use "git add/rm <file>..." as appropriate to mark resolution)
+
+       deleted by us:   foo
+
 no changes added to commit (use "git add" and/or "git commit -a")
 EOF
-
-test_expect_success 'M/D conflict does not segfault' '
        mkdir mdconflict &&
        (
                cd mdconflict &&
@@ -135,19 +134,19 @@ test_expect_success 'status when conflicts with add and rm advice (deleted by th
        test_commit on_second main.txt on_second &&
        test_commit master conflict.txt master &&
        test_must_fail git merge second_branch &&
-       cat >expected <<-\EOF &&
-       # On branch master
-       # You have unmerged paths.
-       #   (fix conflicts and run "git commit")
-       #
-       # Unmerged paths:
-       #   (use "git add/rm <file>..." as appropriate to mark resolution)
-       #
-       #       both added:         conflict.txt
-       #       deleted by them:    main.txt
-       #
-       no changes added to commit (use "git add" and/or "git commit -a")
-       EOF
+       cat >expected <<\EOF &&
+On branch master
+You have unmerged paths.
+  (fix conflicts and run "git commit")
+
+Unmerged paths:
+  (use "git add/rm <file>..." as appropriate to mark resolution)
+
+       both added:      conflict.txt
+       deleted by them: main.txt
+
+no changes added to commit (use "git add" and/or "git commit -a")
+EOF
        git status --untracked-files=no >actual &&
        test_i18ncmp expected actual
 '
@@ -168,20 +167,20 @@ test_expect_success 'prepare for conflicts' '
 
 test_expect_success 'status when conflicts with add and rm advice (both deleted)' '
        test_must_fail git merge conflict &&
-       cat >expected <<-\EOF &&
-       # On branch conflict_second
-       # You have unmerged paths.
-       #   (fix conflicts and run "git commit")
-       #
-       # Unmerged paths:
-       #   (use "git add/rm <file>..." as appropriate to mark resolution)
-       #
-       #       both deleted:       main.txt
-       #       added by them:      sub_master.txt
-       #       added by us:        sub_second.txt
-       #
-       no changes added to commit (use "git add" and/or "git commit -a")
-       EOF
+       cat >expected <<\EOF &&
+On branch conflict_second
+You have unmerged paths.
+  (fix conflicts and run "git commit")
+
+Unmerged paths:
+  (use "git add/rm <file>..." as appropriate to mark resolution)
+
+       both deleted:    main.txt
+       added by them:   sub_master.txt
+       added by us:     sub_second.txt
+
+no changes added to commit (use "git add" and/or "git commit -a")
+EOF
        git status --untracked-files=no >actual &&
        test_i18ncmp expected actual
 '
@@ -192,22 +191,22 @@ test_expect_success 'status when conflicts with only rm advice (both deleted)' '
        test_must_fail git merge conflict &&
        git add sub_master.txt &&
        git add sub_second.txt &&
-       cat >expected <<-\EOF &&
-       # On branch conflict_second
-       # You have unmerged paths.
-       #   (fix conflicts and run "git commit")
-       #
-       # Changes to be committed:
-       #
-       #       new file:   sub_master.txt
-       #
-       # Unmerged paths:
-       #   (use "git rm <file>..." to mark resolution)
-       #
-       #       both deleted:       main.txt
-       #
-       # Untracked files not listed (use -u option to show untracked files)
-       EOF
+       cat >expected <<\EOF &&
+On branch conflict_second
+You have unmerged paths.
+  (fix conflicts and run "git commit")
+
+Changes to be committed:
+
+       new file:   sub_master.txt
+
+Unmerged paths:
+  (use "git rm <file>..." to mark resolution)
+
+       both deleted:    main.txt
+
+Untracked files not listed (use -u option to show untracked files)
+EOF
        git status --untracked-files=no >actual &&
        test_i18ncmp expected actual &&
        git reset --hard &&