DO NOT MERGE get more data from the test

Author: BillyONeal

.github/workflows/build.yaml

@@ -80,6 +80,6 @@ jobs:
         shell: pwsh
         run: |
           cd out/build/${{ matrix.preset }}
-          ${{ github.workspace }}/azure-pipelines/end-to-end-tests.ps1 -RunArtifactsTests
+          ${{ github.workspace }}/azure-pipelines/end-to-end-tests.ps1 -RunArtifactsTests -Filter "^versions"
         env:
           VCPKG_ROOT: ${{ github.workspace }}/vcpkg-root

azure-pipelines/end-to-end-tests-dir/versions.ps1

@@ -95,22 +95,30 @@ Throw-IfFailed
 git -C $versionFilesPath @gitConfigOptions add -A
 git -C $versionFilesPath @gitConfigOptions commit -m "add octopus 1.0#1"
 
+type $versionFilesPath/versions/o-/octopus.json
 Set-EmptyTestPort -Name octopus -Version 2.0 -PortVersion "1" -PortsRoot "$versionFilesPath/ports"
-$output = Run-VcpkgAndCaptureOutput @portsRedirectArgsOK x-add-version octopus
+type $versionFilesPath/ports/octopus/vcpkg.json
+type $versionFilesPath/versions/o-/octopus.json
+$output = Run-VcpkgAndCaptureOutput @portsRedirectArgsOK x-add-version octopus --debug
+type $versionFilesPath/ports/octopus/vcpkg.json
+type $versionFilesPath/versions/o-/octopus.json
 Throw-IfNotFailed
 if ($output -notmatch @"
 warning: In octopus, 2.0 is completely new version, so the "port-version" field should be removed. Remove "port-version" and try again. To skip this check, rerun with --skip-version-format-check .
 "@) {
     throw "Expected detecting present port-version when a new version is added as bad"
 }
 
-Run-Vcpkg @portsRedirectArgsOK x-add-version octopus --skip-version-format-check
+Run-Vcpkg @portsRedirectArgsOK x-add-version octopus --skip-version-format-check --debug
 Throw-IfFailed
 git -C $versionFilesPath @gitConfigOptions add -A
 git -C $versionFilesPath @gitConfigOptions commit -m "add octopus 2.0#1"
 
 Set-EmptyTestPort -Name octopus -Version 2.0 -PortVersion "3" -PortsRoot "$versionFilesPath/ports"
-$output = Run-VcpkgAndCaptureOutput @portsRedirectArgsOK x-add-version octopus
+git status
+type $versionFilesPath/ports/octopus/vcpkg.json
+type $versionFilesPath/versions/o-/octopus.json
+$output = Run-VcpkgAndCaptureOutput @portsRedirectArgsOK x-add-version octopus --debug
 Throw-IfNotFailed
 if ($output -notmatch @"
 warning: In octopus, the current "port-version" for 2.0 is 1, so the next added "port-version" should be 2, but the port declares "port-version" 3. Change "port-version" to 2 and try again. To skip this check, rerun with --skip-version-format-check .

src/vcpkg/base/git.cpp

@@ -215,12 +215,27 @@ namespace vcpkg
         launch_settings.working_directory.emplace(target);
         auto& environment = launch_settings.environment.emplace();
         environment.add_entry("GIT_INDEX_FILE", index_file);
+
+        Command cmd3(git_exe);
+        cmd3.string_arg("-c").string_arg("core.autocrlf=false");
+        cmd3.string_arg("status");
+        auto out3 = cmd_execute_and_capture_output(context, cmd3, launch_settings);
+        context.statusln(LocalizedString::from_raw(out3.value_or_exit(VCPKG_LINE_INFO).output));
+
         cmd.string_arg("add");
         cmd.string_arg("-A");
+        cmd.string_arg("--");
         cmd.string_arg(".");
         auto maybe_add_result = cmd_execute_and_capture_output(context, cmd, launch_settings);
-        if (check_zero_exit_code(context, maybe_add_result, git_exe))
+        if (auto output = check_zero_exit_code(context, maybe_add_result, git_exe))
         {
+            context.statusln(LocalizedString::from_raw(*output));
+
+                    Command cmd2(git_exe);
+            cmd2.string_arg("-c").string_arg("core.autocrlf=false");
+            cmd2.string_arg("status");
+            auto out2 = cmd_execute_and_capture_output(context, cmd2, launch_settings);
+            context.statusln(LocalizedString::from_raw(out2.value_or_exit(VCPKG_LINE_INFO).output));
             return true;
         }
 
@@ -243,6 +258,7 @@ namespace vcpkg
         if (auto tree_output = check_zero_exit_code(context, maybe_write_tree_result, git_exe))
         {
             Strings::inplace_trim_end(*tree_output);
+            context.statusln(LocalizedString::from_raw(*tree_output));
             return std::move(*tree_output);
         }
 
@@ -264,6 +280,7 @@ namespace vcpkg
         auto maybe_ls_tree_result = cmd_execute_and_capture_output(context, cmd, launch_settings);
         if (auto ls_tree_output = check_zero_exit_code(context, maybe_ls_tree_result, git_exe))
         {
+            context.statusln(LocalizedString::from_raw(*ls_tree_output));
             std::vector<GitLSTreeEntry> ret;
             const auto lines = Strings::split(*ls_tree_output, '\n');
             // The first line of the output is always the parent directory itself.