Skip to content

Commit

Permalink
vfs: disable git update-git-for-windows
Browse files Browse the repository at this point in the history
If a user runs git update-git-for-windows, then they will upgrade to a
version that does not support microsoft/vfsforgit or microsoft/scalar.

Therefore, let's prevent this.

This addresses #241
  • Loading branch information
dscho authored and derrickstolee committed Oct 9, 2020
1 parent 0653afc commit 5b82070
Show file tree
Hide file tree
Showing 4 changed files with 26 additions and 0 deletions.
1 change: 1 addition & 0 deletions builtin.h
Original file line number Diff line number Diff line change
Expand Up @@ -226,6 +226,7 @@ int cmd_tag(int argc, const char **argv, const char *prefix);
int cmd_tar_tree(int argc, const char **argv, const char *prefix);
int cmd_unpack_file(int argc, const char **argv, const char *prefix);
int cmd_unpack_objects(int argc, const char **argv, const char *prefix);
int cmd_update(int argc, const char **argv, const char *prefix);
int cmd_update_index(int argc, const char **argv, const char *prefix);
int cmd_update_ref(int argc, const char **argv, const char *prefix);
int cmd_update_server_info(int argc, const char **argv, const char *prefix);
Expand Down
2 changes: 2 additions & 0 deletions git.c
Original file line number Diff line number Diff line change
Expand Up @@ -664,6 +664,8 @@ static struct cmd_struct commands[] = {
{ "tag", cmd_tag, RUN_SETUP | DELAY_PAGER_CONFIG },
{ "unpack-file", cmd_unpack_file, RUN_SETUP | NO_PARSEOPT },
{ "unpack-objects", cmd_unpack_objects, RUN_SETUP | NO_PARSEOPT },
{ "update", cmd_update },
{ "update-git-for-windows", cmd_update },
{ "update-index", cmd_update_index, RUN_SETUP },
{ "update-ref", cmd_update_ref, RUN_SETUP },
{ "update-server-info", cmd_update_server_info, RUN_SETUP },
Expand Down
16 changes: 16 additions & 0 deletions help.c
Original file line number Diff line number Diff line change
Expand Up @@ -722,3 +722,19 @@ NORETURN void help_unknown_ref(const char *ref, const char *cmd,
string_list_clear(&suggested_refs, 0);
exit(1);
}

int cmd_update(int argc, const char **argv, const char *prefix)
{
const char * const usage[] = {
N_("git update-git-for-windows [<options>]\n"
"\t(not supported in this build of Git for Windows)"),
NULL
};
struct option options[] = {
OPT_END()
};

argc = parse_options(argc, argv, prefix, options, usage, 0);

die(_("git %s is not supported in VFSforGit"), argv[0]);
}
7 changes: 7 additions & 0 deletions t/t0402-block-command-on-gvfs.sh
Original file line number Diff line number Diff line change
Expand Up @@ -36,4 +36,11 @@ test_expect_success 'test gc --auto succeeds when disabled via config' '
git gc --auto
'

test_expect_success 'update-git-for-windows disabled' '
test_must_fail git update 2>out &&
test_i18ngrep VFS out &&
test_must_fail git update-git-for-windows 2>out &&
test_i18ngrep VFS out
'

test_done

0 comments on commit 5b82070

Please sign in to comment.