Rebase shears/seen: 2 conflict(s) (0 skipped, 2 resolved) (#23828537881)

.gitattributes

@@ -6,6 +6,7 @@
 *.pm text eol=lf diff=perl
 *.py text eol=lf diff=python
 *.bat text eol=crlf
+*.png binary
 CODE_OF_CONDUCT.md -whitespace
 /Documentation/**/*.adoc text eol=lf whitespace=trail,space,incomplete
 /command-list.txt text eol=lf

.github/ISSUE_TEMPLATE/bug-report.yml

@@ -0,0 +1,105 @@
+name: Bug report
+description: Use this template to report bugs.
+body:
+  - type: checkboxes
+    id: search
+    attributes:
+      label: Existing issues matching what you're seeing
+      description: Please search for [open](https://github.com/git-for-windows/git/issues?q=is%3Aopen) or [closed](https://github.com/git-for-windows/git/issues?q=is%3Aclosed) issue matching what you're seeing before submitting a new issue.
+      options:
+        - label: I was not able to find an open or closed issue matching what I'm seeing
+  - type: textarea
+    id: git-for-windows-version
+    attributes:
+      label: Git for Windows version
+      description: Which version of Git for Windows are you using?
+      placeholder: Please insert the output of `git --version --build-options` here
+      render: shell
+    validations:
+      required: true
+  - type: dropdown
+    id: windows-version
+    attributes:
+      label: Windows version
+      description: Which version of Windows are you running?
+      options:
+        - Windows 8.1
+        - Windows 10
+        - Windows 11
+        - Other
+      default: 2
+    validations:
+      required: true
+  - type: dropdown
+    id: windows-arch
+    attributes:
+      label: Windows CPU architecture
+      description: What CPU Archtitecture does your Windows target?
+      options:
+        - i686 (32-bit)
+        - x86_64 (64-bit)
+        - ARM64
+      default: 1
+    validations:
+      required: true
+  - type: textarea
+    id: windows-version-cmd
+    attributes:
+      label: Additional Windows version information
+      description: This provides us with further information about your Windows such as the build number
+      placeholder: Please insert the output of `cmd.exe /c ver` here
+      render: shell
+  - type: textarea
+    id: options
+    attributes:
+      label: Options set during installation
+      description: What options did you set as part of the installation? Or did you choose the defaults?
+      placeholder: |
+        One of the following:
+        > type "C:\Program Files\Git\etc\install-options.txt"
+        > type "C:\Program Files (x86)\Git\etc\install-options.txt"
+        > type "%USERPROFILE%\AppData\Local\Programs\Git\etc\install-options.txt"
+        > type "$env:USERPROFILE\AppData\Local\Programs\Git\etc\install-options.txt"
+        $ cat /etc/install-options.txt
+      render: shell
+    validations:
+      required: true
+  - type: textarea
+    id: other-things
+    attributes:
+      label: Other interesting things
+      description: Any other interesting things about your environment that might be related to the issue you're seeing?
+  - type: input
+    id: terminal
+    attributes:
+      label: Terminal/shell
+      description: Which terminal/shell are you running Git from? e.g Bash/CMD/PowerShell/other
+    validations:
+      required: true
+  - type: textarea
+    id: commands
+    attributes:
+      label: Commands that trigger the issue
+      description: What commands did you run to trigger this issue? If you can provide a [Minimal, Complete, and Verifiable example](http://stackoverflow.com/help/mcve) this will help us understand the issue.
+      render: shell
+    validations:
+      required: true
+  - type: textarea
+    id: expected-behaviour
+    attributes:
+      label: Expected behaviour
+      description: What did you expect to occur after running these commands?
+    validations:
+      required: true
+  - type: textarea
+    id: actual-behaviour
+    attributes:
+      label: Actual behaviour
+      description: What actually happened instead?
+    validations:
+      required: true
+  - type: textarea
+    id: repository
+    attributes:
+      label: Repository
+      description: If the problem was occurring with a specific repository, can you provide the URL to that repository to help us with testing?

.github/ISSUE_TEMPLATE/config.yml

@@ -0,0 +1 @@
+blank_issues_enabled: false

.github/PULL_REQUEST_TEMPLATE.md

@@ -1,7 +1,19 @@
-Thanks for taking the time to contribute to Git! Please be advised that the
-Git community does not use github.com for their contributions. Instead, we use
-a mailing list (git@vger.kernel.org) for code submissions, code reviews, and
-bug reports. Nevertheless, you can use GitGitGadget (https://gitgitgadget.github.io/)
+Thanks for taking the time to contribute to Git!
+
+Those seeking to contribute to the Git for Windows fork should see
+http://gitforwindows.org/#contribute on how to contribute Windows specific
+enhancements.
+
+If your contribution is for the core Git functions and documentation
+please be aware that the Git community does not use the github.com issues
+or pull request mechanism for their contributions.
+
+Instead, we use the Git mailing list (git@vger.kernel.org) for code and
+documentation submissions, code reviews, and bug reports. The
+mailing list is plain text only (anything with HTML is sent directly
+to the spam folder).
+
+Nevertheless, you can use GitGitGadget (https://gitgitgadget.github.io/)
 to conveniently send your Pull Requests commits to our mailing list.
 
 For a single-commit pull request, please *leave the pull request description

.github/dependabot.yml

@@ -0,0 +1,13 @@
+# To get started with Dependabot version updates, you'll need to specify which
+# package ecosystems to update and where the package manifests are located.
+# Please see the documentation for all configuration options:
+# https://docs.github.com/code-security/dependabot/dependabot-version-updates/configuration-options-for-the-dependabot.yml-file
+# especially
+# https://docs.github.com/en/code-security/dependabot/working-with-dependabot/keeping-your-actions-up-to-date-with-dependabot#enabling-dependabot-version-updates-for-actions
+
+version: 2
+updates:
+  - package-ecosystem: "github-actions" # See documentation for possible values
+    directory: "/" # Location of package manifests
+    schedule:
+      interval: "weekly"

.github/workflows/main.yml

@@ -169,8 +169,11 @@ jobs:
       NO_PERL: 1
       GIT_CONFIG_PARAMETERS: "'user.name=CI' 'user.email=ci@git'"
     runs-on: windows-latest
+    strategy:
+      matrix:
+        arch: [x64, arm64]
     concurrency:
-      group: vs-build-${{ github.ref }}
+      group: vs-build-${{ github.ref }}-${{ matrix.arch }}
       cancel-in-progress: ${{ needs.ci-config.outputs.skip_concurrent == 'yes' }}
     steps:
     - uses: actions/checkout@v5
@@ -189,14 +192,14 @@ jobs:
       uses: microsoft/setup-msbuild@v2
     - name: copy dlls to root
       shell: cmd
-      run: compat\vcbuild\vcpkg_copy_dlls.bat release
+      run: compat\vcbuild\vcpkg_copy_dlls.bat release ${{ matrix.arch }}-windows
     - name: generate Visual Studio solution
       shell: bash
       run: |
-        cmake `pwd`/contrib/buildsystems/ -DCMAKE_PREFIX_PATH=`pwd`/compat/vcbuild/vcpkg/installed/x64-windows \
-        -DNO_GETTEXT=YesPlease -DPERL_TESTS=OFF -DPYTHON_TESTS=OFF -DCURL_NO_CURL_CMAKE=ON
+        cmake `pwd`/contrib/buildsystems/ -DCMAKE_PREFIX_PATH=`pwd`/compat/vcbuild/vcpkg/installed/${{ matrix.arch }}-windows \
+        -DNO_GETTEXT=YesPlease -DPERL_TESTS=OFF -DPYTHON_TESTS=OFF -DCURL_NO_CURL_CMAKE=ON -DCMAKE_GENERATOR_PLATFORM=${{ matrix.arch }} -DVCPKG_ARCH=${{ matrix.arch }}-windows -DHOST_CPU=${{ matrix.arch }}
     - name: MSBuild
-      run: msbuild git.sln -property:Configuration=Release -property:Platform=x64 -maxCpuCount:4 -property:PlatformToolset=v142
+      run: msbuild git.sln -property:Configuration=Release -property:Platform=${{ matrix.arch }} -maxCpuCount:4 -property:PlatformToolset=v142
     - name: bundle artifact tar
       shell: bash
       env:
@@ -210,7 +213,7 @@ jobs:
     - name: upload tracked files and build artifacts
       uses: actions/upload-artifact@v5
       with:
-        name: vs-artifacts
+        name: vs-artifacts-${{ matrix.arch }}
         path: artifacts
   vs-test:
     name: win+VS test
@@ -228,7 +231,7 @@ jobs:
     - name: download tracked files and build artifacts
       uses: actions/download-artifact@v6
       with:
-        name: vs-artifacts
+        name: vs-artifacts-x64
         path: ${{github.workspace}}
     - name: extract tracked files and build artifacts
       shell: bash

.github/workflows/monitor-components.yml

@@ -0,0 +1,94 @@
+name: Monitor component updates
+
+# Git for Windows is a slightly modified subset of MSYS2. Some of its
+# components are maintained by Git for Windows, others by MSYS2. To help
+# keeping the former up to date, this workflow monitors the Atom/RSS feeds
+# and opens new tickets for each new component version.
+
+on:
+  schedule:
+    - cron: "23 8,11,14,17 * * *"
+  workflow_dispatch:
+
+env:
+  CHARACTER_LIMIT: 5000
+  MAX_AGE: 7d
+
+jobs:
+  job:
+    # Only run this in Git for Windows' fork
+    if: github.event.repository.owner.login == 'git-for-windows'
+    runs-on: ubuntu-latest
+    permissions:
+      issues: write
+    strategy:
+      matrix:
+        component:
+          - label: git
+            feed: https://github.com/git/git/tags.atom
+          - label: git-lfs
+            feed: https://github.com/git-lfs/git-lfs/tags.atom
+          - label: git-credential-manager
+            feed: https://github.com/git-ecosystem/git-credential-manager/tags.atom
+          - label: tig
+            feed: https://github.com/jonas/tig/tags.atom
+          - label: cygwin
+            feed: https://github.com/cygwin/cygwin/releases.atom
+            title-pattern: ^(?!.*newlib)
+          - label: msys2-runtime-package
+            feed: https://github.com/msys2/MSYS2-packages/commits/master/msys2-runtime.atom
+          - label: msys2-runtime
+            feed: https://github.com/msys2/msys2-runtime/commits/HEAD.atom
+            aggregate: true
+          - label: openssh
+            feed: https://github.com/openssh/openssh-portable/tags.atom
+          - label: libfido2
+            feed: https://github.com/Yubico/libfido2/tags.atom
+          - label: libcbor
+            feed: https://github.com/PJK/libcbor/tags.atom
+          - label: openssl
+            feed: https://github.com/openssl/openssl/tags.atom
+            title-pattern: ^(?!.*alpha)
+          - label: gnutls
+            feed: https://gnutls.org/news.atom
+          - label: heimdal
+            feed: https://github.com/heimdal/heimdal/tags.atom
+          - label: git-sizer
+            feed: https://github.com/github/git-sizer/tags.atom
+          - label: gitflow
+            feed: https://github.com/petervanderdoes/gitflow-avh/tags.atom
+          - label: curl
+            feed: https://github.com/curl/curl/tags.atom
+            title-pattern: ^(?!rc-)
+          - label: mintty
+            feed: https://github.com/mintty/mintty/releases.atom
+          - label: 7-zip
+            feed: https://sourceforge.net/projects/sevenzip/rss?path=/7-Zip
+            aggregate: true
+          - label: bash
+            feed: https://git.savannah.gnu.org/cgit/bash.git/atom/?h=master
+            aggregate: true
+          - label: perl
+            feed: https://github.com/Perl/perl5/tags.atom
+            title-pattern: ^(?!.*(5\.[0-9]+[13579]|RC))
+          - label: pcre2
+            feed: https://github.com/PCRE2Project/pcre2/tags.atom
+          - label: mingw-w64-llvm
+            feed: https://github.com/msys2/MINGW-packages/commits/master/mingw-w64-llvm.atom
+          - label: innosetup
+            feed: https://github.com/jrsoftware/issrc/tags.atom
+          - label: mimalloc
+            feed: https://github.com/microsoft/mimalloc/tags.atom
+            title-pattern: ^(?!v1\.|v3\.[01]\.)
+      fail-fast: false
+    steps:
+      - uses: git-for-windows/rss-to-issues@v0
+        with:
+          feed: ${{matrix.component.feed}}
+          prefix: "[New ${{matrix.component.label}} version]"
+          labels: component-update
+          github-token: ${{ secrets.GITHUB_TOKEN }}
+          character-limit: ${{ env.CHARACTER_LIMIT }}
+          max-age: ${{ env.MAX_AGE }}
+          aggregate: ${{matrix.component.aggregate}}
+          title-pattern: ${{matrix.component.title-pattern}}

.github/workflows/nano-server.yml

@@ -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@v5
+      - 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
+            '

.gitignore

@@ -171,6 +171,7 @@
 /git-submodule
 /git-submodule--helper
 /git-subtree
+/git-survey
 /git-svn
 /git-switch
 /git-symbolic-ref
@@ -257,5 +258,6 @@ Release/
 /git.VC.db
 *.dSYM
 /contrib/buildsystems/out
+CMakeSettings.json
 /contrib/libgit-rs/target
 /contrib/libgit-sys/target