From d86f33925d4946ac524f08df527515e368091054 Mon Sep 17 00:00:00 2001 From: Lessley Dennington Date: Mon, 15 Nov 2021 14:29:56 -0800 Subject: [PATCH 1/2] fixup! update-microsoft-git: interface with apt-get on Linux This reverts commit 82db14964c572103744349a7fd6c787f7de91810. --- builtin/update-microsoft-git.c | 22 ++-------------------- 1 file changed, 2 insertions(+), 20 deletions(-) diff --git a/builtin/update-microsoft-git.c b/builtin/update-microsoft-git.c index 66e4d8c25fab41..f943b808615fd7 100644 --- a/builtin/update-microsoft-git.c +++ b/builtin/update-microsoft-git.c @@ -56,26 +56,8 @@ static int platform_specific_upgrade(void) #else static int platform_specific_upgrade(void) { - int res; - struct strvec args = STRVEC_INIT; - - printf("Updating apt-get with 'sudo apt-get update'\n\n"); - - strvec_pushl(&args, "sudo", "apt-get", "update", NULL); - res = run_command_v_opt(args.v, 0); - strvec_clear(&args); - - if (res) { - error(_("'sudo apt-get update' failed; is apt-get installed?")); - return 1; - } - - printf("\nUpgrading microsoft-git with 'sudo apt-get upgrade microsoft-git'\n\n"); - strvec_pushl(&args, "sudo", "apt-get", "upgrade", "microsoft-git", NULL); - res = run_command_v_opt(args.v, 0); - strvec_clear(&args); - - return res; + error(_("update-microsoft-git is not supported on this platform")); + return 1; } #endif From 471453e16d055829fbf073da13997a666a30fd80 Mon Sep 17 00:00:00 2001 From: Lessley Dennington Date: Mon, 15 Nov 2021 14:37:28 -0800 Subject: [PATCH 2/2] fixup! Update Ubuntu/Debian install instructions This reverts commit fd0d1f36eb62f0b20781b716f15992d01b199e4b. --- README.md | 32 +++++--------------------------- 1 file changed, 5 insertions(+), 27 deletions(-) diff --git a/README.md b/README.md index a3f6e8f4823d3c..aa15fc1c026632 100644 --- a/README.md +++ b/README.md @@ -101,43 +101,21 @@ git version scalar version ``` -To upgrade `microsoft/git`, you can run the necessary `brew` commands: +To upgrade microsoft/git, you can run the necessary `brew` commands: ```shell brew update brew upgrade --cask microsoft-git ``` -Or you can run the `git update-microsoft-git` command, which will run those -`brew` commands for you. +Or you can run the `git update-microsoft-git` command, which will run those brew commands for you. ## Linux - -`apt-get` support is available for Ubuntu Hirsute -Hippo (21.04). Take the following steps to set up and install: - -```shell -curl -sSL https://packages.microsoft.com/config/ubuntu/21.04/prod.list | sudo tee /etc/apt/sources.list.d/microsoft-prod.list -curl -sSL https://packages.microsoft.com/keys/microsoft.asc | sudo tee /etc/apt/trusted.gpg.d/microsoft.asc -sudo apt-get update -sudo apt-get install microsoft-git -``` - -To upgrade `microsoft/git`, you can run the necessary `apt-get` commands: - -```shell -sudo apt-get update -sudo apt-get upgrade microsoft-git -``` - -Or you can run the `git update-microsoft-git` command, which will run those -`apt-get` commands for you. - -### Other Ubuntu/Debian distributions +### Ubuntu/Debian distributions On newer distributions*, you may use the most recent -[`.deb` package](https://github.com/microsoft/git/releases). For example, -you can download a specific version as follows: +[Debian package](https://github.com/microsoft/git/releases). For +example, you can download a specific version as follows: ```shell wget -O microsoft-git.deb https://github.com/microsoft/git/releases/download/v2.33.0.vfs.0.0/microsoft-git_2.33.0.vfs.0.0.deb