From eb6d5ef8fdc6fe777a4e1d48e7b39d0e26a01f50 Mon Sep 17 00:00:00 2001
From: Chris Sidi <hashtagchris@github.com>
Date: Tue, 23 Jul 2024 11:07:10 -0400
Subject: [PATCH] feat: better support for cloning forked repos (#139)

<!-- What / Why -->
<!-- Describe the request in detail. What it does and why it's being
changed. -->

By default the gh cli operates against the upstream repo when you run
commands like `gh pr checkout ...`. For the purposes of stafftools, we
want to operate against the forked repo, so we run `gh repo set-default
npm/{name}`.

Tested with `node ./bin/gh.mjs template-oss-fix --install --filter
'name:json-parse-even-better-errors'` after removing
`~/projects/npm/json-parse-even-better-errors`. Also tested with `node
./bin/gh.mjs repos clone --filter "name:agent"`, to ensure clone still
works for non-forked repos.

## References
<!-- Examples:
  Related to #0
  Depends on #0
  Blocked by #0
  Fixes #0
  Closes #0
-->

Change to favor the upstream remote:
https://github.com/npm/template-oss/issues/363

https://github.com/npm/json-parse-even-better-errors/pull/65

https://github.com/cli/cli/issues/9261#issuecomment-2193936803

https://github.com/cli/cli/discussions/6777
---
 lib/gh/workers/_common.mjs | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/lib/gh/workers/_common.mjs b/lib/gh/workers/_common.mjs
index f3b49a9..f032ef7 100644
--- a/lib/gh/workers/_common.mjs
+++ b/lib/gh/workers/_common.mjs
@@ -8,13 +8,19 @@ export const clone = ({ argv, item }) => [
   mkdirp({ argv, item }),
   [
     'gh',
-    ['repo', 'clone', `${item.owner}/${item.name}`],
+    // template-oss will use upstream over origin, so we supply an alternate remote name for forked repos
+    ['repo', 'clone', `${item.owner}/${item.name}`, '-u', 'parent'],
     {
       cwd: item.ownerDir,
       status: ({ status, output }) =>
         status === 1 && output.includes('already exists') && 0,
     },
   ],
+  // choose the forked repo as the default, for operations like template-oss-fix
+  // See https://github.com/cli/cli/issues/9261#issuecomment-2193936803
+  ['gh',
+    ['repo', 'set-default', `${item.owner}/${item.name}`],
+  ],
 ]
 
 export const checkout = ({ argv }) => [