From b94f7df57f5e5898e59a994e3c4bc9283a2abe71 Mon Sep 17 00:00:00 2001 From: Jens Glathe Date: Tue, 2 Jun 2020 12:12:25 +0200 Subject: [PATCH 1/2] t0014: fix indentation For some reason, this test case was indented with 4 spaces instead of 1 horizontal tab. The other test cases in the same test script are fine. Signed-off-by: Jens Glathe Signed-off-by: Johannes Schindelin --- t/t0014-alias.sh | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/t/t0014-alias.sh b/t/t0014-alias.sh index 8d3d9144c06d61..288e08299abc4e 100755 --- a/t/t0014-alias.sh +++ b/t/t0014-alias.sh @@ -38,10 +38,10 @@ test_expect_success 'looping aliases - internal execution' ' #' test_expect_success 'run-command formats empty args properly' ' - test_must_fail env GIT_TRACE=1 git frotz a "" b " " c 2>actual.raw && - sed -ne "/run_command:/s/.*trace: run_command: //p" actual.raw >actual && - echo "git-frotz a '\'''\'' b '\'' '\'' c" >expect && - test_cmp expect actual + test_must_fail env GIT_TRACE=1 git frotz a "" b " " c 2>actual.raw && + sed -ne "/run_command:/s/.*trace: run_command: //p" actual.raw >actual && + echo "git-frotz a '\'''\'' b '\'' '\'' c" >expect && + test_cmp expect actual ' test_done From f004f01072c619ea01a7a606697134e8f3e0b2c4 Mon Sep 17 00:00:00 2001 From: Jens Glathe Date: Tue, 2 Jun 2020 12:12:25 +0200 Subject: [PATCH 2/2] fixup! mingw: when path_lookup() failed, try BusyBox trace on git for windows delivers extra info which makes test 'run-command formats empty args properly' fail: $ cat actual.raw 10:49:28.858579 exec-cmd.c:237 trace: resolved executable dir: C:/git-sdk-64/mingw64/bin 10:49:28.872991 git.c:702 trace: exec: git-frotz a '' b ' ' c 10:49:28.872991 run-command.c:663 trace: run_command: git-frotz a '' b ' ' c 10:49:28.872991 run-command.c:663 trace: run_command: 'C:\git-sdk-64\mingw64\bin\busybox.exe' --help git: 'frotz' ist kein Git-Befehl. Siehe 'git --help'. sed delivers 2 lines back. increase the recognition string Signed-off-by: Jens Glathe Signed-off-by: Johannes Schindelin --- t/t0014-alias.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/t/t0014-alias.sh b/t/t0014-alias.sh index 288e08299abc4e..06669cab78eec6 100755 --- a/t/t0014-alias.sh +++ b/t/t0014-alias.sh @@ -39,7 +39,7 @@ test_expect_success 'looping aliases - internal execution' ' test_expect_success 'run-command formats empty args properly' ' test_must_fail env GIT_TRACE=1 git frotz a "" b " " c 2>actual.raw && - sed -ne "/run_command:/s/.*trace: run_command: //p" actual.raw >actual && + sed -ne "/run_command: git-frotz/s/.*trace: run_command: //p" actual.raw >actual && echo "git-frotz a '\'''\'' b '\'' '\'' c" >expect && test_cmp expect actual '