Merge pull request #329: Add git update-microsoft-git

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.

Author: derrickstolee

.gitignore

@@ -174,6 +174,7 @@
 /git-unpack-file
 /git-unpack-objects
 /git-update-index
+/git-update-microsoft-git
 /git-update-ref
 /git-update-server-info
 /git-upload-archive

Documentation/git-update-microsoft-git.adoc

@@ -0,0 +1,24 @@
+git-update-microsoft-git(1)
+===========================
+
+NAME
+----
+git-update-microsoft-git - Update the installed version of Git
+
+
+SYNOPSIS
+--------
+[verse]
+'git update-microsoft-git'
+
+DESCRIPTION
+-----------
+This version of Git is based on the Microsoft fork of Git, which
+has custom capabilities focused on supporting monorepos. This
+command checks for the latest release of that fork and installs
+it on your machine.
+
+
+GIT
+---
+Part of the linkgit:git[1] suite

Documentation/lint-manpages.sh

@@ -28,6 +28,7 @@ check_missing_docs () (
 		git-remote-*) continue;;
 		git-stage) continue;;
 		git-gvfs-helper) continue;;
+		git-update-microsoft-git) continue;;
 		git-legacy-*) continue;;
 		git-?*--?* ) continue ;;
 		esac

Documentation/meson.build

@@ -149,6 +149,7 @@ manpages = {
   'git-unpack-file.adoc' : 1,
   'git-unpack-objects.adoc' : 1,
   'git-update-index.adoc' : 1,
+  'git-update-microsoft-git.adoc' : 1,
   'git-update-ref.adoc' : 1,
   'git-update-server-info.adoc' : 1,
   'git-upload-archive.adoc' : 1,

Makefile

@@ -1336,6 +1336,7 @@ BUILTIN_OBJS += builtin/tag.o
 BUILTIN_OBJS += builtin/unpack-file.o
 BUILTIN_OBJS += builtin/unpack-objects.o
 BUILTIN_OBJS += builtin/update-index.o
+BUILTIN_OBJS += builtin/update-microsoft-git.o
 BUILTIN_OBJS += builtin/update-ref.o
 BUILTIN_OBJS += builtin/update-server-info.o
 BUILTIN_OBJS += builtin/upload-archive.o

builtin.h

@@ -239,6 +239,7 @@ int cmd_tag(int argc, const char **argv, const char *prefix, struct repository *
 int cmd_unpack_file(int argc, const char **argv, const char *prefix, struct repository *repo);
 int cmd_unpack_objects(int argc, const char **argv, const char *prefix, struct repository *repo);
 int cmd_update_index(int argc, const char **argv, const char *prefix, struct repository *repo);
+int cmd_update_microsoft_git(int argc, const char **argv, const char *prefix, struct repository *repo);
 int cmd_update_ref(int argc, const char **argv, const char *prefix, struct repository *repo);
 int cmd_update_server_info(int argc, const char **argv, const char *prefix, struct repository *repo);
 int cmd_upload_archive(int argc, const char **argv, const char *prefix, struct repository *repo);

builtin/update-microsoft-git.c

@@ -0,0 +1,76 @@
+#include "builtin.h"
+#include "repository.h"
+#include "parse-options.h"
+#include "run-command.h"
+#include "strvec.h"
+
+#if defined(GIT_WINDOWS_NATIVE)
+/*
+ * On Windows, run 'git update-git-for-windows' which
+ * is installed by the installer, based on the script
+ * in git-for-windows/build-extra.
+ */
+static int platform_specific_upgrade(void)
+{
+	struct child_process cp = CHILD_PROCESS_INIT;
+
+	strvec_push(&cp.args, "git-update-git-for-windows");
+	return run_command(&cp);
+}
+#elif defined(__APPLE__)
+/*
+ * On macOS, we expect the user to have the microsoft-git
+ * cask installed via Homebrew. We check using these
+ * commands:
+ *
+ * 1. 'brew update' to get latest versions.
+ * 2. 'brew upgrade --cask microsoft-git' to get the
+ *    latest version.
+ */
+static int platform_specific_upgrade(void)
+{
+	int res;
+	struct child_process update = CHILD_PROCESS_INIT;
+	struct child_process upgrade = CHILD_PROCESS_INIT;
+
+	printf("Updating Homebrew with 'brew update'\n");
+
+	strvec_pushl(&update.args, "brew", "update", NULL);
+	res = run_command(&update);
+
+	if (res) {
+		error(_("'brew update' failed; is brew installed?"));
+		return 1;
+	}
+
+	printf("Upgrading microsoft-git with 'brew upgrade --cask microsoft-git'\n");
+	strvec_pushl(&upgrade.args, "brew", "upgrade", "--cask", "microsoft-git", NULL);
+	res = run_command(&upgrade);
+
+	return res;
+}
+#else
+static int platform_specific_upgrade(void)
+{
+	error(_("update-microsoft-git is not supported on this platform"));
+	return 1;
+}
+#endif
+
+static const char * const update_microsoft_git_usage[] = {
+	N_("git update-microsoft-git"),
+	NULL,
+};
+
+
+int cmd_update_microsoft_git(int argc, const char **argv, const char *prefix UNUSED, struct repository *repo UNUSED)
+{
+	static struct option microsoft_git_options[] = {
+		OPT_END(),
+	};
+	show_usage_with_options_if_asked(argc, argv,
+					 update_microsoft_git_usage,
+					 microsoft_git_options);
+
+	return platform_specific_upgrade();
+}

git.c

@@ -710,6 +710,7 @@ static struct cmd_struct commands[] = {
 	{ "unpack-file", cmd_unpack_file, RUN_SETUP | NO_PARSEOPT },
 	{ "unpack-objects", cmd_unpack_objects, RUN_SETUP | NO_PARSEOPT },
 	{ "update-index", cmd_update_index, RUN_SETUP },
+	{ "update-microsoft-git", cmd_update_microsoft_git },
 	{ "update-ref", cmd_update_ref, RUN_SETUP },
 	{ "update-server-info", cmd_update_server_info, RUN_SETUP },
 	{ "upload-archive", cmd_upload_archive, NO_PARSEOPT },

meson.build

@@ -626,6 +626,7 @@ builtin_sources = [
   'builtin/unpack-file.c',
   'builtin/unpack-objects.c',
   'builtin/update-index.c',
+  'builtin/update-microsoft-git.c',
   'builtin/update-ref.c',
   'builtin/update-server-info.c',
   'builtin/upload-archive.c',