• N
    restore: take tree-ish from --source option instead · c9c935f6
    Nguyễn Thái Ngọc Duy 提交于
    This is another departure from 'git checkout' syntax, which uses -- to
    separate ref and pathspec. The observation is restore (or "git
    checkout -- <pathspec>") is most often used to restore some files from
    the index. If this is correct, we can simplify it by taking away the
    ref, so that we can write
    
        git restore some-file
    
    without worrying about some-file being a ref and whether we need to do
    
        git restore -- some-file
    
    for safety. If the source of the restore comes from a tree, it will be
    in the form of an option with value, e.g.
    
        git restore --source=this-tree some-file
    
    This is of course longer to type than using "--". But hopefully it
    will not be used as often, and it is clearly easier to understand.
    
    dwim_new_local_branch is no longer set (or unset) in cmd_restore_files()
    because it's irrelevant because we don't really care about dwim-ing.
    With accept_ref being unset, dwim can't happen.
    Signed-off-by: NNguyễn Thái Ngọc Duy <pclouds@gmail.com>
    Signed-off-by: NJunio C Hamano <gitster@pobox.com>
    c9c935f6
checkout.c 49.0 KB