On Fri, Feb 1, 2019 at 2:05 AM Junio C Hamano <gitster@xxxxxxxxx> wrote: > > Duy Nguyen <pclouds@xxxxxxxxx> writes: > > > I've changed my mind. I'm not using --index and --cached for "git > > restore" (formerly "git restore-files"). So how about this? > > > > git restore --from=<tree> <pathspec> will update both the index and worktree. > > > > git restore --from=<tree> --keep-index <pathspec> will not update the index > > > > git restore --from=<tree> --keep-worktree <pathspec> will not update worktree > > An action to "restore" with an option to "keep" (i.e. "do not > touch") smells strongly of double negation. We are restoring, > i.e. grabbing something that existed in the past out of another > place (like tree or index) and depositing it to the working tree to > recover its previous state, oh, not but not touching the content of > the working tree (or the index) intact? It is negation (though not double). The thinking was, since "git restore" means restore everything, extra options will amend that to "restore everything except ..." and because the parts to keep are more important (i.e. data loss), highlighting it on the command sounds a bit better to me: "ok i'm going to need to restore this thing, but I want this part and that part to stay the same, let's type the command..." > It would be great if you can come up with phrasing that avoids > specifying what is *not* done, but instructs the command what is to > be done, perhaps along the lines of "restore --index-only", "restore > --worktree-only" and "restore --index-and-worktree (which would be > the default)". My biggest problem with --*-only is that they cannot be combined. There must be an option for every valid combination. I'm still thinking about "git reset" where there are three parts to reset/restore: HEAD, index and worktree. So at least there's another valid combination "reset HEAD but not index nor worktree", which would end becoming another option. This route does not look promising. Of course we could just do --index and --worktree, each option restores the respective part. Then it's combinable (and extensible in the future). But then "git restore" means "git restore --index --worktree" and typing "git restore --index" effectively removes the default "--worktree", which seems a bit twisted. -- Duy
