From 7ecd146a3241723602693ca67c78ca5e2da8cb57 Mon Sep 17 00:00:00 2001
From: Gar <gar+gh@danger.computer>
Date: Fri, 5 Jan 2024 07:41:17 -0800
Subject: [PATCH] deps: npmcli/git@5.0.4

---
 node_modules/@npmcli/git/lib/spawn.js |  2 +-
 node_modules/@npmcli/git/package.json | 16 +++++-----------
 package-lock.json                     |  8 ++++----
 package.json                          |  2 +-
 4 files changed, 11 insertions(+), 17 deletions(-)

diff --git a/node_modules/@npmcli/git/lib/spawn.js b/node_modules/@npmcli/git/lib/spawn.js
index 7098d7b872942..5e96eb5542b5a 100644
--- a/node_modules/@npmcli/git/lib/spawn.js
+++ b/node_modules/@npmcli/git/lib/spawn.js
@@ -2,10 +2,10 @@ const spawn = require('@npmcli/promise-spawn')
 const promiseRetry = require('promise-retry')
 const log = require('proc-log')
 const makeError = require('./make-error.js')
-const whichGit = require('./which.js')
 const makeOpts = require('./opts.js')
 
 module.exports = (gitArgs, opts = {}) => {
+  const whichGit = require('./which.js')
   const gitPath = whichGit(opts)
 
   if (gitPath instanceof Error) {
diff --git a/node_modules/@npmcli/git/package.json b/node_modules/@npmcli/git/package.json
index 6ab037d841cc3..485c1f43dddb9 100644
--- a/node_modules/@npmcli/git/package.json
+++ b/node_modules/@npmcli/git/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@npmcli/git",
-  "version": "5.0.3",
+  "version": "5.0.4",
   "main": "lib/index.js",
   "files": [
     "bin/",
@@ -14,7 +14,7 @@
   "author": "GitHub Inc.",
   "license": "ISC",
   "scripts": {
-    "lint": "eslint \"**/*.js\"",
+    "lint": "eslint \"**/*.{js,cjs,ts,mjs,jsx,tsx}\"",
     "snap": "tap",
     "test": "tap",
     "posttest": "npm run lint",
@@ -31,7 +31,7 @@
   },
   "devDependencies": {
     "@npmcli/eslint-config": "^4.0.0",
-    "@npmcli/template-oss": "4.18.0",
+    "@npmcli/template-oss": "4.21.3",
     "npm-package-arg": "^11.0.0",
     "slash": "^3.0.0",
     "tap": "^16.0.1"
@@ -51,13 +51,7 @@
   },
   "templateOSS": {
     "//@npmcli/template-oss": "This file is partially managed by @npmcli/template-oss. Edits may be overwritten.",
-    "version": "4.18.0",
-    "publish": true,
-    "ciVersions": [
-      "16.14.0",
-      "16.x",
-      "18.0.0",
-      "18.x"
-    ]
+    "version": "4.21.3",
+    "publish": true
   }
 }
diff --git a/package-lock.json b/package-lock.json
index 307851075ab55..669da5c0ee4fd 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -168,7 +168,7 @@
       "devDependencies": {
         "@npmcli/docs": "^1.0.0",
         "@npmcli/eslint-config": "^4.0.2",
-        "@npmcli/git": "^5.0.3",
+        "@npmcli/git": "^5.0.4",
         "@npmcli/mock-globals": "^1.0.0",
         "@npmcli/mock-registry": "^1.0.0",
         "@npmcli/template-oss": "4.21.3",
@@ -1811,9 +1811,9 @@
       }
     },
     "node_modules/@npmcli/git": {
-      "version": "5.0.3",
-      "resolved": "https://registry.npmjs.org/@npmcli/git/-/git-5.0.3.tgz",
-      "integrity": "sha512-UZp9NwK+AynTrKvHn5k3KviW/hA5eENmFsu3iAPe7sWRt0lFUdsY/wXIYjpDFe7cdSNwOIzbObfwgt6eL5/2zw==",
+      "version": "5.0.4",
+      "resolved": "https://registry.npmjs.org/@npmcli/git/-/git-5.0.4.tgz",
+      "integrity": "sha512-nr6/WezNzuYUppzXRaYu/W4aT5rLxdXqEFupbh6e/ovlYFQ8hpu1UUPV3Ir/YTl+74iXl2ZOMlGzudh9ZPUchQ==",
       "inBundle": true,
       "dependencies": {
         "@npmcli/promise-spawn": "^7.0.0",
diff --git a/package.json b/package.json
index c16b51c530dbe..7e2dd422162fc 100644
--- a/package.json
+++ b/package.json
@@ -199,7 +199,7 @@
   "devDependencies": {
     "@npmcli/docs": "^1.0.0",
     "@npmcli/eslint-config": "^4.0.2",
-    "@npmcli/git": "^5.0.3",
+    "@npmcli/git": "^5.0.4",
     "@npmcli/mock-globals": "^1.0.0",
     "@npmcli/mock-registry": "^1.0.0",
     "@npmcli/template-oss": "4.21.3",