diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 40cc3690ef7ee2..ed904415d6d821 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -479,7 +479,9 @@ jobs: - run: chmod a+w $GITHUB_ENV && sudo --preserve-env --set-home --user=builder ci/run-build-and-tests.sh - name: print test failures if: failure() && env.FAILED_TEST_ARTIFACTS != '' - run: sudo --preserve-env --set-home --user=builder ci/print-test-failures.sh + run: | + chmod a+w "$GITHUB_ENV" && + sudo --preserve-env --set-home --user=builder ci/print-test-failures.sh - name: Upload failed tests' directories if: failure() && env.FAILED_TEST_ARTIFACTS != '' uses: actions/upload-artifact@v7 diff --git a/.github/workflows/nano-server.yml b/.github/workflows/nano-server.yml index 2e6da3ceea6f90..60e056a44bf8cc 100644 --- a/.github/workflows/nano-server.yml +++ b/.github/workflows/nano-server.yml @@ -28,11 +28,11 @@ jobs: docker run \ --user "ContainerAdministrator" \ -v "$WINDBG_DIR:C:/dbg" \ - -v "$(cygpath -aw /mingw64/bin):C:/mingw64-bin" \ + -v "$(cygpath -aw "/${MSYSTEM,,}/bin"):C:/mingw-bin" \ -v "$(cygpath -aw .):C:/test" \ $IMAGE pwsh.exe -Command ' - # Extend the PATH to include the `.dll` files in /mingw64/bin/ - $env:PATH += ";C:\mingw64-bin" + # Add runtime DLLs from the active SDK to PATH. + $env:PATH += ";C:\mingw-bin" # For each executable to test pick some no-operation set of # flags/subcommands or something that should quickly result in an diff --git a/AGENTS.md b/AGENTS.md index 7273095017731a..a387a425110291 100644 --- a/AGENTS.md +++ b/AGENTS.md @@ -48,8 +48,8 @@ to `PATH`, then invoke a non-login `bash -c` (replace `C:\git-sdk-64` with your SDK root): ```powershell -$env:MSYSTEM = "MINGW64" -$env:PATH = "C:\git-sdk-64\mingw64\bin;C:\git-sdk-64\usr\bin;" + $env:PATH +$env:MSYSTEM = "UCRT64" +$env:PATH = "C:\git-sdk-64\ucrt64\bin;C:\git-sdk-64\usr\bin;" + $env:PATH & C:\git-sdk-64\usr\bin\bash.exe -c "make -j15" ``` diff --git a/Documentation/config/survey.adoc b/Documentation/config/survey.adoc index 9e594a2092f225..0bee888d1b9d74 100644 --- a/Documentation/config/survey.adoc +++ b/Documentation/config/survey.adoc @@ -1,14 +1,3 @@ survey.*:: - These variables adjust the default behavior of the `git survey` - command. The intention is that this command could be run in the - background with these options. -+ --- - verbose:: - This boolean value implies the `--[no-]verbose` option. - progress:: - This boolean value implies the `--[no-]progress` option. - top:: - This integer value implies `--top=`, specifying the - number of entries in the detail tables. --- + Deprecated and ignored by `git survey`. See the "MIGRATION" section + of linkgit:git-survey[1] for replacements and changed defaults. diff --git a/Documentation/git-survey.adoc b/Documentation/git-survey.adoc index e97656b49dee75..4d5ca497a8e411 100644 --- a/Documentation/git-survey.adoc +++ b/Documentation/git-survey.adoc @@ -44,8 +44,8 @@ Ref Selection The following options control the set of refs that `git survey` will examine. By default, `git survey` will look at tags, local branches, and remote refs. -If any of the following options are given, the default set is cleared and -only refs for the given options are added. +If any ref-selection option other than `--detached` is given, the default +set is cleared and only refs for the given options are added. --all-refs:: Use all refs. This includes local branches, tags, remote refs, @@ -61,11 +61,44 @@ only refs for the given options are added. Add remote branches (`refs/remote/`) to the set. --detached:: - Add HEAD to the set. + Ignored with a warning. This option does not affect ref selection. --other:: Add notes (`refs/notes/`) and stashes (`refs/stash/`) to the set. +MIGRATION +--------- +`git repo structure` selects all refs by default. To retain the survey +default scope, pass `--ref-filter='refs/heads/*'`, +`--ref-filter='refs/tags/*'`, and `--ref-filter='refs/remotes/*'`. + +Neither command separately enumerates detached `HEAD`, even with +`git survey --all-refs`. To include history reachable only from `HEAD`, +first create a branch or tag pointing to `HEAD` and include that ref in +the selection. The new ref is also counted. + +For path detail tables, `git repo structure` defaults to `--top=0`; use +`--top=10` or `repo.structure.top=10` for the survey default. The shim +always supplies `--top` (10 unless overridden on its command line), so +`repo.structure.top` does not change `git survey`'s limit. + +`--commit-parents=`, `--commit-sizes=`, `--tree-entries=`, +`--tree-sizes=`, `--blob-sizes=`, and `--[no-]name-rev` retain their +names in `git repo structure`, but are not accepted by the shim. Each +object-list limit defaults to 0. + +Name lookup for ranked commits is now enabled by default. Use +`git repo structure --no-name-rev` or set `repo.structure.nameRev=false` +to opt out; the configuration also applies through `git survey`. + +All `survey.*` settings are ignored. For `top`, `nameRev`, +`showCommitParents`, `showCommitSizes`, `showTreeEntries`, `showTreeSizes`, +and `showBlobSizes`, replace the `survey.` prefix with `repo.structure.` +when invoking `git repo structure` directly. Use `--progress` or +`--no-progress` instead of `survey.progress`; no `repo.structure.progress` +exists. `survey.verbose` has no replacement; the shim ignores `--verbose` +with a warning. + OUTPUT ------ diff --git a/t/t0060-path-utils.sh b/t/t0060-path-utils.sh index 5abfa202c19dca..2c805f85140c24 100755 --- a/t/t0060-path-utils.sh +++ b/t/t0060-path-utils.sh @@ -623,7 +623,7 @@ test_expect_success !VALGRIND,RUNTIME_PREFIX,CAN_EXEC_IN_PWD '%(prefix)/ works' test_expect_success MINGW,RUNTIME_PREFIX 'MSYSTEM/PATH is adjusted if necessary' ' if test -z "$MINGW_PREFIX" then - MINGW_PREFIX="/$(echo "${MSYSTEM:-MINGW64}" | tr A-Z a-z)" + MINGW_PREFIX="/$(echo "${MSYSTEM:-UCRT64}" | tr A-Z a-z)" fi && mkdir -p "$HOME"/bin pretend"$MINGW_PREFIX"/bin \ pretend"$MINGW_PREFIX"/libexec/git-core pretend/usr/bin &&