| Message ID | 20190130094831.10420-1-pclouds@gmail.com (mailing list archive) |
|---|---|
| Headers | show |
| Series | Add new command "switch" | expand |
On Wed, Jan 30, 2019 at 04:48:12PM +0700, Nguyễn Thái Ngọc Duy wrote: > The > only one left is adding options similar to "git reset" (but with > better names this time than --soft and --hard, hopefully). Oh no, what for?! As the commit message or patch 19/19 'doc: promote "git switch"' states: The new command "git switch" is added to avoid the confusion of one-command-do-all "git checkout" for new users. Adding '--soft|--hard' from 'git reset' would go in the opposite direction.
On Thu, Jan 31, 2019 at 8:37 PM SZEDER Gábor <szeder.dev@gmail.com> wrote: > > On Wed, Jan 30, 2019 at 04:48:12PM +0700, Nguyễn Thái Ngọc Duy wrote: > > The > > only one left is adding options similar to "git reset" (but with > > better names this time than --soft and --hard, hopefully). > > Oh no, what for?! As the commit message or patch 19/19 'doc: promote > "git switch"' states: > > The new command "git switch" is added to avoid the confusion of > one-command-do-all "git checkout" for new users. > > Adding '--soft|--hard' from 'git reset' would go in the opposite > direction. If it's about the confusion, I think we can avoid it. If it's about the one-command-do-all, I think it still fits in the main topic of git-switch, which is about switching. But in git-reset case it's switching HEAD, not a normal branch. What I have in mind so far is this, let's see if it's so bad so I can find another direction. git switch --reset-branch [--keep-index] [--keep-worktree] [<commit>] This updates worktree and index to <commit> and "rewinds" the current branch to <commit>. If either of those --keep-* is given, that part will be left untouched. So "git reset --hard" is the same as "git switch --reset-branch", --soft "--reset-branch --keep-index --keep-worktree" and --mixed "--reset-branch --keep-worktree". I've been updating docs with this new format to see what it looks like and I think it expresses the idea behind git-reset much better.
Nguyễn Thái Ngọc Duy <pclouds@gmail.com> writes: > This is the first half of the previous "switch-branch and > restore-files" RFC series [1]. I only focus on switch-branch for now > because it's already getting long and I still have some work to do on > restore-files. Exciting ;-) This will probably become the best UI improvement in the past few years.
Duy Nguyen <pclouds@gmail.com> writes: >> Adding '--soft|--hard' from 'git reset' would go in the opposite >> direction. > > If it's about the confusion, I think we can avoid it. If it's about > the one-command-do-all, I think it still fits in the main topic of > git-switch, which is about switching. But in git-reset case it's > switching HEAD, not a normal branch. I do not think "switch branch" should update HEAD for the branch. Let it be handled by "reset" (or "branch -f that-other-branch"). I personally did not have "it is way too overloaded" problem with "checkout", but it turns out that many others found it so. You'll see the same happen for your "switch" if you do not resist temptation to add unrelated things (or things you may find related but you see others find unrelated even in this early discussion).
On Fri, Feb 1, 2019 at 1:23 AM Junio C Hamano <gitster@pobox.com> wrote: > > Duy Nguyen <pclouds@gmail.com> writes: > > >> Adding '--soft|--hard' from 'git reset' would go in the opposite > >> direction. > > > > If it's about the confusion, I think we can avoid it. If it's about > > the one-command-do-all, I think it still fits in the main topic of > > git-switch, which is about switching. But in git-reset case it's > > switching HEAD, not a normal branch. > > I do not think "switch branch" should update HEAD for the branch. > Let it be handled by "reset" (or "branch -f that-other-branch"). It can already, it's simply a shortcut for "git switch --force-create <current-branch> -f <commit>" (or "git checkout -fB <current-branch> <commit>"), at least for --hard. --mixed and --soft is just a different variant of "-f". > I personally did not have "it is way too overloaded" problem with > "checkout", but it turns out that many others found it so. You'll > see the same happen for your "switch" if you do not resist > temptation to add unrelated things (or things you may find related > but you see others find unrelated even in this early discussion). The thing about git-reset is it's also overloaded with updating things other than HEAD. All the pathspec form is the same as checkout/restore (except checkout updates both index/worktree while reset is more about index; but restore can cover all index/worktree combination). But yeah maybe just leave it for now. While trying to document the new option in switch to replace reset, the verb "rewind" (the tip of the current branch) seems fitting well. I might revisit this topic with git-rewind or something.
This is the first half of the previous "switch-branch and restore-files" RFC series [1]. I only focus on switch-branch for now because it's already getting long and I still have some work to do on restore-files. The command is, as the name implies, for switching branches. And it's supposed to be a (hopefully better) alternative for "git checkout". Head to 08/19 for the man page, which describes the command (with examples!) better than I do here. I think I've addressed most of the issues from the last round. The only one left is adding options similar to "git reset" (but with better names this time than --soft and --hard, hopefully). I think that could be done in a follow-up series. For a complete picture, you would need to consider "git restore" too (the new name of "git restore-files"). Full series is available [2] though I still need to work on the "restore from a tree" part of that command and thinking whether "restore -p" vs "reset -p" could be confusing... This series is built on top of master + tg/checkout-no-overlay. PS. One of the things I like about this, after using it for some time, is the "no ambiguation" UI design gives better completion support (much less useless completion candidates), which makes life much better. [1] https://public-inbox.org/git/20181129215850.7278-1-pclouds@gmail.com/ [2] https://gitlab.com/pclouds/git/commits/switch-and-restore Nguyễn Thái Ngọc Duy (19): git-checkout.txt: fix one syntax line doc: document --overwrite-ignore t: rename t2014-switch.sh to t2014-checkout-switch.sh checkout: factor out some code in parse_branchname_arg() checkout: make "opts" in cmd_checkout() a pointer checkout: move 'confict_style' and 'dwim_..' to checkout_opts checkout: split options[] array in three pieces checkout: split part of it to new command switch switch: better names for -b and -B switch: remove -l switch: stop accepting pathspec switch: reject "do nothing" case switch: only allow explicit detached HEAD switch: add short option for --detach switch: no implicit dwim, use --guess to dwim switch: no worktree status unless real branch switch happens t: add tests for switch completion: support switch doc: promote "git switch" .gitignore | 1 + Documentation/config/advice.txt | 13 +- Documentation/config/branch.txt | 4 +- Documentation/config/checkout.txt | 17 +- Documentation/config/diff.txt | 3 +- Documentation/git-branch.txt | 8 +- Documentation/git-check-ref-format.txt | 3 +- Documentation/git-checkout.txt | 48 +- Documentation/git-format-patch.txt | 2 +- Documentation/git-merge-base.txt | 2 +- Documentation/git-merge.txt | 4 + Documentation/git-rebase.txt | 2 +- Documentation/git-remote.txt | 2 +- Documentation/git-rerere.txt | 10 +- Documentation/git-reset.txt | 20 +- Documentation/git-stash.txt | 9 +- Documentation/git-switch.txt | 236 +++++++++ Documentation/gitattributes.txt | 3 +- Documentation/gitcore-tutorial.txt | 18 +- Documentation/giteveryday.txt | 24 +- Documentation/githooks.txt | 8 +- Documentation/gittutorial.txt | 4 +- Documentation/revisions.txt | 2 +- Documentation/user-manual.txt | 52 +- Makefile | 1 + advice.c | 11 +- builtin.h | 1 + builtin/checkout.c | 464 +++++++++--------- builtin/clone.c | 2 +- command-list.txt | 1 + contrib/completion/git-completion.bash | 26 + git.c | 1 + parse-options-cb.c | 17 + parse-options.h | 3 +- sha1-name.c | 2 +- t/t1090-sparse-checkout-scope.sh | 14 - ...014-switch.sh => t2014-checkout-switch.sh} | 0 t/t2020-checkout-detach.sh | 4 +- t/t2060-switch.sh | 91 ++++ 39 files changed, 770 insertions(+), 363 deletions(-) create mode 100644 Documentation/git-switch.txt rename t/{t2014-switch.sh => t2014-checkout-switch.sh} (100%) create mode 100755 t/t2060-switch.sh