Merge branch 'es/test-fixes'

Test clean-up and corrections.

* es/test-fixes: (26 commits)
  t5608: fix broken &&-chain
  t9119: fix broken &&-chains
  t9000-t9999: fix broken &&-chains
  t7000-t7999: fix broken &&-chains
  t6000-t6999: fix broken &&-chains
  t5000-t5999: fix broken &&-chains
  t4000-t4999: fix broken &&-chains
  t3030: fix broken &&-chains
  t3000-t3999: fix broken &&-chains
  t2000-t2999: fix broken &&-chains
  t1000-t1999: fix broken &&-chains
  t0000-t0999: fix broken &&-chains
  t9814: simplify convoluted check that command correctly errors out
  t9001: fix broken "invoke hook" test
  t7810: use test_expect_code() instead of hand-rolled comparison
  t7400: fix broken "submodule add/reconfigure --force" test
  t7201: drop pointless "exit 0" at end of subshell
  t6036: fix broken "merge fails but has appropriate contents" tests
  t5505: modernize and simplify hard-to-digest test
  t5406: use write_script() instead of birthing shell script manually
  ...

diff --cc t/lib-submodule-update.sh
Simple merge

diff --cc t/t3404-rebase-interactive.sh
Simple merge

diff --cc t/t3418-rebase-continue.sh
Simple merge

diff --cc t/t5500-fetch-pack.sh
Simple merge

diff --cc t/t6036-recursive-corner-cases.sh
index ef1c26ec588995499fd9a07c2816ea47d4faa6e9,892cf08743007aec0424edd6d7428489109ead59..4abe8a06e737be2ea500642762854f6e64632423
--- 1/t/t6036-recursive-corner-cases.sh
--- 2/t/t6036-recursive-corner-cases.sh
+++ b/t/t6036-recursive-corner-cases.sh
@@@ -604,87 -533,12 +604,87 @@@ test_expect_success 'merge of E2 & D1 f
                test_line_count = 2 out &&
  
                git rev-parse >expect    \
-                       B:a   E2:a/file  c:a/file   A:ignore-me &&
+                       B:a   E2:a/file  C:a/file   A:ignore-me &&
                git rev-parse   >actual   \
                        :3:a  :2:a/file  :1:a/file  :0:ignore-me &&
-               test_cmp expect actual
+               test_cmp expect actual &&
  
 -              test_path_is_file a~D^0
 +              test_path_is_file a~D1^0
 +      )
 +'
 +
 +test_expect_success 'merge of D1 & E3 succeeds' '
 +      test_when_finished "git -C directory-file reset --hard" &&
 +      test_when_finished "git -C directory-file clean -fdqx" &&
 +      (
 +              cd directory-file &&
 +
 +              git checkout D1^0 &&
 +
 +              git merge -s recursive E3^0 &&
 +
 +              git ls-files -s >out &&
 +              test_line_count = 2 out &&
 +              git ls-files -u >out &&
 +              test_line_count = 0 out &&
 +              git ls-files -o >out &&
 +              test_line_count = 1 out &&
 +
 +              git rev-parse >expect    \
 +                      A:ignore-me  E3:a &&
 +              git rev-parse   >actual   \
 +                      :0:ignore-me :0:a &&
 +              test_cmp expect actual
 +      )
 +'
 +
 +test_expect_success 'merge of D1 & E4 notifies user a and a2 are related' '
 +      test_when_finished "git -C directory-file reset --hard" &&
 +      test_when_finished "git -C directory-file clean -fdqx" &&
 +      (
 +              cd directory-file &&
 +
 +              git checkout D1^0 &&
 +
 +              test_must_fail git merge -s recursive E4^0 &&
 +
 +              git ls-files -s >out &&
 +              test_line_count = 4 out &&
 +              git ls-files -u >out &&
 +              test_line_count = 3 out &&
 +              git ls-files -o >out &&
 +              test_line_count = 1 out &&
 +
 +              git rev-parse >expect                  \
 +                      A:ignore-me  B:a   D1:a  E4:a2 &&
 +              git rev-parse   >actual                \
 +                      :0:ignore-me :1:a~Temporary\ merge\ branch\ 2  :2:a  :3:a2 &&
 +              test_cmp expect actual
 +      )
 +'
 +
 +test_expect_failure 'merge of D2 & E4 merges a2s & reports conflict for a/file' '
 +      test_when_finished "git -C directory-file reset --hard" &&
 +      test_when_finished "git -C directory-file clean -fdqx" &&
 +      (
 +              cd directory-file &&
 +
 +              git checkout D2^0 &&
 +
 +              test_must_fail git merge -s recursive E4^0 &&
 +
 +              git ls-files -s >out &&
 +              test_line_count = 3 out &&
 +              git ls-files -u >out &&
 +              test_line_count = 1 out &&
 +              git ls-files -o >out &&
 +              test_line_count = 1 out &&
 +
 +              git rev-parse >expect                 \
 +                      A:ignore-me  E4:a2  D2:a/file &&
 +              git rev-parse   >actual               \
 +                      :0:ignore-me :0:a2  :2:a/file &&
 +              test_cmp expect actual
        )
  '
  

diff --cc t/t7400-submodule-basic.sh
Simple merge

diff --cc t/t7810-grep.sh
Simple merge

diff --cc t/t9001-send-email.sh
Simple merge