Rebase onto Git for Windows 2.54.0-rc2

.azure-pipelines/release.yml

@@ -0,0 +1,259 @@
+name: $(Date:yyyyMMdd)$(Rev:.r)
+trigger: none
+pr: none
+
+resources:
+  repositories:
+    - repository: 1ESPipelines
+      type: git
+      name: 1ESPipelineTemplates/1ESPipelineTemplates
+      ref: refs/tags/release
+
+parameters:
+  - name: 'github'
+    type: boolean
+    default: false # TODO: change default to true after testing
+    displayName: 'Enable GitHub release publishing'
+
+#
+# 1ES Pipeline Templates do not allow using a matrix strategy so we create
+# a YAML object parameter with and foreach to create jobs for each entry.
+# Each OS has its own matrix object since their build steps differ.
+#
+  - name: windows_matrix
+    type: object
+    default:
+      - id: windows_x64
+        jobName: 'Windows (x64)'
+        pool: GitClientPME-1ESHostedPool-intel-pc
+        image: win-x86_64-ado1es
+        os: windows
+        toolchain: x86_64
+        mingwprefix: mingw64
+
+      - id: windows_arm64
+        jobName: 'Windows (ARM64)'
+        pool: GitClientPME-1ESHostedPool-arm64-pc
+        image: win-arm64-ado1es
+        os: windows
+        toolchain: clang-aarch64
+        mingwprefix: clangarm64
+
+  # No matrix for macOS as we build both x64 and ARM64 in the same job
+  # and produce a universal binary.
+
+  - name: linux_matrix
+    type: object
+    default:
+      - id: linux_x64
+        jobName: 'Linux (x64)'
+        pool: GitClientPME-1ESHostedPool-intel-pc
+        image: ubuntu-x86_64-ado1es
+        os: linux
+        cc_arch: x86_64
+        deb_arch: amd64
+
+      - id: linux_arm64
+        jobName: 'Linux (ARM64)'
+        pool: GitClientPME-1ESHostedPool-arm64-pc
+        image: ubuntu-arm64-ado1es
+        os: linux
+        cc_arch: aarch64
+        deb_arch: arm64
+
+variables:
+  - name: 'githubConnectionName'
+    value: 'GitHub-MicrosoftGit'
+
+extends:
+  template: v1/1ES.Official.PipelineTemplate.yml@1ESPipelines
+  parameters:
+    sdl:
+      # SDL source analysis tasks only run on Windows images
+      sourceAnalysisPool:
+        name: GitClientPME-1ESHostedPool-intel-pc
+        image: win-x86_64-ado1es
+        os: windows
+    stages:
+      - stage: prereqs
+        displayName: 'Prerequisites'
+        jobs:
+          - job: prebuild
+            displayName: 'Pre-build validation'
+            pool:
+              name: GitClientPME-1ESHostedPool-intel-pc
+              image: ubuntu-x86_64-ado1es
+              os: linux
+            steps:
+              - task: Bash@3
+                displayName: 'Resolve version and tag information'
+                name: info
+                inputs:
+                  targetType: inline
+                  script: |
+                    # TODO: determine git_version, tag_name, and tag_sha
+                    # TODO: error if the current commit is not an annotated tag
+                    git_version=TODO_GITVER
+                    tag_name=TODO_TAGNAME
+                    tag_sha=TODO_TAGSHA
+                    echo "##vso[task.setvariable variable=git_version;isOutput=true;isReadOnly=true]$git_version"
+                    echo "##vso[task.setvariable variable=tag_name;isOutput=true;isReadOnly=true]$tag_name"
+                    echo "##vso[task.setvariable variable=tag_sha;isOutput=true;isReadOnly=true]$tag_sha"
+
+      - stage: build
+        displayName: 'Build'
+        dependsOn: [prereqs]
+        jobs:
+          #
+          # Windows build jobs
+          #
+          - ${{ each dim in parameters.windows_matrix }}:
+            - job: ${{ dim.id }}
+              displayName: ${{ dim.jobName }}
+              pool:
+                name: ${{ dim.pool }}
+                image: ${{ dim.image }}
+                os: ${{ dim.os }}
+              variables:
+                tag_name: $[stageDependencies.prereqs.prebuild.outputs['info.tag_name']]
+                tag_sha: $[stageDependencies.prereqs.prebuild.outputs['info.tag_sha']]
+                git_version: $[stageDependencies.prereqs.prebuild.outputs['info.git_version']]
+                toolchain: ${{ dim.toolchain }}
+                mingwprefix: ${{ dim.mingwprefix }}
+              templateContext:
+                outputs:
+                  - output: pipelineArtifact
+                    targetPath: '$(Build.ArtifactStagingDirectory)/_final'
+                    artifactName: '${{ dim.id }}'
+              steps:
+                - checkout: self
+                # TODO: add tasks to set up Git for Windows SDK
+                # TODO: add tasks to build Git and installers
+                - script: |
+                    echo $(mingwprefix)
+                    echo $(toolchain)
+                  displayName: 'Dummy build'
+                # TODO: put final artifacts under $(Build.ArtifactStagingDirectory)/_final
+                - script: |
+                    echo "TODO" > $(Build.ArtifactStagingDirectory)/_final/placeholder.txt
+
+          #
+          # macOS build job (universal)
+          #
+          - job: macos_universal
+            displayName: 'macOS (x64 + ARM64)'
+            pool:
+              name: 'Azure Pipelines'
+              image: macOS-latest
+              os: macos
+            variables:
+              tag_name: $[stageDependencies.prereqs.prebuild.outputs['info.tag_name']]
+              tag_sha: $[stageDependencies.prereqs.prebuild.outputs['info.tag_sha']]
+              git_version: $[stageDependencies.prereqs.prebuild.outputs['info.git_version']]
+            templateContext:
+              outputs:
+                - output: pipelineArtifact
+                  targetPath: '$(Build.ArtifactStagingDirectory)/_final'
+                  artifactName: 'macos_universal'
+            steps:
+              - checkout: self
+              # TODO: add tasks to set up build environment
+              # TODO: add tasks to build Git and installers
+              - script: |
+                  echo "Hello, Mac!"
+                displayName: 'Dummy build'
+              # TODO: put final artifacts under $(Build.ArtifactStagingDirectory)/_final
+              - script: |
+                  echo "TODO" > $(Build.ArtifactStagingDirectory)/_final/placeholder.txt
+
+          #
+          # Linux build jobs
+          #
+          - ${{ each dim in parameters.linux_matrix }}:
+            - job: ${{ dim.id }}
+              displayName: ${{ dim.jobName }}
+              pool:
+                name: ${{ dim.pool }}
+                image: ${{ dim.image }}
+                os: ${{ dim.os }}
+              variables:
+                tag_name: $[stageDependencies.prereqs.prebuild.outputs['info.tag_name']]
+                tag_sha: $[stageDependencies.prereqs.prebuild.outputs['info.tag_sha']]
+                git_version: $[stageDependencies.prereqs.prebuild.outputs['info.git_version']]
+                cc_arch: ${{ dim.cc_arch }}
+                deb_arch: ${{ dim.deb_arch }}
+              templateContext:
+                outputs:
+                  - output: pipelineArtifact
+                    targetPath: '$(Build.ArtifactStagingDirectory)/_final'
+                    artifactName: '${{ dim.id }}'
+              steps:
+                - checkout: self
+                # TODO: add tasks to set up build environment
+                # TODO: add tasks to build Git and installers
+                - script: |
+                    echo $(cc_arch)
+                    echo $(deb_arch)
+                  displayName: 'Dummy build'
+                # TODO: put final artifacts under $(Build.ArtifactStagingDirectory)/_final
+                - script: |
+                    echo "TODO" > $(Build.ArtifactStagingDirectory)/_final/placeholder.txt
+
+      - stage: release
+        displayName: 'Release'
+        dependsOn: [prereqs, build]
+        jobs:
+          - job: github
+            displayName: 'Publish GitHub release'
+            condition: and(succeeded(), eq('${{ parameters.github }}', true))
+            pool:
+              name: GitClientPME-1ESHostedPool-intel-pc
+              image: ubuntu-x86_64-ado1es
+              os: linux
+            variables:
+              tag_name: $[stageDependencies.prereqs.prebuild.outputs['info.tag_name']]
+              tag_sha: $[stageDependencies.prereqs.prebuild.outputs['info.tag_sha']]
+              git_version: $[stageDependencies.prereqs.prebuild.outputs['info.git_version']]
+            templateContext:
+              type: releaseJob
+              isProduction: true
+              inputs:
+                - input: pipelineArtifact
+                  artifactName: 'windows_x64'
+                  targetPath: $(Pipeline.Workspace)/assets/windows_x64
+                - input: pipelineArtifact
+                  artifactName: 'windows_arm64'
+                  targetPath: $(Pipeline.Workspace)/assets/windows_arm64
+                - input: pipelineArtifact
+                  artifactName: 'macos_universal'
+                  targetPath: $(Pipeline.Workspace)/assets/macos_universal
+                - input: pipelineArtifact
+                  artifactName: 'linux_x64'
+                  targetPath: $(Pipeline.Workspace)/assets/linux_x64
+                - input: pipelineArtifact
+                  artifactName: 'linux_arm64'
+                  targetPath: $(Pipeline.Workspace)/assets/linux_arm64
+            steps:
+              - task: GitHubRelease@1
+                displayName: 'Create Draft GitHub Release'
+                inputs:
+                  gitHubConnection: $(githubConnectionName)
+                  repositoryName: microsoft/git
+                  tag: '$(tag_name)'
+                  tagSource: userSpecifiedTag
+                  target: '$(tag_sha)'
+                  title: '$(tag_name)'
+                  isDraft: true
+                  addChangeLog: true
+                  assets: |
+                    $(Pipeline.Workspace)/assets/windows_x64/*.exe
+                    $(Pipeline.Workspace)/assets/windows_x64/*.zip
+                    $(Pipeline.Workspace)/assets/windows_arm64/*.exe
+                    $(Pipeline.Workspace)/assets/windows_arm64/*.zip
+                    $(Pipeline.Workspace)/assets/macos_universal/*.pkg
+                    $(Pipeline.Workspace)/assets/macos_universal/*.dmg
+                    $(Pipeline.Workspace)/assets/macos_universal/*.tar.gz
+                    $(Pipeline.Workspace)/assets/linux_x64/*.deb
+                    $(Pipeline.Workspace)/assets/linux_x64/*.tar.gz
+                    $(Pipeline.Workspace)/assets/linux_arm64/*.deb
+                    $(Pipeline.Workspace)/assets/linux_arm64/*.tar.gz

.github/ISSUE_TEMPLATE.md

@@ -0,0 +1,68 @@
+ - [ ] I was not able to find an [open](https://github.com/microsoft/git/issues?q=is%3Aopen)
+        or [closed](https://github.com/microsoft/git/issues?q=is%3Aclosed) issue matching
+        what I'm seeing, including in [the `git-for-windows/git` tracker](https://github.com/git-for-windows/git/issues).
+
+### Setup
+
+ - Which version of `microsoft/git` are you using? Is it 32-bit or 64-bit?
+
+```
+$ git --version --build-options
+
+** insert your machine's response here **
+```
+
+Are you using Scalar or VFS for Git?
+
+** insert your answer here **
+
+If VFS for Git, then what version?
+
+```
+$ gvfs version
+
+** insert your machine's response here **
+```
+
+ - Which version of Windows are you running? Vista, 7, 8, 10? Is it 32-bit or 64-bit?
+
+```
+$ cmd.exe /c ver
+
+** insert your machine's response here **
+```
+
+ - Any other interesting things about your environment that might be related
+   to the issue you're seeing?
+
+** insert your response here **
+
+### Details
+
+ - Which terminal/shell are you running Git from? e.g Bash/CMD/PowerShell/other
+
+** insert your response here **
+
+ - 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.
+
+```
+** insert your commands here **
+```
+ - What did you expect to occur after running these commands?
+
+** insert here **
+
+ - What actually happened instead?
+
+** insert here **
+
+ - If the problem was occurring with a specific repository, can you specify
+   the repository?
+
+   * [ ] Public repo: **insert URL here**
+   * [ ] Windows monorepo
+   * [ ] Office monorepo
+   * [ ] Other Microsoft-internal repo: **insert name here**
+   * [ ] Other internal repo.