Notification when checking out a repo

[Tyriar]

I checked out microsoft/vscode#166657 which seemingly worked fine, but this appeared:

Log:

[Info] Found GitHub remote
[Info] Review> current branch main is associated with pull request #158078
[Info] Review> Resolving pull request
[Info] Review> This PR is closed
[Info] RateLimit> Unexpectedly low rate limit: 30
[Info] RateLimit> Rate limit remaining: 29
[Info] Review> switch to Pull Request #166657 - start
[Info] PullRequestGitHelper> Branch origin/rzhao271/sei-hover-exit-fix doesn't exist on local disk yet.
[Info] PullRequestGitHelper> Fetch tracked branch refs/remotes/origin/rzhao271/sei-hover-exit-fix
[Info] Unshallowing failed: Failed to execute git {
  "exitCode": 1,
  "gitCommand": "pull",
  "stdout": "",
  "stderr": "From https://github.com/microsoft/vscode\n   cb32fc89420..476bae3f320  alex/esm                -> origin/alex/esm\n * [new branch]              alexd/rainy-cattle      -> origin/alexd/rainy-cattle\n * [new branch]              alexd/tasteless-canid   -> origin/alexd/tasteless-canid\n   03ad4675015..ac5a1749ce1  andreamah/issue148068_1 -> origin/andreamah/issue148068_1\n * [new branch]              dev/bhavyau/getting-started -> origin/dev/bhavyau/getting-started\n * [new branch]              dev/joyceerhl/competitive-swallow -> origin/dev/joyceerhl/competitive-swallow\n * [new branch]              dev/joyceerhl/dutch-pony -> origin/dev/joyceerhl/dutch-pony\n * [new branch]              digitarald/issue130417  -> origin/digitarald/issue130417\n + c2ee6551aae...073e3f8cb69 electron-22.x.y         -> origin/electron-22.x.y  (forced update)\n * [new branch]              lramos15/parental-blackbird -> origin/lramos15/parental-blackbird\n * [new branch]              lszomoru/scm-notification-safe-repository -> origin/lszomoru/scm-notification-safe-repository\n   84706695e0b..067d6cccadf  main                    -> origin/main\n   3fb71ecd395..0c48cab712c  merogge/quick-fix-api   -> origin/merogge/quick-fix-api\n * [new branch]              rebornix/creative-dragonfly -> origin/rebornix/creative-dragonfly\n * [new branch]              rzhao271/contentaction-keydown -> origin/rzhao271/contentaction-keydown\n ! [rejected]                1.72.2                  -> 1.72.2  (would clobber existing tag)\n"
}.
[Info] Falling back to git pull.
[Info] Pull after failed unshallow still failed: Failed to execute git {
  "exitCode": 1,
  "gitCommand": "pull",
  "stdout": "",
  "stderr": "From https://github.com/microsoft/vscode\n   cb32fc89420..476bae3f320  alex/esm                -> origin/alex/esm\n * [new branch]              alexd/rainy-cattle      -> origin/alexd/rainy-cattle\n * [new branch]              alexd/tasteless-canid   -> origin/alexd/tasteless-canid\n   03ad4675015..ac5a1749ce1  andreamah/issue148068_1 -> origin/andreamah/issue148068_1\n * [new branch]              dev/bhavyau/getting-started -> origin/dev/bhavyau/getting-started\n * [new branch]              dev/joyceerhl/competitive-swallow -> origin/dev/joyceerhl/competitive-swallow\n * [new branch]              dev/joyceerhl/dutch-pony -> origin/dev/joyceerhl/dutch-pony\n * [new branch]              digitarald/issue130417  -> origin/digitarald/issue130417\n + c2ee6551aae...073e3f8cb69 electron-22.x.y         -> origin/electron-22.x.y  (forced update)\n * [new branch]              lramos15/parental-blackbird -> origin/lramos15/parental-blackbird\n * [new branch]              lszomoru/scm-notification-safe-repository -> origin/lszomoru/scm-notification-safe-repository\n   84706695e0b..067d6cccadf  main                    -> origin/main\n   3fb71ecd395..0c48cab712c  merogge/quick-fix-api   -> origin/merogge/quick-fix-api\n * [new branch]              rebornix/creative-dragonfly -> origin/rebornix/creative-dragonfly\n * [new branch]              rzhao271/contentaction-keydown -> origin/rzhao271/contentaction-keydown\n ! [rejected]                1.72.2                  -> 1.72.2  (would clobber existing tag)\n"
}
[Info] Review> checkout failed #{"message":"Failed to execute git","stdout":"","stderr":"From https://github.com/microsoft/vscode\n   cb32fc89420..476bae3f320  alex/esm                -> origin/alex/esm\n * [new branch]              alexd/rainy-cattle      -> origin/alexd/rainy-cattle\n * [new branch]              alexd/tasteless-canid   -> origin/alexd/tasteless-canid\n   03ad4675015..ac5a1749ce1  andreamah/issue148068_1 -> origin/andreamah/issue148068_1\n * [new branch]              dev/bhavyau/getting-started -> origin/dev/bhavyau/getting-started\n * [new branch]              dev/joyceerhl/competitive-swallow -> origin/dev/joyceerhl/competitive-swallow\n * [new branch]              dev/joyceerhl/dutch-pony -> origin/dev/joyceerhl/dutch-pony\n * [new branch]              digitarald/issue130417  -> origin/digitarald/issue130417\n + c2ee6551aae...073e3f8cb69 electron-22.x.y         -> origin/electron-22.x.y  (forced update)\n * [new branch]              lramos15/parental-blackbird -> origin/lramos15/parental-blackbird\n * [new branch]              lszomoru/scm-notification-safe-repository -> origin/lszomoru/scm-notification-safe-repository\n   84706695e0b..067d6cccadf  main                    -> origin/main\n   3fb71ecd395..0c48cab712c  merogge/quick-fix-api   -> origin/merogge/quick-fix-api\n * [new branch]              rebornix/creative-dragonfly -> origin/rebornix/creative-dragonfly\n * [new branch]              rzhao271/contentaction-keydown -> origin/rzhao271/contentaction-keydown\n ! [rejected]                1.72.2                  -> 1.72.2  (would clobber existing tag)\n","exitCode":1,"gitCommand":"pull","gitArgs":["pull","--tags","--unshallow"]}
[Info] Review> Queuing additional validate state
[Info] Review> Queuing additional validate state
[Info] Review> Validating state...
[Info] Found GitHub remote
[Info] Review> no matching pull request metadata found for current branch rzhao271/sei-hover-exit-fix
[Info] PullRequestGitHelper> associate rzhao271/sei-hover-exit-fix with Pull Request #166657
[Info] Review> current branch rzhao271/sei-hover-exit-fix is associated with pull request #166657
[Info] Review> Resolving pull request
[Info] Review> Fetching pull request data
[Info] PullRequestTree> Adding PR #166657 to tree
[Info] Review> register comments provider
[Info] Review> display pull request status bar indicator and refresh pull request tree view.
[Info] Review> using focus mode = true.
[Info] Review> state validation silent = false.
[Info] Review> PR show should show = false.
[Info] Review> Validating state...
[Info] PullRequestTree> Creating file and commit nodes for PR #166657
[Info] Found GitHub remote
[Info] Trying to use globalState for mentionable users.
[Info] PullRequestTree> Getting children for Files node
[Info] Using globalState mentionable users for 1.
[Info] PullRequestTree> Review threads have changed, refreshing Files node
[Info] PullRequestTree> Review threads have changed, refreshing Commits node
[Info] Review> current branch rzhao271/sei-hover-exit-fix is associated with pull request #166657
[Info] Review> Resolving pull request
[Info] PullRequestTree> Local files have changed, refreshing Files node
[Info] GitContentFileSystemProvider> Getting change model (file:///c%3A/Github/microsoft/vscode) content for commit 7165673cfe64a9241a76b3756557d2052780f161 and path c:/Github/microsoft/vscode/src/vs/workbench/services/hover/browser/hoverService.ts
[Info] PullRequestTree> Getting children for Files node
[Info] PullRequestTree> Got all children for Files node
[Info] PullRequestTree> Comments have changed, refreshing Files node
[Info] PullRequestTree> Comments have changed, refreshing Commits node
[Info] PullRequestTree> Review threads have changed, refreshing Files node
[Info] PullRequestTree> Review threads have changed, refreshing Commits node
[Info] PullRequestTree> Getting children for Files node
[Info] PullRequestTree> Got all children for Files node
[Info] PullRequestTree> Getting children for Files node
[Info] PullRequestTree> Got all children for Files node

[alexr00]

I think that branch just has conflicting tags:

1.72.2                  -> 1.72.2  (would clobber existing tag)\n

I tried running the same command from the command palette, "Git: Pull", and got the same error. This will always require manual user intervention to solve, so since there's nothing we can do about it providing the whole error seems like the only way to handle it.

It looks like "Git: Pull" always includes --tags, which is what causes this. For PRs, I don't think we really need the tags, so ideally, we'd try again without --tags when this occurs. @lszomoru would you be amenable to a PR that adds a tags options to the repository pull git API?

[Tyriar]

It seemed harmless so could we detect and suppress the notification?

[alexr00]

Yes, that's possible. But the error doesn't really indicate that it's harmless, so that makes me a little nervous. I'll do some more research.

[lszomoru]

This is a known error condition that is not detected and handled by the git extensions. It's known and I was supposed to get to it this milestone but I ran out of time. The ideal flow is to detect it, present the user with the list of conflicting tags, and then allow the user to "force fetch" the tags so that the local tags are overwritten by the remote ones. I will hopefully get to this in December.

[alexr00]

Good to know! In the meantime, we'll ignore this error.