{"thread":{"id":"50360","subject":"[PATCH 00/19] Add new command \"switch\"","startedAt":"2019-01-30T09:48:39Z","lastAt":"2019-07-04T23:57:31Z","messageCount":289,"participants":["Nguyễn Thái Ngọc Duy","Eric Sunshine","Duy Nguyen","SZEDER Gábor","Junio C Hamano","Ramsay Jones","Martin Ågren","Andrei Rybak","Jacob Keller","Phillip Wood","Elijah Newren","Eckhard Maaß"],"isPatch":true,"patchVersion":1,"patchTotal":19},"messages":[{"id":"368084","messageId":"20190130094831.10420-1-pclouds@gmail.com","threadId":"50360","inReplyTo":null,"subject":"[PATCH 00/19] Add new command \"switch\"","fromName":"Nguyễn Thái Ngọc Duy","fromEmail":"pclouds@gmail.com","sentAt":"2019-01-30T09:48:12Z","receivedAt":"2019-01-30T09:48:39Z","isPatch":true,"sender":{"key":"pclouds@gmail.com","avatar":"https://avatars.githubusercontent.com/u/720?v=4"},"body":"This is the first half of the previous \"switch-branch and\nrestore-files\" RFC series [1]. I only focus on switch-branch for now\nbecause it's already getting long and I still have some work to do on\nrestore-files.\n\nThe command is, as the name implies, for switching branches. And it's\nsupposed to be a (hopefully better) alternative for \"git checkout\". Head\nto 08/19 for the man page, which describes the command (with\nexamples!) better than I do here.\n\nI think I've addressed most of the issues from the last round. The\nonly one left is adding options similar to \"git reset\" (but with\nbetter names this time than --soft and --hard, hopefully). I think\nthat could be done in a follow-up series.\n\nFor a complete picture, you would need to consider \"git restore\" too\n(the new name of \"git restore-files\"). Full series is available [2]\nthough I still need to work on the \"restore from a tree\" part of\nthat command and thinking whether \"restore -p\" vs \"reset -p\" could be\nconfusing...\n\nThis series is built on top of master + tg/checkout-no-overlay.\n\nPS. One of the things I like about this, after using it for some time,\nis the \"no ambiguation\" UI design gives better completion support\n(much less useless completion candidates), which makes life much\nbetter.\n\n[1] https://public-inbox.org/git/20181129215850.7278-1-pclouds@gmail.com/\n[2] https://gitlab.com/pclouds/git/commits/switch-and-restore\n\nNguyễn Thái Ngọc Duy (19):\n git-checkout.txt: fix one syntax line\n doc: document --overwrite-ignore\n t: rename t2014-switch.sh to t2014-checkout-switch.sh\n checkout: factor out some code in parse_branchname_arg()\n checkout: make \"opts\" in cmd_checkout() a pointer\n checkout: move 'confict_style' and 'dwim_..' to checkout_opts\n checkout: split options[] array in three pieces\n checkout: split part of it to new command switch\n switch: better names for -b and -B\n switch: remove -l\n switch: stop accepting pathspec\n switch: reject \"do nothing\" case\n switch: only allow explicit detached HEAD\n switch: add short option for --detach\n switch: no implicit dwim, use --guess to dwim\n switch: no worktree status unless real branch switch happens\n t: add tests for switch\n completion: support switch\n doc: promote \"git switch\"\n\n .gitignore | 1 +\n Documentation/config/advice.txt | 13 +-\n Documentation/config/branch.txt | 4 +-\n Documentation/config/checkout.txt | 17 +-\n Documentation/config/diff.txt | 3 +-\n Documentation/git-branch.txt | 8 +-\n Documentation/git-check-ref-format.txt | 3 +-\n Documentation/git-checkout.txt | 48 +-\n Documentation/git-format-patch.txt | 2 +-\n Documentation/git-merge-base.txt | 2 +-\n Documentation/git-merge.txt | 4 +\n Documentation/git-rebase.txt | 2 +-\n Documentation/git-remote.txt | 2 +-\n Documentation/git-rerere.txt | 10 +-\n Documentation/git-reset.txt | 20 +-\n Documentation/git-stash.txt | 9 +-\n Documentation/git-switch.txt | 236 +++++++++\n Documentation/gitattributes.txt | 3 +-\n Documentation/gitcore-tutorial.txt | 18 +-\n Documentation/giteveryday.txt | 24 +-\n Documentation/githooks.txt | 8 +-\n Documentation/gittutorial.txt | 4 +-\n Documentation/revisions.txt | 2 +-\n Documentation/user-manual.txt | 52 +-\n Makefile | 1 +\n advice.c | 11 +-\n builtin.h | 1 +\n builtin/checkout.c | 464 +++++++++---------\n builtin/clone.c | 2 +-\n command-list.txt | 1 +\n contrib/completion/git-completion.bash | 26 +\n git.c | 1 +\n parse-options-cb.c | 17 +\n parse-options.h | 3 +-\n sha1-name.c | 2 +-\n t/t1090-sparse-checkout-scope.sh | 14 -\n ...014-switch.sh => t2014-checkout-switch.sh} | 0\n t/t2020-checkout-detach.sh | 4 +-\n t/t2060-switch.sh | 91 ++++\n 39 files changed, 770 insertions(+), 363 deletions(-)\n create mode 100644 Documentation/git-switch.txt\n rename t/{t2014-switch.sh => t2014-checkout-switch.sh} (100%)\n create mode 100755 t/t2060-switch.sh\n\n-- \n2.20.1.682.gd5861c6d90\n\n"},{"id":"368085","messageId":"20190130094831.10420-2-pclouds@gmail.com","threadId":"50360","inReplyTo":"20190130094831.10420-1-pclouds@gmail.com","subject":"[PATCH 01/19] git-checkout.txt: fix one syntax line","fromName":"Nguyễn Thái Ngọc Duy","fromEmail":"pclouds@gmail.com","sentAt":"2019-01-30T09:48:13Z","receivedAt":"2019-01-30T09:48:44Z","isPatch":true,"sender":{"key":"pclouds@gmail.com","avatar":"https://avatars.githubusercontent.com/u/720?v=4"},"body":" can be omitted in this syntax, and it's actually documented a\nfew paragraphs down:\n\n You could omit , in which case the command degenerates to\n \"check out the current branch\", which is a glorified no-op with\n rather expensive side-effects to show only the tracking information,\n if exists, for the current branch.\n\nSigned-off-by: Nguyễn Thái Ngọc Duy \n---\n Documentation/git-checkout.txt | 2 +-\n 1 file changed, 1 insertion(+), 1 deletion(-)\n\ndiff --git a/Documentation/git-checkout.txt b/Documentation/git-checkout.txt\nindex ce7d38b8b7..bc7fbdb8d2 100644\n--- a/Documentation/git-checkout.txt\n+++ b/Documentation/git-checkout.txt\n@@ -23,7 +23,7 @@ or the specified tree. If no paths are given, 'git checkout' will\n also update `HEAD` to set the specified branch as the current\n branch.\n \n-'git checkout' ::\n+'git checkout' []::\n \tTo prepare for working on , switch to it by updating\n \tthe index and the files in the working tree, and by pointing\n \tHEAD at the branch. Local modifications to the files in the\n-- \n2.20.1.682.gd5861c6d90\n\n"},{"id":"368086","messageId":"20190130094831.10420-3-pclouds@gmail.com","threadId":"50360","inReplyTo":"20190130094831.10420-1-pclouds@gmail.com","subject":"[PATCH 02/19] doc: document --overwrite-ignore","fromName":"Nguyễn Thái Ngọc Duy","fromEmail":"pclouds@gmail.com","sentAt":"2019-01-30T09:48:14Z","receivedAt":"2019-01-30T09:48:49Z","isPatch":true,"sender":{"key":"pclouds@gmail.com","avatar":"https://avatars.githubusercontent.com/u/720?v=4"},"body":"I added this option in git-checkout and git-merge in c1d7036b6b\n(checkout,merge: disallow overwriting ignored files with\n--no-overwrite-ignore - 2011-11-27) but did not remember to update\ndocumentation. This completes that commit.\n\nSigned-off-by: Nguyễn Thái Ngọc Duy \n---\n Documentation/git-checkout.txt | 5 +++++\n Documentation/git-merge.txt | 4 ++++\n 2 files changed, 9 insertions(+)\n\ndiff --git a/Documentation/git-checkout.txt b/Documentation/git-checkout.txt\nindex bc7fbdb8d2..9ac01f7967 100644\n--- a/Documentation/git-checkout.txt\n+++ b/Documentation/git-checkout.txt\n@@ -270,6 +270,11 @@ Note that this option uses the no overlay mode by default (see also\n \tout anyway. In other words, the ref can be held by more than one\n \tworktree.\n \n+--[no-]overwrite-ignore::\n+\tSilently overwrite ignored files when switching branches. This\n+\tis the default behavior. Use --no-overwrite-ignore to abort\n+\tthe operation when the new branch contains ignored files.\n+\n --[no-]recurse-submodules::\n \tUsing --recurse-submodules will update the content of all initialized\n \tsubmodules according to the commit recorded in the superproject. If\ndiff --git a/Documentation/git-merge.txt b/Documentation/git-merge.txt\nindex 4cc86469f3..0480e9d0f0 100644\n--- a/Documentation/git-merge.txt\n+++ b/Documentation/git-merge.txt\n@@ -87,6 +87,10 @@ will be appended to the specified message.\n \tAllow the rerere mechanism to update the index with the\n \tresult of auto-conflict resolution if possible.\n \n+--[no-]overwrite-ignore::\n+\tSilently overwrite ignored files from the merge result. This\n+\tis the default behavior. Use --no-overwrite-ignore to abort.\n+\n --abort::\n \tAbort the current conflict resolution process, and\n \ttry to reconstruct the pre-merge state.\n-- \n2.20.1.682.gd5861c6d90\n\n"},{"id":"368087","messageId":"20190130094831.10420-4-pclouds@gmail.com","threadId":"50360","inReplyTo":"20190130094831.10420-1-pclouds@gmail.com","subject":"[PATCH 03/19] t: rename t2014-switch.sh to t2014-checkout-switch.sh","fromName":"Nguyễn Thái Ngọc Duy","fromEmail":"pclouds@gmail.com","sentAt":"2019-01-30T09:48:15Z","receivedAt":"2019-01-30T09:48:53Z","isPatch":true,"sender":{"key":"pclouds@gmail.com","avatar":"https://avatars.githubusercontent.com/u/720?v=4"},"body":"The old name does not really say that this is about 'checkout -b'. See\n49d833dc07 (Revert \"checkout branch: prime cache-tree fully\" -\n2009-05-12) for more information\n\nSigned-off-by: Nguyễn Thái Ngọc Duy \n---\n t/{t2014-switch.sh => t2014-checkout-switch.sh} | 0\n 1 file changed, 0 insertions(+), 0 deletions(-)\n rename t/{t2014-switch.sh => t2014-checkout-switch.sh} (100%)\n\ndiff --git a/t/t2014-switch.sh b/t/t2014-checkout-switch.sh\nsimilarity index 100%\nrename from t/t2014-switch.sh\nrename to t/t2014-checkout-switch.sh\n-- \n2.20.1.682.gd5861c6d90\n\n"},{"id":"368088","messageId":"20190130094831.10420-5-pclouds@gmail.com","threadId":"50360","inReplyTo":"20190130094831.10420-1-pclouds@gmail.com","subject":"[PATCH 04/19] checkout: factor out some code in parse_branchname_arg()","fromName":"Nguyễn Thái Ngọc Duy","fromEmail":"pclouds@gmail.com","sentAt":"2019-01-30T09:48:16Z","receivedAt":"2019-01-30T09:48:58Z","isPatch":true,"sender":{"key":"pclouds@gmail.com","avatar":"https://avatars.githubusercontent.com/u/720?v=4"},"body":"This is in preparation for the new command restore, which also\nneeds to parse opts->source_tree but does not need all the\ndisambiguation logic.\n\nSigned-off-by: Nguyễn Thái Ngọc Duy \n---\n builtin/checkout.c | 51 ++++++++++++++++++++++++++++------------------\n 1 file changed, 31 insertions(+), 20 deletions(-)\n\ndiff --git a/builtin/checkout.c b/builtin/checkout.c\nindex f63d864a91..12b7e08d4e 100644\n--- a/builtin/checkout.c\n+++ b/builtin/checkout.c\n@@ -1068,6 +1068,34 @@ static int git_checkout_config(const char *var, const char *value, void *cb)\n \treturn git_xmerge_config(var, value, NULL);\n }\n \n+static void setup_new_branch_info_and_source_tree(\n+\tstruct branch_info *new_branch_info,\n+\tstruct checkout_opts *opts,\n+\tstruct object_id *rev,\n+\tconst char *arg)\n+{\n+\tstruct tree **source_tree = &opts->source_tree;\n+\tstruct object_id branch_rev;\n+\n+\tnew_branch_info->name = arg;\n+\tsetup_branch_path(new_branch_info);\n+\n+\tif (!check_refname_format(new_branch_info->path, 0) &&\n+\t !read_ref(new_branch_info->path, &branch_rev))\n+\t\toidcpy(rev, &branch_rev);\n+\telse\n+\t\tnew_branch_info->path = NULL; /* not an existing branch */\n+\n+\tnew_branch_info->commit = lookup_commit_reference_gently(the_repository, rev, 1);\n+\tif (!new_branch_info->commit) {\n+\t\t/* not a commit */\n+\t\t*source_tree = parse_tree_indirect(rev);\n+\t} else {\n+\t\tparse_commit_or_die(new_branch_info->commit);\n+\t\t*source_tree = get_commit_tree(new_branch_info->commit);\n+\t}\n+}\n+\n static int parse_branchname_arg(int argc, const char **argv,\n \t\t\t\tint dwim_new_local_branch_ok,\n \t\t\t\tstruct branch_info *new_branch_info,\n@@ -1075,10 +1103,8 @@ static int parse_branchname_arg(int argc, const char **argv,\n \t\t\t\tstruct object_id *rev,\n \t\t\t\tint *dwim_remotes_matched)\n {\n-\tstruct tree **source_tree = &opts->source_tree;\n \tconst char **new_branch = &opts->new_branch;\n \tint argcount = 0;\n-\tstruct object_id branch_rev;\n \tconst char *arg;\n \tint dash_dash_pos;\n \tint has_dash_dash = 0;\n@@ -1200,26 +1226,11 @@ static int parse_branchname_arg(int argc, const char **argv,\n \targv++;\n \targc--;\n \n-\tnew_branch_info->name = arg;\n-\tsetup_branch_path(new_branch_info);\n-\n-\tif (!check_refname_format(new_branch_info->path, 0) &&\n-\t !read_ref(new_branch_info->path, &branch_rev))\n-\t\toidcpy(rev, &branch_rev);\n-\telse\n-\t\tnew_branch_info->path = NULL; /* not an existing branch */\n+\tsetup_new_branch_info_and_source_tree(new_branch_info, opts, rev, arg);\n \n-\tnew_branch_info->commit = lookup_commit_reference_gently(the_repository, rev, 1);\n-\tif (!new_branch_info->commit) {\n-\t\t/* not a commit */\n-\t\t*source_tree = parse_tree_indirect(rev);\n-\t} else {\n-\t\tparse_commit_or_die(new_branch_info->commit);\n-\t\t*source_tree = get_commit_tree(new_branch_info->commit);\n-\t}\n-\n-\tif (!*source_tree) /* case (1): want a tree */\n+\tif (!opts->source_tree) /* case (1): want a tree */\n \t\tdie(_(\"reference is not a tree: %s\"), arg);\n+\n \tif (!has_dash_dash) {\t/* case (3).(d) -> (1) */\n \t\t/*\n \t\t * Do not complain the most common case\n-- \n2.20.1.682.gd5861c6d90\n\n"},{"id":"368089","messageId":"20190130094831.10420-6-pclouds@gmail.com","threadId":"50360","inReplyTo":"20190130094831.10420-1-pclouds@gmail.com","subject":"[PATCH 05/19] checkout: make \"opts\" in cmd_checkout() a pointer","fromName":"Nguyễn Thái Ngọc Duy","fromEmail":"pclouds@gmail.com","sentAt":"2019-01-30T09:48:17Z","receivedAt":"2019-01-30T09:49:04Z","isPatch":true,"sender":{"key":"pclouds@gmail.com","avatar":"https://avatars.githubusercontent.com/u/720?v=4"},"body":"\"opts\" will soon be moved out of cmd_checkout(). To keep changes in\nthat patch smaller, convert \"opts\" to a pointer and keep the real\nthing behind \"real_opts\".\n\nSigned-off-by: Nguyễn Thái Ngọc Duy \n---\n builtin/checkout.c | 115 +++++++++++++++++++++++----------------------\n 1 file changed, 58 insertions(+), 57 deletions(-)\n\ndiff --git a/builtin/checkout.c b/builtin/checkout.c\nindex 12b7e08d4e..66f99e788d 100644\n--- a/builtin/checkout.c\n+++ b/builtin/checkout.c\n@@ -1326,82 +1326,83 @@ static int checkout_branch(struct checkout_opts *opts,\n \n int cmd_checkout(int argc, const char **argv, const char *prefix)\n {\n-\tstruct checkout_opts opts;\n+\tstruct checkout_opts real_opts;\n+\tstruct checkout_opts *opts = &real_opts;\n \tstruct branch_info new_branch_info;\n \tchar *conflict_style = NULL;\n \tint dwim_new_local_branch, no_dwim_new_local_branch = 0;\n \tint dwim_remotes_matched = 0;\n \tstruct option options[] = {\n-\t\tOPT__QUIET(&opts.quiet, N_(\"suppress progress reporting\")),\n-\t\tOPT_STRING('b', NULL, &opts.new_branch, N_(\"branch\"),\n+\t\tOPT__QUIET(&opts->quiet, N_(\"suppress progress reporting\")),\n+\t\tOPT_STRING('b', NULL, &opts->new_branch, N_(\"branch\"),\n \t\t\t N_(\"create and checkout a new branch\")),\n-\t\tOPT_STRING('B', NULL, &opts.new_branch_force, N_(\"branch\"),\n+\t\tOPT_STRING('B', NULL, &opts->new_branch_force, N_(\"branch\"),\n \t\t\t N_(\"create/reset and checkout a branch\")),\n-\t\tOPT_BOOL('l', NULL, &opts.new_branch_log, N_(\"create reflog for new branch\")),\n-\t\tOPT_BOOL(0, \"detach\", &opts.force_detach, N_(\"detach HEAD at named commit\")),\n-\t\tOPT_SET_INT('t', \"track\", &opts.track, N_(\"set upstream info for new branch\"),\n+\t\tOPT_BOOL('l', NULL, &opts->new_branch_log, N_(\"create reflog for new branch\")),\n+\t\tOPT_BOOL(0, \"detach\", &opts->force_detach, N_(\"detach HEAD at named commit\")),\n+\t\tOPT_SET_INT('t', \"track\", &opts->track, N_(\"set upstream info for new branch\"),\n \t\t\tBRANCH_TRACK_EXPLICIT),\n-\t\tOPT_STRING(0, \"orphan\", &opts.new_orphan_branch, N_(\"new-branch\"), N_(\"new unparented branch\")),\n-\t\tOPT_SET_INT_F('2', \"ours\", &opts.writeout_stage,\n+\t\tOPT_STRING(0, \"orphan\", &opts->new_orphan_branch, N_(\"new-branch\"), N_(\"new unparented branch\")),\n+\t\tOPT_SET_INT_F('2', \"ours\", &opts->writeout_stage,\n \t\t\t N_(\"checkout our version for unmerged files\"),\n \t\t\t 2, PARSE_OPT_NONEG),\n-\t\tOPT_SET_INT_F('3', \"theirs\", &opts.writeout_stage,\n+\t\tOPT_SET_INT_F('3', \"theirs\", &opts->writeout_stage,\n \t\t\t N_(\"checkout their version for unmerged files\"),\n \t\t\t 3, PARSE_OPT_NONEG),\n-\t\tOPT__FORCE(&opts.force, N_(\"force checkout (throw away local modifications)\"),\n+\t\tOPT__FORCE(&opts->force, N_(\"force checkout (throw away local modifications)\"),\n \t\t\t PARSE_OPT_NOCOMPLETE),\n-\t\tOPT_BOOL('m', \"merge\", &opts.merge, N_(\"perform a 3-way merge with the new branch\")),\n-\t\tOPT_BOOL_F(0, \"overwrite-ignore\", &opts.overwrite_ignore,\n+\t\tOPT_BOOL('m', \"merge\", &opts->merge, N_(\"perform a 3-way merge with the new branch\")),\n+\t\tOPT_BOOL_F(0, \"overwrite-ignore\", &opts->overwrite_ignore,\n \t\t\t N_(\"update ignored files (default)\"),\n \t\t\t PARSE_OPT_NOCOMPLETE),\n \t\tOPT_STRING(0, \"conflict\", &conflict_style, N_(\"style\"),\n \t\t\t N_(\"conflict style (merge or diff3)\")),\n-\t\tOPT_BOOL('p', \"patch\", &opts.patch_mode, N_(\"select hunks interactively\")),\n-\t\tOPT_BOOL(0, \"ignore-skip-worktree-bits\", &opts.ignore_skipworktree,\n+\t\tOPT_BOOL('p', \"patch\", &opts->patch_mode, N_(\"select hunks interactively\")),\n+\t\tOPT_BOOL(0, \"ignore-skip-worktree-bits\", &opts->ignore_skipworktree,\n \t\t\t N_(\"do not limit pathspecs to sparse entries only\")),\n \t\tOPT_BOOL(0, \"no-guess\", &no_dwim_new_local_branch,\n \t\t\t N_(\"do not second guess 'git checkout '\")),\n-\t\tOPT_BOOL(0, \"ignore-other-worktrees\", &opts.ignore_other_worktrees,\n+\t\tOPT_BOOL(0, \"ignore-other-worktrees\", &opts->ignore_other_worktrees,\n \t\t\t N_(\"do not check if another worktree is holding the given ref\")),\n \t\t{ OPTION_CALLBACK, 0, \"recurse-submodules\", NULL,\n \t\t\t \"checkout\", \"control recursive updating of submodules\",\n \t\t\t PARSE_OPT_OPTARG, option_parse_recurse_submodules_worktree_updater },\n-\t\tOPT_BOOL(0, \"progress\", &opts.show_progress, N_(\"force progress reporting\")),\n-\t\tOPT_BOOL(0, \"overlay\", &opts.overlay_mode, N_(\"use overlay mode (default)\")),\n+\t\tOPT_BOOL(0, \"progress\", &opts->show_progress, N_(\"force progress reporting\")),\n+\t\tOPT_BOOL(0, \"overlay\", &opts->overlay_mode, N_(\"use overlay mode (default)\")),\n \t\tOPT_END(),\n \t};\n \n-\tmemset(&opts, 0, sizeof(opts));\n+\tmemset(opts, 0, sizeof(*opts));\n \tmemset(&new_branch_info, 0, sizeof(new_branch_info));\n-\topts.overwrite_ignore = 1;\n-\topts.prefix = prefix;\n-\topts.show_progress = -1;\n-\topts.overlay_mode = -1;\n+\topts->overwrite_ignore = 1;\n+\topts->prefix = prefix;\n+\topts->show_progress = -1;\n+\topts->overlay_mode = -1;\n \n-\tgit_config(git_checkout_config, &opts);\n+\tgit_config(git_checkout_config, opts);\n \n-\topts.track = BRANCH_TRACK_UNSPECIFIED;\n+\topts->track = BRANCH_TRACK_UNSPECIFIED;\n \n \targc = parse_options(argc, argv, prefix, options, checkout_usage,\n \t\t\t PARSE_OPT_KEEP_DASHDASH);\n \n \tdwim_new_local_branch = !no_dwim_new_local_branch;\n-\tif (opts.show_progress < 0) {\n-\t\tif (opts.quiet)\n-\t\t\topts.show_progress = 0;\n+\tif (opts->show_progress < 0) {\n+\t\tif (opts->quiet)\n+\t\t\topts->show_progress = 0;\n \t\telse\n-\t\t\topts.show_progress = isatty(2);\n+\t\t\topts->show_progress = isatty(2);\n \t}\n \n \tif (conflict_style) {\n-\t\topts.merge = 1; /* implied */\n+\t\topts->merge = 1; /* implied */\n \t\tgit_xmerge_config(\"merge.conflictstyle\", conflict_style, NULL);\n \t}\n \n-\tif ((!!opts.new_branch + !!opts.new_branch_force + !!opts.new_orphan_branch) > 1)\n+\tif ((!!opts->new_branch + !!opts->new_branch_force + !!opts->new_orphan_branch) > 1)\n \t\tdie(_(\"-b, -B and --orphan are mutually exclusive\"));\n \n-\tif (opts.overlay_mode == 1 && opts.patch_mode)\n+\tif (opts->overlay_mode == 1 && opts->patch_mode)\n \t\tdie(_(\"-p and --overlay are mutually exclusive\"));\n \n \t/*\n@@ -1409,14 +1410,14 @@ int cmd_checkout(int argc, const char **argv, const char *prefix)\n \t * and new_branch_force and new_orphan_branch will tell us which one of\n \t * -b/-B/--orphan is being used.\n \t */\n-\tif (opts.new_branch_force)\n-\t\topts.new_branch = opts.new_branch_force;\n+\tif (opts->new_branch_force)\n+\t\topts->new_branch = opts->new_branch_force;\n \n-\tif (opts.new_orphan_branch)\n-\t\topts.new_branch = opts.new_orphan_branch;\n+\tif (opts->new_orphan_branch)\n+\t\topts->new_branch = opts->new_orphan_branch;\n \n \t/* --track without -b/-B/--orphan should DWIM */\n-\tif (opts.track != BRANCH_TRACK_UNSPECIFIED && !opts.new_branch) {\n+\tif (opts->track != BRANCH_TRACK_UNSPECIFIED && !opts->new_branch) {\n \t\tconst char *argv0 = argv[0];\n \t\tif (!argc || !strcmp(argv0, \"--\"))\n \t\t\tdie(_(\"--track needs a branch name\"));\n@@ -1425,7 +1426,7 @@ int cmd_checkout(int argc, const char **argv, const char *prefix)\n \t\targv0 = strchr(argv0, '/');\n \t\tif (!argv0 || !argv0[1])\n \t\t\tdie(_(\"missing branch name; try -b\"));\n-\t\topts.new_branch = argv0 + 1;\n+\t\topts->new_branch = argv0 + 1;\n \t}\n \n \t/*\n@@ -1444,56 +1445,56 @@ int cmd_checkout(int argc, const char **argv, const char *prefix)\n \tif (argc) {\n \t\tstruct object_id rev;\n \t\tint dwim_ok =\n-\t\t\t!opts.patch_mode &&\n+\t\t\t!opts->patch_mode &&\n \t\t\tdwim_new_local_branch &&\n-\t\t\topts.track == BRANCH_TRACK_UNSPECIFIED &&\n-\t\t\t!opts.new_branch;\n+\t\t\topts->track == BRANCH_TRACK_UNSPECIFIED &&\n+\t\t\t!opts->new_branch;\n \t\tint n = parse_branchname_arg(argc, argv, dwim_ok,\n-\t\t\t\t\t &new_branch_info, &opts, &rev,\n+\t\t\t\t\t &new_branch_info, opts, &rev,\n \t\t\t\t\t &dwim_remotes_matched);\n \t\targv += n;\n \t\targc -= n;\n \t}\n \n \tif (argc) {\n-\t\tparse_pathspec(&opts.pathspec, 0,\n-\t\t\t opts.patch_mode ? PATHSPEC_PREFIX_ORIGIN : 0,\n+\t\tparse_pathspec(&opts->pathspec, 0,\n+\t\t\t opts->patch_mode ? PATHSPEC_PREFIX_ORIGIN : 0,\n \t\t\t prefix, argv);\n \n-\t\tif (!opts.pathspec.nr)\n+\t\tif (!opts->pathspec.nr)\n \t\t\tdie(_(\"invalid path specification\"));\n \n \t\t/*\n \t\t * Try to give more helpful suggestion.\n \t\t * new_branch && argc > 1 will be caught later.\n \t\t */\n-\t\tif (opts.new_branch && argc == 1)\n+\t\tif (opts->new_branch && argc == 1)\n \t\t\tdie(_(\"'%s' is not a commit and a branch '%s' cannot be created from it\"),\n-\t\t\t\targv[0], opts.new_branch);\n+\t\t\t\targv[0], opts->new_branch);\n \n-\t\tif (opts.force_detach)\n+\t\tif (opts->force_detach)\n \t\t\tdie(_(\"git checkout: --detach does not take a path argument '%s'\"),\n \t\t\t argv[0]);\n \n-\t\tif (1 < !!opts.writeout_stage + !!opts.force + !!opts.merge)\n+\t\tif (1 < !!opts->writeout_stage + !!opts->force + !!opts->merge)\n \t\t\tdie(_(\"git checkout: --ours/--theirs, --force and --merge are incompatible when\\n\"\n \t\t\t \"checking out of the index.\"));\n \t}\n \n-\tif (opts.new_branch) {\n+\tif (opts->new_branch) {\n \t\tstruct strbuf buf = STRBUF_INIT;\n \n-\t\tif (opts.new_branch_force)\n-\t\t\topts.branch_exists = validate_branchname(opts.new_branch, &buf);\n+\t\tif (opts->new_branch_force)\n+\t\t\topts->branch_exists = validate_branchname(opts->new_branch, &buf);\n \t\telse\n-\t\t\topts.branch_exists =\n-\t\t\t\tvalidate_new_branchname(opts.new_branch, &buf, 0);\n+\t\t\topts->branch_exists =\n+\t\t\t\tvalidate_new_branchname(opts->new_branch, &buf, 0);\n \t\tstrbuf_release(&buf);\n \t}\n \n \tUNLEAK(opts);\n-\tif (opts.patch_mode || opts.pathspec.nr) {\n-\t\tint ret = checkout_paths(&opts, new_branch_info.name);\n+\tif (opts->patch_mode || opts->pathspec.nr) {\n+\t\tint ret = checkout_paths(opts, new_branch_info.name);\n \t\tif (ret && dwim_remotes_matched > 1 &&\n \t\t advice_checkout_ambiguous_remote_branch_name)\n \t\t\tadvise(_(\"'%s' matched more than one remote tracking branch.\\n\"\n@@ -1512,6 +1513,6 @@ int cmd_checkout(int argc, const char **argv, const char *prefix)\n \t\t\t dwim_remotes_matched);\n \t\treturn ret;\n \t} else {\n-\t\treturn checkout_branch(&opts, &new_branch_info);\n+\t\treturn checkout_branch(opts, &new_branch_info);\n \t}\n }\n-- \n2.20.1.682.gd5861c6d90\n\n"},{"id":"368090","messageId":"20190130094831.10420-7-pclouds@gmail.com","threadId":"50360","inReplyTo":"20190130094831.10420-1-pclouds@gmail.com","subject":"[PATCH 06/19] checkout: move 'confict_style' and 'dwim_..' to checkout_opts","fromName":"Nguyễn Thái Ngọc Duy","fromEmail":"pclouds@gmail.com","sentAt":"2019-01-30T09:48:18Z","receivedAt":"2019-01-30T09:49:09Z","isPatch":true,"sender":{"key":"pclouds@gmail.com","avatar":"https://avatars.githubusercontent.com/u/720?v=4"},"body":"These local variables are referenced by struct option[]. This struct\nwill soon be broken down, moved away and we can't rely on local\nvariables anymore. Move these two to struct checkout_opts in\npreparation for that.\n\nSigned-off-by: Nguyễn Thái Ngọc Duy \n---\n builtin/checkout.c | 17 ++++++++++-------\n 1 file changed, 10 insertions(+), 7 deletions(-)\n\ndiff --git a/builtin/checkout.c b/builtin/checkout.c\nindex 66f99e788d..5914dd3619 100644\n--- a/builtin/checkout.c\n+++ b/builtin/checkout.c\n@@ -46,6 +46,8 @@ struct checkout_opts {\n \tint show_progress;\n \tint count_checkout_paths;\n \tint overlay_mode;\n+\tint no_dwim_new_local_branch;\n+\n \t/*\n \t * If new checkout options are added, skip_merge_working_tree\n \t * should be updated accordingly.\n@@ -57,6 +59,7 @@ struct checkout_opts {\n \tint new_branch_log;\n \tenum branch_track track;\n \tstruct diff_options diff_options;\n+\tchar *conflict_style;\n \n \tint branch_exists;\n \tconst char *prefix;\n@@ -1329,8 +1332,7 @@ int cmd_checkout(int argc, const char **argv, const char *prefix)\n \tstruct checkout_opts real_opts;\n \tstruct checkout_opts *opts = &real_opts;\n \tstruct branch_info new_branch_info;\n-\tchar *conflict_style = NULL;\n-\tint dwim_new_local_branch, no_dwim_new_local_branch = 0;\n+\tint dwim_new_local_branch;\n \tint dwim_remotes_matched = 0;\n \tstruct option options[] = {\n \t\tOPT__QUIET(&opts->quiet, N_(\"suppress progress reporting\")),\n@@ -1355,12 +1357,12 @@ int cmd_checkout(int argc, const char **argv, const char *prefix)\n \t\tOPT_BOOL_F(0, \"overwrite-ignore\", &opts->overwrite_ignore,\n \t\t\t N_(\"update ignored files (default)\"),\n \t\t\t PARSE_OPT_NOCOMPLETE),\n-\t\tOPT_STRING(0, \"conflict\", &conflict_style, N_(\"style\"),\n+\t\tOPT_STRING(0, \"conflict\", &opts->conflict_style, N_(\"style\"),\n \t\t\t N_(\"conflict style (merge or diff3)\")),\n \t\tOPT_BOOL('p', \"patch\", &opts->patch_mode, N_(\"select hunks interactively\")),\n \t\tOPT_BOOL(0, \"ignore-skip-worktree-bits\", &opts->ignore_skipworktree,\n \t\t\t N_(\"do not limit pathspecs to sparse entries only\")),\n-\t\tOPT_BOOL(0, \"no-guess\", &no_dwim_new_local_branch,\n+\t\tOPT_BOOL(0, \"no-guess\", &opts->no_dwim_new_local_branch,\n \t\t\t N_(\"do not second guess 'git checkout '\")),\n \t\tOPT_BOOL(0, \"ignore-other-worktrees\", &opts->ignore_other_worktrees,\n \t\t\t N_(\"do not check if another worktree is holding the given ref\")),\n@@ -1378,6 +1380,7 @@ int cmd_checkout(int argc, const char **argv, const char *prefix)\n \topts->prefix = prefix;\n \topts->show_progress = -1;\n \topts->overlay_mode = -1;\n+\topts->no_dwim_new_local_branch = 0;\n \n \tgit_config(git_checkout_config, opts);\n \n@@ -1386,7 +1389,7 @@ int cmd_checkout(int argc, const char **argv, const char *prefix)\n \targc = parse_options(argc, argv, prefix, options, checkout_usage,\n \t\t\t PARSE_OPT_KEEP_DASHDASH);\n \n-\tdwim_new_local_branch = !no_dwim_new_local_branch;\n+\tdwim_new_local_branch = !opts->no_dwim_new_local_branch;\n \tif (opts->show_progress < 0) {\n \t\tif (opts->quiet)\n \t\t\topts->show_progress = 0;\n@@ -1394,9 +1397,9 @@ int cmd_checkout(int argc, const char **argv, const char *prefix)\n \t\t\topts->show_progress = isatty(2);\n \t}\n \n-\tif (conflict_style) {\n+\tif (opts->conflict_style) {\n \t\topts->merge = 1; /* implied */\n-\t\tgit_xmerge_config(\"merge.conflictstyle\", conflict_style, NULL);\n+\t\tgit_xmerge_config(\"merge.conflictstyle\", opts->conflict_style, NULL);\n \t}\n \n \tif ((!!opts->new_branch + !!opts->new_branch_force + !!opts->new_orphan_branch) > 1)\n-- \n2.20.1.682.gd5861c6d90\n\n"},{"id":"368091","messageId":"20190130094831.10420-8-pclouds@gmail.com","threadId":"50360","inReplyTo":"20190130094831.10420-1-pclouds@gmail.com","subject":"[PATCH 07/19] checkout: split options[] array in three pieces","fromName":"Nguyễn Thái Ngọc Duy","fromEmail":"pclouds@gmail.com","sentAt":"2019-01-30T09:48:19Z","receivedAt":"2019-01-30T09:49:13Z","isPatch":true,"sender":{"key":"pclouds@gmail.com","avatar":"https://avatars.githubusercontent.com/u/720?v=4"},"body":"This is a preparation step for introducing new commands that do parts\nof what checkout does. There will be two new commands, one is about\nswitching branches, detaching HEAD... one about checking out\npaths. These share the a subset of command line options. The rest of\ncommand line options are separate.\n\nSigned-off-by: Nguyễn Thái Ngọc Duy \n---\n builtin/checkout.c | 82 +++++++++++++++++++++++++++++++++-------------\n parse-options-cb.c | 17 ++++++++++\n parse-options.h | 3 +-\n 3 files changed, 78 insertions(+), 24 deletions(-)\n\ndiff --git a/builtin/checkout.c b/builtin/checkout.c\nindex 5914dd3619..8ea1349cce 100644\n--- a/builtin/checkout.c\n+++ b/builtin/checkout.c\n@@ -1327,15 +1327,31 @@ static int checkout_branch(struct checkout_opts *opts,\n \treturn switch_branches(opts, new_branch_info);\n }\n \n-int cmd_checkout(int argc, const char **argv, const char *prefix)\n+static struct option *add_common_options(struct checkout_opts *opts,\n+\t\t\t\t\t struct option *prevopts)\n {\n-\tstruct checkout_opts real_opts;\n-\tstruct checkout_opts *opts = &real_opts;\n-\tstruct branch_info new_branch_info;\n-\tint dwim_new_local_branch;\n-\tint dwim_remotes_matched = 0;\n \tstruct option options[] = {\n \t\tOPT__QUIET(&opts->quiet, N_(\"suppress progress reporting\")),\n+\t\t{ OPTION_CALLBACK, 0, \"recurse-submodules\", NULL,\n+\t\t\t \"checkout\", \"control recursive updating of submodules\",\n+\t\t\t PARSE_OPT_OPTARG, option_parse_recurse_submodules_worktree_updater },\n+\t\tOPT_BOOL(0, \"progress\", &opts->show_progress, N_(\"force progress reporting\")),\n+\t\tOPT__FORCE(&opts->force, N_(\"force checkout (throw away local modifications)\"),\n+\t\t\t PARSE_OPT_NOCOMPLETE),\n+\t\tOPT_BOOL('m', \"merge\", &opts->merge, N_(\"perform a 3-way merge with the new branch\")),\n+\t\tOPT_STRING(0, \"conflict\", &opts->conflict_style, N_(\"style\"),\n+\t\t\t N_(\"conflict style (merge or diff3)\")),\n+\t\tOPT_END()\n+\t};\n+\tstruct option *newopts = parse_options_concat(prevopts, options);\n+\tfree(prevopts);\n+\treturn newopts;\n+}\n+\n+static struct option *add_switch_branch_options(struct checkout_opts *opts,\n+\t\t\t\t\t\tstruct option *prevopts)\n+{\n+\tstruct option options[] = {\n \t\tOPT_STRING('b', NULL, &opts->new_branch, N_(\"branch\"),\n \t\t\t N_(\"create and checkout a new branch\")),\n \t\tOPT_STRING('B', NULL, &opts->new_branch_force, N_(\"branch\"),\n@@ -1345,34 +1361,49 @@ int cmd_checkout(int argc, const char **argv, const char *prefix)\n \t\tOPT_SET_INT('t', \"track\", &opts->track, N_(\"set upstream info for new branch\"),\n \t\t\tBRANCH_TRACK_EXPLICIT),\n \t\tOPT_STRING(0, \"orphan\", &opts->new_orphan_branch, N_(\"new-branch\"), N_(\"new unparented branch\")),\n+\t\tOPT_BOOL_F(0, \"overwrite-ignore\", &opts->overwrite_ignore,\n+\t\t\t N_(\"update ignored files (default)\"),\n+\t\t\t PARSE_OPT_NOCOMPLETE),\n+\t\tOPT_BOOL(0, \"no-guess\", &opts->no_dwim_new_local_branch,\n+\t\t\t N_(\"second guess 'git checkout '\")),\n+\t\tOPT_BOOL(0, \"ignore-other-worktrees\", &opts->ignore_other_worktrees,\n+\t\t\t N_(\"do not check if another worktree is holding the given ref\")),\n+\t\tOPT_END()\n+\t};\n+\tstruct option *newopts = parse_options_concat(prevopts, options);\n+\tfree(prevopts);\n+\treturn newopts;\n+}\n+\n+static struct option *add_checkout_path_options(struct checkout_opts *opts,\n+\t\t\t\t\t\tstruct option *prevopts)\n+{\n+\tstruct option options[] = {\n \t\tOPT_SET_INT_F('2', \"ours\", &opts->writeout_stage,\n \t\t\t N_(\"checkout our version for unmerged files\"),\n \t\t\t 2, PARSE_OPT_NONEG),\n \t\tOPT_SET_INT_F('3', \"theirs\", &opts->writeout_stage,\n \t\t\t N_(\"checkout their version for unmerged files\"),\n \t\t\t 3, PARSE_OPT_NONEG),\n-\t\tOPT__FORCE(&opts->force, N_(\"force checkout (throw away local modifications)\"),\n-\t\t\t PARSE_OPT_NOCOMPLETE),\n-\t\tOPT_BOOL('m', \"merge\", &opts->merge, N_(\"perform a 3-way merge with the new branch\")),\n-\t\tOPT_BOOL_F(0, \"overwrite-ignore\", &opts->overwrite_ignore,\n-\t\t\t N_(\"update ignored files (default)\"),\n-\t\t\t PARSE_OPT_NOCOMPLETE),\n-\t\tOPT_STRING(0, \"conflict\", &opts->conflict_style, N_(\"style\"),\n-\t\t\t N_(\"conflict style (merge or diff3)\")),\n \t\tOPT_BOOL('p', \"patch\", &opts->patch_mode, N_(\"select hunks interactively\")),\n \t\tOPT_BOOL(0, \"ignore-skip-worktree-bits\", &opts->ignore_skipworktree,\n \t\t\t N_(\"do not limit pathspecs to sparse entries only\")),\n-\t\tOPT_BOOL(0, \"no-guess\", &opts->no_dwim_new_local_branch,\n-\t\t\t N_(\"do not second guess 'git checkout '\")),\n-\t\tOPT_BOOL(0, \"ignore-other-worktrees\", &opts->ignore_other_worktrees,\n-\t\t\t N_(\"do not check if another worktree is holding the given ref\")),\n-\t\t{ OPTION_CALLBACK, 0, \"recurse-submodules\", NULL,\n-\t\t\t \"checkout\", \"control recursive updating of submodules\",\n-\t\t\t PARSE_OPT_OPTARG, option_parse_recurse_submodules_worktree_updater },\n-\t\tOPT_BOOL(0, \"progress\", &opts->show_progress, N_(\"force progress reporting\")),\n \t\tOPT_BOOL(0, \"overlay\", &opts->overlay_mode, N_(\"use overlay mode (default)\")),\n-\t\tOPT_END(),\n+\t\tOPT_END()\n \t};\n+\tstruct option *newopts = parse_options_concat(prevopts, options);\n+\tfree(prevopts);\n+\treturn newopts;\n+}\n+\n+int cmd_checkout(int argc, const char **argv, const char *prefix)\n+{\n+\tstruct checkout_opts real_opts;\n+\tstruct checkout_opts *opts = &real_opts;\n+\tstruct branch_info new_branch_info;\n+\tint dwim_remotes_matched = 0;\n+\tint dwim_new_local_branch;\n+\tstruct option *options = NULL;\n \n \tmemset(opts, 0, sizeof(*opts));\n \tmemset(&new_branch_info, 0, sizeof(new_branch_info));\n@@ -1386,6 +1417,11 @@ int cmd_checkout(int argc, const char **argv, const char *prefix)\n \n \topts->track = BRANCH_TRACK_UNSPECIFIED;\n \n+\toptions = parse_options_dup(options);\n+\toptions = add_common_options(opts, options);\n+\toptions = add_switch_branch_options(opts, options);\n+\toptions = add_checkout_path_options(opts, options);\n+\n \targc = parse_options(argc, argv, prefix, options, checkout_usage,\n \t\t\t PARSE_OPT_KEEP_DASHDASH);\n \ndiff --git a/parse-options-cb.c b/parse-options-cb.c\nindex e2f3eaed07..76eb5c211b 100644\n--- a/parse-options-cb.c\n+++ b/parse-options-cb.c\n@@ -122,6 +122,23 @@ int parse_opt_tertiary(const struct option *opt, const char *arg, int unset)\n \treturn 0;\n }\n \n+struct option *parse_options_dup(const struct option *o)\n+{\n+\tstruct option *opts;\n+\tint nr = 0;\n+\n+\twhile (o && o->type != OPTION_END) {\n+\t\tnr++;\n+\t\to++;\n+\t}\n+\n+\tALLOC_ARRAY(opts, nr + 1);\n+\tmemcpy(opts, o - nr, sizeof(*o) * nr);\n+\tmemset(opts + nr, 0, sizeof(*opts));\n+\topts[nr].type = OPTION_END;\n+\treturn opts;\n+}\n+\n struct option *parse_options_concat(struct option *a, struct option *b)\n {\n \tstruct option *ret;\ndiff --git a/parse-options.h b/parse-options.h\nindex 14fe32428e..6846a5b1e0 100644\n--- a/parse-options.h\n+++ b/parse-options.h\n@@ -237,7 +237,8 @@ extern int parse_options_step(struct parse_opt_ctx_t *ctx,\n \n extern int parse_options_end(struct parse_opt_ctx_t *ctx);\n \n-extern struct option *parse_options_concat(struct option *a, struct option *b);\n+struct option *parse_options_dup(const struct option *a);\n+struct option *parse_options_concat(struct option *a, struct option *b);\n \n /*----- some often used options -----*/\n extern int parse_opt_abbrev_cb(const struct option *, const char *, int);\n-- \n2.20.1.682.gd5861c6d90\n\n"},{"id":"368092","messageId":"20190130094831.10420-9-pclouds@gmail.com","threadId":"50360","inReplyTo":"20190130094831.10420-1-pclouds@gmail.com","subject":"[PATCH 08/19] checkout: split part of it to new command switch","fromName":"Nguyễn Thái Ngọc Duy","fromEmail":"pclouds@gmail.com","sentAt":"2019-01-30T09:48:20Z","receivedAt":"2019-01-30T09:49:19Z","isPatch":true,"sender":{"key":"pclouds@gmail.com","avatar":"https://avatars.githubusercontent.com/u/720?v=4"},"body":"\"git checkout\" doing too many things is a source of confusion for many\nusers (and it even bites old timers sometimes). To remedy that, the\ncommand will be split into two new ones: switch and\nsomething-to-checkout-paths. The good old \"git checkout\" command is\nstill here and will be until all (or most of users) are sick of it.\n\nSee the new man page for the final design of switch. The actual\nimplementation though is still pretty much the same as \"git checkout\"\nand not completely aligned with the man page. Following patches will\nadjust their behavior to match the man page.\n\nSigned-off-by: Nguyễn Thái Ngọc Duy \n---\n .gitignore | 1 +\n Documentation/config/advice.txt | 13 +-\n Documentation/config/branch.txt | 4 +-\n Documentation/config/checkout.txt | 9 +-\n Documentation/config/diff.txt | 3 +-\n Documentation/git-checkout.txt | 4 +\n Documentation/git-switch.txt | 236 ++++++++++++++++++++++++++++++\n Documentation/gitattributes.txt | 3 +-\n Documentation/githooks.txt | 8 +-\n Makefile | 1 +\n builtin.h | 1 +\n builtin/checkout.c | 60 ++++++--\n command-list.txt | 1 +\n git.c | 1 +\n 14 files changed, 318 insertions(+), 27 deletions(-)\n create mode 100644 Documentation/git-switch.txt\n\ndiff --git a/.gitignore b/.gitignore\nindex 0d77ea5894..8e2b89047f 100644\n--- a/.gitignore\n+++ b/.gitignore\n@@ -167,6 +167,7 @@\n /git-submodule\n /git-submodule--helper\n /git-svn\n+/git-switch\n /git-symbolic-ref\n /git-tag\n /git-unpack-file\ndiff --git a/Documentation/config/advice.txt b/Documentation/config/advice.txt\nindex 88620429ea..239d479506 100644\n--- a/Documentation/config/advice.txt\n+++ b/Documentation/config/advice.txt\n@@ -42,7 +42,8 @@ advice.*::\n \t\tstate in the output of linkgit:git-status[1], in\n \t\tthe template shown when writing commit messages in\n \t\tlinkgit:git-commit[1], and in the help message shown\n-\t\tby linkgit:git-checkout[1] when switching branch.\n+\t\tby linkgit:git-switch[1] or\n+\t\tlinkgit:git-checkout[1] when switching branch.\n \tstatusUoption::\n \t\tAdvise to consider using the `-u` option to linkgit:git-status[1]\n \t\twhen the command takes more than 2 seconds to enumerate untracked\n@@ -62,12 +63,14 @@ advice.*::\n \t\tyour information is guessed from the system username and\n \t\tdomain name.\n \tdetachedHead::\n-\t\tAdvice shown when you used linkgit:git-checkout[1] to\n-\t\tmove to the detach HEAD state, to instruct how to create\n-\t\ta local branch after the fact.\n+\t\tAdvice shown when you used\n+\t\tlinkgit:git-switch[1] or linkgit:git-checkout[1]\n+\t\tto move to the detach HEAD state, to instruct how to\n+\t\tcreate a local branch after the fact.\n \tcheckoutAmbiguousRemoteBranchName::\n \t\tAdvice shown when the argument to\n-\t\tlinkgit:git-checkout[1] ambiguously resolves to a\n+\t\tlinkgit:git-checkout[1] and linkgit:git-switch[1]\n+\t\tambiguously resolves to a\n \t\tremote tracking branch on more than one remote in\n \t\tsituations where an unambiguous argument would have\n \t\totherwise caused a remote-tracking branch to be\ndiff --git a/Documentation/config/branch.txt b/Documentation/config/branch.txt\nindex 019d60ede2..8050466159 100644\n--- a/Documentation/config/branch.txt\n+++ b/Documentation/config/branch.txt\n@@ -1,5 +1,5 @@\n branch.autoSetupMerge::\n-\tTells 'git branch' and 'git checkout' to set up new branches\n+\tTells 'git branch', 'git switch' and 'git checkout' to set up new branches\n \tso that linkgit:git-pull[1] will appropriately merge from the\n \tstarting point branch. Note that even if this option is not set,\n \tthis behavior can be chosen per-branch using the `--track`\n@@ -11,7 +11,7 @@ branch.autoSetupMerge::\n \tbranch. This option defaults to true.\n \n branch.autoSetupRebase::\n-\tWhen a new branch is created with 'git branch' or 'git checkout'\n+\tWhen a new branch is created with 'git branch', 'git switch' or 'git checkout'\n \tthat tracks another branch, this variable tells Git to set\n \tup pull to rebase instead of merge (see \"branch..rebase\").\n \tWhen `never`, rebase is never automatically set to true.\ndiff --git a/Documentation/config/checkout.txt b/Documentation/config/checkout.txt\nindex 73380a8d86..fc211eca58 100644\n--- a/Documentation/config/checkout.txt\n+++ b/Documentation/config/checkout.txt\n@@ -1,5 +1,6 @@\n checkout.defaultRemote::\n-\tWhen you run 'git checkout ' and only have one\n+\tWhen you run 'git checkout '\n+\tor 'git switch ' and only have one\n \tremote, it may implicitly fall back on checking out and\n \ttracking e.g. 'origin/'. This stops working as soon\n \tas you have more than one remote with a ''\n@@ -8,8 +9,10 @@ checkout.defaultRemote::\n \tdisambiguation. The typical use-case is to set this to\n \t`origin`.\n +\n-Currently this is used by linkgit:git-checkout[1] when 'git checkout\n-' will checkout the '' branch on another remote,\n+Currently this is used by linkgit:git-switch[1] and\n+linkgit:git-checkout[1] when 'git checkout '\n+or 'git switch '\n+will checkout the '' branch on another remote,\n and by linkgit:git-worktree[1] when 'git worktree add' refers to a\n remote branch. This setting might be used for other checkout-like\n commands or functionality in the future.\ndiff --git a/Documentation/config/diff.txt b/Documentation/config/diff.txt\nindex e48bb987d7..b3b304ee12 100644\n--- a/Documentation/config/diff.txt\n+++ b/Documentation/config/diff.txt\n@@ -78,7 +78,8 @@ diff.external::\n diff.ignoreSubmodules::\n \tSets the default value of --ignore-submodules. Note that this\n \taffects only 'git diff' Porcelain, and not lower level 'diff'\n-\tcommands such as 'git diff-files'. 'git checkout' also honors\n+\tcommands such as 'git diff-files'. 'git checkout'\n+\tand 'git switch' also honor\n \tthis setting when reporting uncommitted changes. Setting it to\n \t'all' disables the submodule summary normally shown by 'git commit'\n \tand 'git status' when `status.submoduleSummary` is set unless it is\ndiff --git a/Documentation/git-checkout.txt b/Documentation/git-checkout.txt\nindex 9ac01f7967..31c6cbef19 100644\n--- a/Documentation/git-checkout.txt\n+++ b/Documentation/git-checkout.txt\n@@ -556,6 +556,10 @@ $ edit frotz\n $ git add frotz\n ------------\n \n+SEE ALSO\n+--------\n+linkgit:git-switch[1]\n+\n GIT\n ---\n Part of the linkgit:git[1] suite\ndiff --git a/Documentation/git-switch.txt b/Documentation/git-switch.txt\nnew file mode 100644\nindex 0000000000..953c9747b2\n--- /dev/null\n+++ b/Documentation/git-switch.txt\n@@ -0,0 +1,236 @@\n+git-switch(1)\n+=============\n+\n+NAME\n+----\n+git-switch - Switch branches\n+\n+SYNOPSIS\n+--------\n+[verse]\n+'git switch' [] [--guess] \n+'git switch' [] --detach [>]\n+'git switch' [] [[-c|-C|--orphan] ] []\n+\n+DESCRIPTION\n+-----------\n+Switch to a specified branch and update files in the working tree to\n+match it. Optionally a new branch could be created with either `-c` or\n+`-C`, or detach from any branch with `--detach`, along with switching.\n+\n+OPTIONS\n+-------\n+::\n+\tBranch to switch to.\n+\n+::\n+\tName for the new branch.\n+\n+::\n+\tThe name of a commit at which to switch to before creating a\n+\tnew branch or detach from.\n++\n+You can use the `\"@{-N}\"` syntax to refer to the N-th last\n+branch/commit switched to \"git switch\" or \"git checkout\"\n+operation. You may also specify `-` which is synonymous to `\"@{-1}`.\n++\n+As a special case, you may use `\"A...B\"` as a shortcut for the merge\n+base of `A` and `B` if there is exactly one merge base. You can leave\n+out at most one of `A` and `B`, in which case it defaults to `HEAD`.\n+\n+-c ::\n+--create ::\n+\tCreate a new branch named and start it at\n+\t; see linkgit:git-branch[1] for details.\n+\n+-C ::\n+--force-create ::\n+\tCreates the branch and start it at ;\n+\tif it already exists, then reset it to . This is\n+\tequivalent to running \"git branch\" with \"-f\"; see\n+\tlinkgit:git-branch[1] for details.\n+\n+-d::\n+--detach::\n+\tSwitch to a commit for inspection and discardable\n+\texperiments. See the \"DETACHED HEAD\" section in\n+\tlinkgit:git-checkout[1] for details.\n+\n+-g::\n+--guess::\n+\tIf is not found but there does exist a tracking\n+\tbranch in exactly one remote (call it ) with a\n+\tmatching name, treat as equivalent to\n++\n+------------\n+$ git switch -c --track /\n+------------\n++\n+If the branch exists in multiple remotes and one of them is named by\n+the `checkout.defaultRemote` configuration variable, we'll use that\n+one for the purposes of disambiguation, even if the `` isn't\n+unique across all remotes. Set it to e.g. `checkout.defaultRemote=origin`\n+to always checkout remote branches from there if `` is\n+ambiguous but exists on the 'origin' remote. See also\n+`checkout.defaultRemote` in linkgit:git-config[1].\n+\n+-q::\n+--quiet::\n+\tQuiet, suppress feedback messages.\n+\n+-f::\n+--force::\n+\tProceed even if the index or the working tree differs from\n+\tHEAD. This is used to throw away local changes.\n+\n+--[no-]progress::\n+\tProgress status is reported on the standard error stream\n+\tby default when it is attached to a terminal, unless `--quiet`\n+\tis specified. This flag enables progress reporting even if not\n+\tattached to a terminal, regardless of `--quiet`.\n+\n+-t::\n+--track::\n+\tWhen creating a new branch, set up \"upstream\" configuration.\n+\t`-c` is implied. See \"--track\" in linkgit:git-branch[1] for\n+\tdetails.\n++\n+If no `-c` option is given, the name of the new branch will be derived\n+from the remote-tracking branch, by looking at the local part of the\n+refspec configured for the corresponding remote, and then stripping\n+the initial part up to the \"*\". This would tell us to use \"hack\" as\n+the local branch when branching off of \"origin/hack\" (or\n+\"remotes/origin/hack\", or even \"refs/remotes/origin/hack\"). If the\n+given name has no slash, or the above guessing results in an empty\n+name, the guessing is aborted. You can explicitly give a name with\n+`-c` in such a case.\n+\n+--no-track::\n+\tDo not set up \"upstream\" configuration, even if the\n+\tbranch.autoSetupMerge configuration variable is true.\n+\n+-m::\n+--merge::\n+\tIf you have local modifications to one or more files that are\n+\tdifferent between the current branch and the branch to which\n+\tyou are switching, the command refuses to switch branches in\n+\torder to preserve your modifications in context. However,\n+\twith this option, a three-way merge between the current\n+\tbranch, your working tree contents, and the new branch is\n+\tdone, and you will be on the new branch.\n++\n+When a merge conflict happens, the index entries for conflicting\n+paths are left unmerged, and you need to resolve the conflicts\n+and mark the resolved paths with `git add` (or `git rm` if the merge\n+should result in deletion of the path).\n+\n+--conflict=