The contrib/vscode/init.sh script helps Git developers using Visual Studio Code to hook up the proper settings to work on Git using the UI features of that editor environment. This should include the debugger integration, but that is currently broken. One thing this script does is create a .vscode/launch.json file, which provides the information for how VS Code should launch the built executable. This defaults to the Git executable at the root of the repository (with no arguments). Among the initial settings, the "externalConsole" setting is set to "true". This has been the case since the script was created in 54c06c6013 (contrib: add a script to initialize VS Code configuration, 2018-07-30). Jonathan and Guillame reported that flipping this setting to "false" allows the VS Code debugger to work with Git. I verified that the debugger did not work by default but now does with this change. The VS Code reference [1] mentions that this setting is only used when debugging, so should not affect the "Run Without Debugging" feature. Other than making the UI debugger work, this will also change the Git output to appear in the "Debug Console" tab instead of a new window. [1] https://code.visualstudio.com/docs/cpp/launch-json-reference In cases such as using the Remote SSH capability, this setting is necessary to have any success executing Git via the "Run" menu, since the external console is not visible at all from the VS Code window. Reported-by: Jonathan Bressat <git.jonathan.bressat@xxxxxxxxx> Reported-by: Cogoni Guillaume <cogoni.guillaume@xxxxxxxxx> Signed-off-by: Derrick Stolee <derrickstolee@xxxxxxxxxx> --- contrib/vscode/init.sh | 2 +- t/test-lib-functions.sh | 34 ---------------------------------- 2 files changed, 1 insertion(+), 35 deletions(-) diff --git a/contrib/vscode/init.sh b/contrib/vscode/init.sh index 27de94994b5..0b7ebc12668 100755 --- a/contrib/vscode/init.sh +++ b/contrib/vscode/init.sh @@ -271,7 +271,7 @@ cat >.vscode/launch.json.new <<EOF || "stopAtEntry": false, "cwd": "\${workspaceFolder}", "environment": [], - "externalConsole": true, + "externalConsole": false, "MIMode": "gdb", "miDebuggerPath": "$GDBPATH", "setupCommands": [ diff --git a/t/test-lib-functions.sh b/t/test-lib-functions.sh index 8f0e5da8727..2501fc5706f 100644 --- a/t/test-lib-functions.sh +++ b/t/test-lib-functions.sh @@ -1788,40 +1788,6 @@ test_subcommand () { fi } -# Check that the given command was invoked as part of the -# trace2-format trace on stdin, but without an exact set of -# arguments. -# -# test_subcommand [!] <command> <args>... < <trace> -# -# For example, to look for an invocation of "git pack-objects" -# with the "--honor-pack-keep" argument, use -# -# GIT_TRACE2_EVENT=event.log git repack ... && -# test_subcommand git pack-objects --honor-pack-keep <event.log -# -# If the first parameter passed is !, this instead checks that -# the given command was not called. -# -test_subcommand_inexact () { - local negate= - if test "$1" = "!" - then - negate=t - shift - fi - - local expr=$(printf '"%s",' "$@") - expr="${expr%,}.*" - - if test -n "$negate" - then - ! grep "\"event\":\"child_start\".*\[$expr\]" - else - grep "\"event\":\"child_start\".*\[$expr\]" - fi -} - # Check that the given command was invoked as part of the # trace2-format trace on stdin. # -- 2.35.1.138.gfc5de29e9e6
