forked from git/git
-
Notifications
You must be signed in to change notification settings - Fork 2.6k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
This is the branch thicket of patches in Git for Windows that are considered ready for upstream. To keep them in a ready-to-submit shape, they are kept as close to the beginning of the branch thicket as possible.
- Loading branch information
Showing
93 changed files
with
15,172 additions
and
219 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,25 @@ | ||
| name: CLANG build ARM64 | ||
|
|
||
| on: | ||
| workflow_dispatch: | ||
|
|
||
| defaults: | ||
| run: | ||
| shell: bash | ||
|
|
||
| jobs: | ||
| clang-build: | ||
| runs-on: [Windows, ARM64] | ||
| env: | ||
| NO_PERL: 1 | ||
| steps: | ||
| - uses: actions/checkout@v4 | ||
| - uses: git-for-windows/setup-git-for-windows-sdk@v1 | ||
| with: | ||
| flavor: makepkg-git | ||
| architecture: aarch64 | ||
| # This assumes that the job is running on a self-hosted runner, | ||
| # in which case we need to cleanup SDK files. | ||
| cleanup: true | ||
| - name: Build Git CLANGARM64 | ||
| run: make -j`nproc` |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,76 @@ | ||
| name: Windows Nano Server tests | ||
|
|
||
| on: | ||
| workflow_dispatch: | ||
|
|
||
| env: | ||
| DEVELOPER: 1 | ||
|
|
||
| jobs: | ||
| test-nano-server: | ||
| runs-on: windows-2022 | ||
| env: | ||
| WINDBG_DIR: "C:/Program Files (x86)/Windows Kits/10/Debuggers/x64" | ||
| IMAGE: mcr.microsoft.com/powershell:nanoserver-ltsc2022 | ||
|
|
||
| steps: | ||
| - uses: actions/checkout@v4 | ||
| - uses: git-for-windows/setup-git-for-windows-sdk@v1 | ||
| - name: build Git | ||
| shell: bash | ||
| run: make -j15 | ||
| - name: pull nanoserver image | ||
| shell: bash | ||
| run: docker pull $IMAGE | ||
| - name: run nano-server test | ||
| shell: bash | ||
| run: | | ||
| docker run \ | ||
| --user "ContainerAdministrator" \ | ||
| -v "$WINDBG_DIR:C:/dbg" \ | ||
| -v "$(cygpath -aw /mingw64/bin):C:/mingw64-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" | ||
| # For each executable to test pick some no-operation set of | ||
| # flags/subcommands or something that should quickly result in an | ||
| # error with known exit code that is not a negative 32-bit | ||
| # number, and set the expected return code appropriately. | ||
| # | ||
| # Only test executables that could be expected to run in a UI | ||
| # less environment. | ||
| # | ||
| # ( Executable path, arguments, expected return code ) | ||
| # also note space is required before close parenthesis (a | ||
| # powershell quirk when defining nested arrays like this) | ||
| $executables_to_test = @( | ||
| ("C:\test\git.exe", "", 1 ), | ||
| ("C:\test\scalar.exe", "version", 0 ) | ||
| ) | ||
| foreach ($executable in $executables_to_test) | ||
| { | ||
| Write-Output "Now testing $($executable[0])" | ||
| &$executable[0] $executable[1] | ||
| if ($LASTEXITCODE -ne $executable[2]) { | ||
| # if we failed, run the debugger to find out what function | ||
| # or DLL could not be found and then exit the script with | ||
| # failure The missing DLL or EXE will be referenced near | ||
| # the end of the output | ||
| # Set a flag to have the debugger show loader stub | ||
| # diagnostics. This requires running as administrator, | ||
| # otherwise the flag will be ignored. | ||
| C:\dbg\gflags -i $executable[0] +SLS | ||
| C:\dbg\cdb.exe -c "g" -c "q" $executable[0] $executable[1] | ||
| exit 1 | ||
| } | ||
| } | ||
| exit 0 | ||
| ' |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -248,3 +248,4 @@ Release/ | |
| /git.VC.db | ||
| *.dSYM | ||
| /contrib/buildsystems/out | ||
| CMakeSettings.json | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,5 @@ | ||
| sendpack.sideband:: | ||
| Allows to disable the side-band-64k capability for send-pack even | ||
| when it is advertised by the server. Makes it possible to work | ||
| around a limitation in the git for windows implementation together | ||
| with the dump git protocol. Defaults to true. |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,4 @@ | ||
| windows.appendAtomically:: | ||
| By default, append atomic API is used on windows. But it works only with | ||
| local disk files, if you're working on a network file system, you should | ||
| set it false to turn it off. |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.