Skip to content

Commit f004f01

Browse files
jglathedscho
authored andcommitted
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 <[email protected]> Signed-off-by: Johannes Schindelin <[email protected]>
1 parent b94f7df commit f004f01

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

t/t0014-alias.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ test_expect_success 'looping aliases - internal execution' '
3939

4040
test_expect_success 'run-command formats empty args properly' '
4141
test_must_fail env GIT_TRACE=1 git frotz a "" b " " c 2>actual.raw &&
42-
sed -ne "/run_command:/s/.*trace: run_command: //p" actual.raw >actual &&
42+
sed -ne "/run_command: git-frotz/s/.*trace: run_command: //p" actual.raw >actual &&
4343
echo "git-frotz a '\'''\'' b '\'' '\'' c" >expect &&
4444
test_cmp expect actual
4545
'

0 commit comments

Comments
 (0)