iframe-proxy

hyperrealist · 2024-06-29T17:20:55Z

Fixes #9270

Append .git to target when cloned with --bare option
Write test case

andyfeller

Thanks for reporting this issue and opening the PR to fix it, @hyperrealist!

Changes look good, just want to ensure we capture this in our testing before shipping it.

hyperrealist · 2024-07-08T13:10:03Z

williammartin · 2024-07-12T15:52:16Z

Just FYI I asked a question over on #9270 to double check this is the right direction.

andyfeller · 2024-07-15T18:49:37Z

Just FYI I asked a question over on #9270 to double check this is the right direction.

Good catch on the post clone handling. 🤔 Most of the time I've worked with bare repositories were when I didn't expect to make any changes.

cli/pkg/cmd/repo/clone/clone.go

Lines 181 to 223 in ca1f2a4

    
           gitClient := opts.GitClient 
        
           ctx := context.Background() 
        
           cloneDir, err := gitClient.Clone(ctx, canonicalCloneURL, opts.GitArgs) 
        
           if err != nil { 
        
           	return err 
        
           } 
        
           // If the repo is a fork, add the parent as an upstream remote and set the parent as the default repo. 
        
           if canonicalRepo.Parent != nil { 
        
           	protocol := cfg.GitProtocol(canonicalRepo.Parent.RepoHost()).Value 
        
           	upstreamURL := ghrepo.FormatRemoteURL(canonicalRepo.Parent, protocol) 
        
           	upstreamName := opts.UpstreamName 
        
           	if opts.UpstreamName == "@owner" { 
        
           		upstreamName = canonicalRepo.Parent.RepoOwner() 
        
           	} 
        
           	gc := gitClient.Copy() 
        
           	gc.RepoDir = cloneDir 
        
           	if _, err := gc.AddRemote(ctx, upstreamName, upstreamURL, []string{canonicalRepo.Parent.DefaultBranchRef.Name}); err != nil { 
        
           		return err 
        
           	} 
        
           	if err := gc.Fetch(ctx, upstreamName, ""); err != nil { 
        
           		return err 
        
           	} 
        
           	if err := gc.SetRemoteBranches(ctx, upstreamName, `*`); err != nil { 
        
           		return err 
        
           	} 
        
           	if err = gc.SetRemoteResolution(ctx, upstreamName, "base"); err != nil { 
        
           		return err 
        
           	} 
        
           	connectedToTerminal := opts.IO.IsStdoutTTY() 
        
           	if connectedToTerminal { 
        
           		cs := opts.IO.ColorScheme() 
        
           		fmt.Fprintf(opts.IO.ErrOut, "%s Repository %s set as the default repository. To learn more about the default repository, run: gh repo set-default --help\n", cs.WarningIcon(), cs.Bold(ghrepo.FullName(canonicalRepo.Parent))) 
        
           	} 
        
           } 
        
           return nil

williammartin · 2024-07-22T15:01:21Z

 		target = path.Base(strings.TrimSuffix(cloneURL, ".git"))
 	}
+	if slices.Contains(cloneArgs, "--bare") {
+		target += ".git"


I don't know if this is quite right. Just writing a comment here to ensure this isn't merged before I have a moment to investigate.

Yes, as I suspected this is broken in the case where you provide both --bare and a target directory i.e.:

➜ cli git:(support-bear) ./bin/gh repo clone hyperrealist/tiled tiled -- --bare Cloning into bare repository 'tiled'... remote: Enumerating objects: 16472, done. remote: Counting objects: 100% (376/376), done. remote: Compressing objects: 100% (113/113), done. remote: Total 16472 (delta 283), reused 336 (delta 263), pack-reused 16096 Receiving objects: 100% (16472/16472), 4.30 MiB | 11.09 MiB/s, done. Resolving deltas: 100% (12482/12482), done. failed to run git: fatal: cannot change to 'tiled.git': No such file or directory

We should only be appending .git to the target directory if the user didn't specify one.

@williammartin

Follow up to PR feedback from @williammartin, `git clone --bare` will only override the local repository target if unspecified. This commit enhances the cloning logic and associated test to ensure explicit targets are preserved when cloning.

williammartin · 2024-07-24T10:31:45Z

Acceptance Criteria

Given I have a forked repo
When I run gh repo clone <repo> -- --bare
Then it is cloned and set up correctly with upstream/origin

➜  cli git:(support-bear) ./bin/gh repo clone hyperrealist/tiled -- --bare
Cloning into bare repository 'tiled.git'...
remote: Enumerating objects: 16472, done.
remote: Counting objects: 100% (376/376), done.
remote: Compressing objects: 100% (109/109), done.
remote: Total 16472 (delta 283), reused 340 (delta 267), pack-reused 16096
Receiving objects: 100% (16472/16472), 4.30 MiB | 9.59 MiB/s, done.
Resolving deltas: 100% (12478/12478), done.
remote: Enumerating objects: 67, done.
remote: Counting objects: 100% (51/51), done.
remote: Compressing objects: 100% (31/31), done.
remote: Total 67 (delta 25), reused 41 (delta 20), pack-reused 16
Unpacking objects: 100% (67/67), 41.29 KiB | 254.00 KiB/s, done.
From https://github.com/bluesky/tiled
 * [new branch]        main       -> upstream/main
 * [new tag]           v0.1.0a104 -> v0.1.0a104
 * [new tag]           v0.1.0a105 -> v0.1.0a105
 * [new tag]           v0.1.0a106 -> v0.1.0a106
 * [new tag]           v0.1.0a107 -> v0.1.0a107
 * [new tag]           v0.1.0a108 -> v0.1.0a108
 * [new tag]           v0.1.0a109 -> v0.1.0a109
 * [new tag]           v0.1.0a110 -> v0.1.0a110
 * [new tag]           v0.1.0a111 -> v0.1.0a111
 * [new tag]           v0.1.0a113 -> v0.1.0a113
 * [new tag]           v0.1.0a114 -> v0.1.0a114
 * [new tag]           v0.1.0a115 -> v0.1.0a115
 * [new tag]           v0.1.0a116 -> v0.1.0a116
 * [new tag]           v0.1.0a117 -> v0.1.0a117
 * [new tag]           v0.1.0a118 -> v0.1.0a118
 * [new tag]           v0.1.0a119 -> v0.1.0a119
 * [new tag]           v0.1.0a120 -> v0.1.0a120
 * [new tag]           v0.1.0a121 -> v0.1.0a121
 * [new tag]           v0.1.0a122 -> v0.1.0a122
 * [new tag]           v0.1.0b1   -> v0.1.0b1
 * [new tag]           v0.1.0b2   -> v0.1.0b2
 * [new tag]           v0.1.0b3   -> v0.1.0b3
 * [new tag]           v0.1.0b4   -> v0.1.0b4
 * [new tag]           v0.1.0b6   -> v0.1.0b6
 * [new tag]           v0.1.0b5   -> v0.1.0b5
! Repository bluesky/tiled set as the default repository. To learn more about the default repository, run: gh repo set-default --help
➜  cli git:(support-bear) ✗ cd tiled.git && git remote -v
origin     https://github.com/hyperrealist/tiled.git (fetch)
origin  https://github.com/hyperrealist/tiled.git (push)
upstream        https://github.com/bluesky/tiled.git (fetch)
upstream        https://github.com/bluesky/tiled.git (push)

Given I have a forked repo
When I run gh repo clone <repo> myrepo -- --bare
Then it is cloned into dir myrepo and set up correctly with upstream/origin

➜  cli git:(support-bear) ./bin/gh repo clone hyperrealist/tiled myrepo -- --bare
Cloning into bare repository 'myrepo'...
remote: Enumerating objects: 16472, done.
remote: Counting objects: 100% (376/376), done.
remote: Compressing objects: 100% (113/113), done.
remote: Total 16472 (delta 283), reused 336 (delta 263), pack-reused 16096
Receiving objects: 100% (16472/16472), 4.30 MiB | 8.58 MiB/s, done.
Resolving deltas: 100% (12482/12482), done.
remote: Enumerating objects: 67, done.
remote: Counting objects: 100% (51/51), done.
remote: Compressing objects: 100% (31/31), done.
remote: Total 67 (delta 25), reused 41 (delta 20), pack-reused 16
Unpacking objects: 100% (67/67), 41.29 KiB | 291.00 KiB/s, done.
From https://github.com/bluesky/tiled
 * [new branch]        main       -> upstream/main
 * [new tag]           v0.1.0a104 -> v0.1.0a104
 * [new tag]           v0.1.0a105 -> v0.1.0a105
 * [new tag]           v0.1.0a106 -> v0.1.0a106
 * [new tag]           v0.1.0a107 -> v0.1.0a107
 * [new tag]           v0.1.0a108 -> v0.1.0a108
 * [new tag]           v0.1.0a109 -> v0.1.0a109
 * [new tag]           v0.1.0a110 -> v0.1.0a110
 * [new tag]           v0.1.0a111 -> v0.1.0a111
 * [new tag]           v0.1.0a113 -> v0.1.0a113
 * [new tag]           v0.1.0a114 -> v0.1.0a114
 * [new tag]           v0.1.0a115 -> v0.1.0a115
 * [new tag]           v0.1.0a116 -> v0.1.0a116
 * [new tag]           v0.1.0a117 -> v0.1.0a117
 * [new tag]           v0.1.0a118 -> v0.1.0a118
 * [new tag]           v0.1.0a119 -> v0.1.0a119
 * [new tag]           v0.1.0a120 -> v0.1.0a120
 * [new tag]           v0.1.0a121 -> v0.1.0a121
 * [new tag]           v0.1.0a122 -> v0.1.0a122
 * [new tag]           v0.1.0b1   -> v0.1.0b1
 * [new tag]           v0.1.0b2   -> v0.1.0b2
 * [new tag]           v0.1.0b3   -> v0.1.0b3
 * [new tag]           v0.1.0b4   -> v0.1.0b4
 * [new tag]           v0.1.0b6   -> v0.1.0b6
 * [new tag]           v0.1.0b5   -> v0.1.0b5
! Repository bluesky/tiled set as the default repository. To learn more about the default repository, run: gh repo set-default --help
➜  cli git:(support-bear) ✗ cd myrepo && git remote -v
origin      https://github.com/hyperrealist/tiled.git (fetch)
origin  https://github.com/hyperrealist/tiled.git (push)
upstream        https://github.com/bluesky/tiled.git (fetch)
upstream        https://github.com/bluesky/tiled.git (push)

LGTM

Andy made the changes he requested and I have reviewed them

[![Mend Renovate](https://app.renovatebot.com/images/banner.svg)](https://renovatebot.com) This PR contains the following updates: | Package | Update | Change | |---|---|---| | [cli/cli](https://togithub.com/cli/cli) | minor | `v2.53.0` -> `v2.54.0` | --- ### Release Notes <details> <summary>cli/cli (cli/cli)</summary> ### [`v2.54.0`](https://togithub.com/cli/cli/releases/tag/v2.54.0): GitHub CLI 2.54.0 [Compare Source](https://togithub.com/cli/cli/compare/v2.53.0...v2.54.0) #### What's Changed - Remove redundant whitespace by [@jessehouwing](https://togithub.com/jessehouwing) in [https://github.com/cli/cli/pull/9334](https://togithub.com/cli/cli/pull/9334) - Remove attestation test that requires being online by [@steiza](https://togithub.com/steiza) in [https://github.com/cli/cli/pull/9340](https://togithub.com/cli/cli/pull/9340) - Update documentation for gh api PATCH by [@cmbuckley](https://togithub.com/cmbuckley) in [https://github.com/cli/cli/pull/9352](https://togithub.com/cli/cli/pull/9352) - Clarify usage of template flags for PR and issue creation by [@williammartin](https://togithub.com/williammartin) in [https://github.com/cli/cli/pull/9354](https://togithub.com/cli/cli/pull/9354) - Expose json databaseId field for release commands by [@williammartin](https://togithub.com/williammartin) in [https://github.com/cli/cli/pull/9356](https://togithub.com/cli/cli/pull/9356) - Expose fullDatabaseId for PR json export by [@williammartin](https://togithub.com/williammartin) in [https://github.com/cli/cli/pull/9355](https://togithub.com/cli/cli/pull/9355) - Handle `--bare` clone targets by [@hyperrealist](https://togithub.com/hyperrealist) in [https://github.com/cli/cli/pull/9271](https://togithub.com/cli/cli/pull/9271) - Slightly clarify when CLI exits with code 4 by [@williammartin](https://togithub.com/williammartin) in [https://github.com/cli/cli/pull/9358](https://togithub.com/cli/cli/pull/9358) - Update sigstore-go in gh CLI to v0.5.1 by [@steiza](https://togithub.com/steiza) in [https://github.com/cli/cli/pull/9366](https://togithub.com/cli/cli/pull/9366) - Exit with 1 on authentication issues by [@Stausssi](https://togithub.com/Stausssi) in [https://github.com/cli/cli/pull/9240](https://togithub.com/cli/cli/pull/9240) - build(deps): bump github.com/gabriel-vasile/mimetype from 1.4.4 to 1.4.5 by [@dependabot](https://togithub.com/dependabot) in [https://github.com/cli/cli/pull/9372](https://togithub.com/cli/cli/pull/9372) - build(deps): bump github.com/google/go-containerregistry from 0.20.0 to 0.20.1 by [@dependabot](https://togithub.com/dependabot) in [https://github.com/cli/cli/pull/9373](https://togithub.com/cli/cli/pull/9373) - Add `--remove-milestone` option to `issue edit` and `pr edit` by [@babakks](https://togithub.com/babakks) in [https://github.com/cli/cli/pull/9344](https://togithub.com/cli/cli/pull/9344) - handle attest case insensitivity by [@ejahnGithub](https://togithub.com/ejahnGithub) in [https://github.com/cli/cli/pull/9392](https://togithub.com/cli/cli/pull/9392) #### New Contributors - [@cmbuckley](https://togithub.com/cmbuckley) made their first contribution in [https://github.com/cli/cli/pull/9352](https://togithub.com/cli/cli/pull/9352) - [@hyperrealist](https://togithub.com/hyperrealist) made their first contribution in [https://github.com/cli/cli/pull/9271](https://togithub.com/cli/cli/pull/9271) - [@Stausssi](https://togithub.com/Stausssi) made their first contribution in [https://github.com/cli/cli/pull/9240](https://togithub.com/cli/cli/pull/9240) - [@ejahnGithub](https://togithub.com/ejahnGithub) made their first contribution in [https://github.com/cli/cli/pull/9392](https://togithub.com/cli/cli/pull/9392) **Full Changelog**: cli/cli@v2.53.0...v2.54.0 </details> --- ### Configuration 📅 **Schedule**: Branch creation - At any time (no schedule defined), Automerge - At any time (no schedule defined). 🚦 **Automerge**: Disabled by config. Please merge this manually once you are satisfied. ♻ **Rebasing**: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox. 🔕 **Ignore**: Close this PR and you won't be reminded about this update again. --- - [ ] If you want to rebase/retry this PR, check this box --- This PR was generated by [Mend Renovate](https://www.mend.io/free-developer-tools/renovate/). View the [repository job log](https://developer.mend.io/github/izumin5210/dotfiles).  --------- Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Co-authored-by: izumin5210-update-aqua-checksum[bot] <169593670+izumin5210-update-aqua-checksum[bot]@users.noreply.github.com>

append to bare clone target

9bd8d44

hyperrealist requested a review from a team as a code owner June 29, 2024 17:20

hyperrealist requested a review from andyfeller June 29, 2024 17:20

cliAutomation added the external pull request originating outside of the CLI core team label Jun 29, 2024

andyfeller previously requested changes Jul 8, 2024

View reviewed changes

Comment thread git/client.go Outdated

Add bare clone test

7ca86b5

williammartin self-requested a review July 22, 2024 14:57

williammartin requested changes Jul 22, 2024

View reviewed changes

williammartin self-requested a review July 24, 2024 10:34

williammartin approved these changes Jul 24, 2024

View reviewed changes

williammartin merged commit fd51a69 into cli:trunk Jul 24, 2024

Sunbelt Computer Software

PL/B Language Development and Support

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Handle `--bare` clone targets#9271

Handle `--bare` clone targets#9271
williammartin merged 3 commits into
cli:trunkfrom
hyperrealist:support-bear

hyperrealist commented Jun 29, 2024 •

edited by williammartin

Loading

Uh oh!

andyfeller left a comment

Uh oh!

Uh oh!

hyperrealist commented Jul 8, 2024

Uh oh!

williammartin commented Jul 12, 2024

Uh oh!

andyfeller commented Jul 15, 2024

Uh oh!

williammartin Jul 22, 2024

Uh oh!

williammartin Jul 22, 2024

Uh oh!

williammartin commented Jul 24, 2024 •

edited

Loading

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

Sunbelt Computer Software

PL/B Language Development and Support

Uh oh!

Conversation

hyperrealist commented Jun 29, 2024 • edited by williammartin Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

andyfeller left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

hyperrealist commented Jul 8, 2024

Uh oh!

williammartin commented Jul 12, 2024

Uh oh!

andyfeller commented Jul 15, 2024

Uh oh!

williammartin Jul 22, 2024

Choose a reason for hiding this comment

Uh oh!

williammartin Jul 22, 2024

Choose a reason for hiding this comment

Uh oh!

williammartin commented Jul 24, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Acceptance Criteria

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

hyperrealist commented Jun 29, 2024 •

edited by williammartin

Loading

williammartin commented Jul 24, 2024 •

edited

Loading