Add `git update-microsoft-git` #329

derrickstolee · 2021-04-29T15:22:55Z

This adds a new builtin, git update-microsoft-git, that executes the platform-specific upgrade steps to get the latest version of microsoft-git.

On Windows, this means running git update-git-for-windows which was updated to use the microsoft/git releases page, when appropriate. See #321 for details.

On macOS, this means running a sequence of brew commands. These are adapted from the UpgradeVerb in microsoft/scalar, with an important simplification: we don't need to differentiate between the scalar and scalar-azrepos cask.

Just do the boilerplate stuff of making a new builtin, including documentation and integration with git.c. Signed-off-by: Derrick Stolee <[email protected]>

On Windows, we have the 'git update-git-for-windows' command. It is poorly named within the microsoft/git fork, because the script has been updated to look at the GitHub releases of microsoft/git, not git-for-windows/git. Still, it handles all the complicated details about downloading, verifying, and running the installer. Signed-off-by: Derrick Stolee <[email protected]>

jeffhostetler · 2021-04-30T13:04:39Z

Documentation/git-update-microsoft-git.txt

+DESCRIPTION
+-----------
+This version of Git is based on the Microsoft fork of Git, which
+has custom capabilities focused on supporting monorepos. This


Should we add a short statement about GVFS here? Our enhancements in this fork fall into 2 groups: monorepo stuff we want to eventually upstream, and the GVFS-related stuff which will never make it upstream.

Basically, I'm thinking about a short ack/reminder here about why we have this fork at all.

We should update the README with these details. A user won't see this documentation unless they are looking at the version that is installed with the microsoft/git fork.

jeffhostetler · 2021-04-30T13:08:01Z

builtin/update-microsoft-git.c

+/*
+ * On Windows, run 'git update-git-for-windows' which
+ * is installed by the installer, based on the script
+ * in git-for-windows/build-extra.


Does the microsoft/git version of build-extra point upgrade-git-for-windows to a different URL than a normal GFW installation ??

Maybe link to that.

Here is the script but the real change is inside our Azure Pipeline build (yikes). See #321 for details.

WOW! That's dense. I'm not sure I'm adding value here. Maybe add enough bread crumbs to the comment here so that we can rediscover how this works in the future....

derrickstolee · 2021-04-30T13:10:48Z

As I was testing this, I saw the following inconsistency:

@dscho: I think this "Git for Windows" string could be updated, but in the git-for-windows/build-extra repo. Is that something you could do?

The steps to update the microsoft-git cask are: 1. brew update 2. brew upgrade --cask microsoft-git This is adapted from the UpgradeVerb within microsoft/scalar. There is one important simplification: Scalar needed to check 'brew list --cask' to find out if the 'scalar' cask or the 'scalar-azrepos' cask was installed (which determined if the 'microsoft-git' cask was a necessary dependency). We do not need that here, since we are already in the microsoft-git cask. Signed-off-by: Derrick Stolee <[email protected]>

derrickstolee · 2021-04-30T13:24:22Z

I just finished my manual testing on macOS, which led to some changes. Specifically, I thought it prudent to introduce some output that says which commands are being run so a user could learn those instructions and use them directly, if they wished. Also, brew update can be slow, so having some indicator of the work that is happening can help.

derrickstolee · 2021-04-30T17:11:10Z

I plan to merge this with admin privileges because the vs-build workflow is failing for an unrelated reason.

dscho · 2021-05-05T12:18:58Z

I think this "Git for Windows" string could be updated, but in the git-for-windows/build-extra repo. Is that something you could do?

Sure, it comes from here. I could modify that in the same Task Group where I redirect git update-git-for-windows to point to microsoft/git.

What do you want it to say, though?

derrickstolee · 2021-05-05T12:34:41Z

I think this "Git for Windows" string could be updated, but in the git-for-windows/build-extra repo. Is that something you could do?
...
What do you want it to say, though?

Git <version1> (64bit)
Update <version2> available
Download and install <version2> [N/y]?

Just drop the "for Windows" since the version string makes it clear that we are in a .vfs. version.

This adds a new builtin, `git update-microsoft-git`, that executes the platform-specific upgrade steps to get the latest version of `microsoft-git`. On Windows, this means running `git update-git-for-windows` which was updated to use the `microsoft/git` releases page, when appropriate. See #321 for details. On macOS, this means running a sequence of `brew` commands. These are adapted from the `UpgradeVerb` in `microsoft/scalar`, with an important simplification: we don't need to differentiate between the `scalar` and `scalar-azrepos` cask.

dscho · 2021-05-19T12:43:58Z

Just drop the "for Windows" since the version string makes it clear that we are in a .vfs. version.

Makes sense. I made it so, as part of git-for-windows/build-extra#338.

Now I only have to replace that ugly, ugly hack by an elegant .config ;-)

This adds a new builtin, `git update-microsoft-git`, that executes the platform-specific upgrade steps to get the latest version of `microsoft-git`. On Windows, this means running `git update-git-for-windows` which was updated to use the `microsoft/git` releases page, when appropriate. See #321 for details. On macOS, this means running a sequence of `brew` commands. These are adapted from the `UpgradeVerb` in `microsoft/scalar`, with an important simplification: we don't need to differentiate between the `scalar` and `scalar-azrepos` cask.

derrickstolee self-assigned this Apr 29, 2021

derrickstolee requested review from dscho, jeffhostetler and ldennington April 29, 2021 15:23

derrickstolee force-pushed the update-microsoft-git branch from 22b01f2 to 13083cf Compare April 29, 2021 15:53

ldennington approved these changes Apr 29, 2021

View reviewed changes

update-microsoft-git: create barebones builtin

c554839

Just do the boilerplate stuff of making a new builtin, including documentation and integration with git.c. Signed-off-by: Derrick Stolee <[email protected]>

derrickstolee force-pushed the update-microsoft-git branch 2 times, most recently from 7de6ad2 to 682a4a3 Compare April 29, 2021 17:45

derrickstolee force-pushed the update-microsoft-git branch 2 times, most recently from 1bb7cfe to 682a4a3 Compare April 29, 2021 19:44

jeffhostetler reviewed Apr 30, 2021

View reviewed changes

jeffhostetler approved these changes Apr 30, 2021

View reviewed changes

derrickstolee force-pushed the update-microsoft-git branch from 682a4a3 to c171a9e Compare April 30, 2021 13:13

derrickstolee force-pushed the update-microsoft-git branch from c171a9e to 75e166d Compare April 30, 2021 13:23

derrickstolee merged commit 37373c9 into microsoft:vfs-2.31.1 Apr 30, 2021

derrickstolee deleted the update-microsoft-git branch April 30, 2021 17:41

dscho mentioned this pull request Feb 10, 2025

Rebase to v2.48.1 #725

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Add `git update-microsoft-git` #329

Add `git update-microsoft-git` #329

derrickstolee commented Apr 29, 2021 •

edited by jeffhostetler

Loading

jeffhostetler Apr 30, 2021

derrickstolee Apr 30, 2021

jeffhostetler Apr 30, 2021

derrickstolee Apr 30, 2021

jeffhostetler Apr 30, 2021

derrickstolee commented Apr 30, 2021

derrickstolee commented Apr 30, 2021

derrickstolee commented Apr 30, 2021

dscho commented May 5, 2021

derrickstolee commented May 5, 2021

dscho commented May 19, 2021

Add git update-microsoft-git #329

Add git update-microsoft-git #329

Conversation

derrickstolee commented Apr 29, 2021 • edited by jeffhostetler Loading

jeffhostetler Apr 30, 2021

Choose a reason for hiding this comment

derrickstolee Apr 30, 2021

Choose a reason for hiding this comment

jeffhostetler Apr 30, 2021

Choose a reason for hiding this comment

derrickstolee Apr 30, 2021

Choose a reason for hiding this comment

jeffhostetler Apr 30, 2021

Choose a reason for hiding this comment

derrickstolee commented Apr 30, 2021

derrickstolee commented Apr 30, 2021

derrickstolee commented Apr 30, 2021

dscho commented May 5, 2021

derrickstolee commented May 5, 2021

dscho commented May 19, 2021

Add `git update-microsoft-git` #329

Add `git update-microsoft-git` #329

derrickstolee commented Apr 29, 2021 •

edited by jeffhostetler

Loading