Merge pull request #508 from desktop/custom-gitconfig

Add a custom "system level" gitconfig

.github/workflows/ci.yml

@@ -13,7 +13,7 @@ jobs:
     name: Shellcheck
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
       - name: Run ShellCheck
         run: |
           sudo apt-get install shellcheck
@@ -82,14 +82,14 @@ jobs:
           # Delete the command line tools to make sure they don't get our builds
           # messed up with macOS SDK 11 stuff.
           sudo rm -rf /Library/Developer/CommandLineTools
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
         with:
           submodules: recursive
           # Needed for script/package.sh to work
           fetch-depth: 0
       - name: Install go
         if: matrix.targetPlatform == 'macOS'
-        uses: actions/setup-go@v2
+        uses: actions/setup-go@v5
       - name: Install dependencies
         run: npm install
       - name: Check formatting
@@ -146,7 +146,7 @@ jobs:
           TARGET_PLATFORM: ${{ matrix.targetPlatform }}
           TARGET_ARCH: ${{ matrix.arch }}
       - name: Upload output artifacts
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v3
         with:
           name:
             dugite-native-${{ matrix.targetPlatform }}-${{ matrix.arch }}-output
@@ -161,10 +161,10 @@ jobs:
     permissions:
       contents: write
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
 
       - name: Download all artifacts
-        uses: actions/download-artifact@v2
+        uses: actions/download-artifact@v4
         with:
           path: './artifacts'
 

resources/posix.gitconfig

@@ -0,0 +1,13 @@
+# This is dugite's own custom system-wide gitconfig file for macOS and Linux.
+# On Windows we ship a contained Git environment (minGit) where we can control
+# the system-level configuration but on macOS and Linux /etc/gitconfig is used
+# as the system-wide configuration file and we're unable to modify it.
+#
+# So in order to be able to provide our own sane defaults that can be overriden
+# by the user's global and local configuration we'll tell Git that this file
+# is the system level config (and import the actual system level config)
+[include]
+  path=/etc/gitconfig
+
+[credential "https://dev.azure.com"]
+  useHttpPath = true

script/build-macos.sh

@@ -110,4 +110,8 @@ echo "-- Removing unsupported features"
 rm "$DESTINATION/libexec/git-core/git-svn"
 rm "$DESTINATION/libexec/git-core/git-p4"
 
+echo "-- Copying dugite custom system gitconfig"
+mkdir "$DESTINATION/etc"
+cp "$CURRENT_DIR/../resources/posix.gitconfig" "$DESTINATION/etc/gitconfig"
+
 set +eu

script/build-ubuntu.sh

@@ -146,6 +146,10 @@ echo "-- Removing unsupported features"
 rm "$DESTINATION/libexec/git-core/git-svn"
 rm "$DESTINATION/libexec/git-core/git-p4"
 
+echo "-- Copying dugite custom system gitconfig"
+mkdir "$DESTINATION/etc"
+cp "$CURRENT_DIR/../resources/posix.gitconfig" "$DESTINATION/etc/gitconfig"
+
 set +eu
 
 echo "-- Static linking research"

script/build-win32.sh

@@ -94,6 +94,7 @@ git config --file "$SYSTEM_CONFIG" core.symlinks "false"
 git config --file "$SYSTEM_CONFIG" core.autocrlf "true"
 git config --file "$SYSTEM_CONFIG" core.fscache "true"
 git config --file "$SYSTEM_CONFIG" http.sslBackend "schannel"
+git config --file "$SYSTEM_CONFIG" credential.https://dev.azure.com.useHttpPath "true"
 
 # See https://github.com/desktop/desktop/issues/4817#issuecomment-393241303
 # Even though it's not set openssl will auto-discover the one we ship because