Skip to content

Add new command 'restore'

Nguyễn Thái Ngọc Duy git 3 versions – In review

Get series with b4
b4 am [email protected]

Versions newest first · linked by author and title

  1. v3 Latest16 patches 6 repliesIn review
  2. v216 patches 7 repliesSuperseded
  3. v111 patches 38 repliesSuperseded

Patches in v3 No applies recorded yet

#Subject and filesSizeRepliesApplied
1/16checkout: split part of it to new command 'restore'.gitignore Documentation/config/interactive.txt Documentation/git-checkout.txt +10 more+257 -50 replies
2/16restore: take tree-ish from --source option insteadbuiltin/checkout.c+34 -80 replies
3/16restore: make pathspec mandatorybuiltin/checkout.c+7 -00 replies
4/16restore: disable overlay mode by defaultbuiltin/checkout.c+7 -40 replies
5/16checkout: factor out worktree checkout codebuiltin/checkout.c+59 -490 replies
6/16restore: add --worktree and --stagedbuiltin/checkout.c+68 -60 replies
7/16restore: reject invalid combinations with --stagedbuiltin/checkout.c+10 -00 replies
8/16restore: default to --source=HEAD when only --staged is specifiedbuiltin/checkout.c+6 -00 replies
9/16restore: replace --force with --ignore-unmergedbuiltin/checkout.c+20 -90 replies
10/16restore: support --patchbuiltin/checkout.c git-add--interactive.perl+56 -20 replies
11/16t: add tests for restoret/lib-patch-mode.sh t/t2070-restore.sh t/t2071-restore-patch.sh+221 -01 reply
12/16completion: support restorecontrib/completion/git-completion.bash+15 -00 replies
13/16user-manual.txt: prefer 'merge --abort' over 'reset --hard'Documentation/user-manual.txt+1 -10 replies
14/16doc: promote "git restore"Documentation/git-clean.txt Documentation/git-commit.txt Documentation/git-format-patch.txt +13 more+93 -840 replies
15/16help: move git-diff and git-reset to different groupscommand-list.txt+2 -20 replies
16/16Declare both git-switch and git-restore experimentalDocumentation/git-restore.txt Documentation/git-switch.txt+4 -00 replies

Reviews trailers per patch

No Reviewed-by, Acked-by or Tested-by trailers for v3 yet.

Read the v3 thread

Cover letter [PATCH v3 00/16] Add new command 'restore'

v3 changes are really small

- gitcli.txt is updated to mention the --staged/--worktree pair, in comparison to --cached/--index which is also mention there.

- The patch 'rm --staged' is dropped. It could come back. But if it does, it should be in a series where commands that take --cached/--index will now take both --staged/--worktree. Those are 'rm', 'apply', 'check-attr', 'grep', 'diff' and maybe 'ls-files'.

In other words we support --staged/--worktree everywhere while --cached/--index still remains because of muscle memory. This is of course only a good move if --staged/--worktree is much better than --cached/--index.

- Since there's a chance this series may end up in 'master' and get released, and I'm still worried that I screwed up somewhere, the last patch declares the two commands experimental for maybe one or two release cycles.

If the reception is good, we revert that patch. If something horrible is found, we can still change the default behavior without anybody yelling at us. Or worst case scenario, we remove both commands and declare a failed experiment.

PS. the intent-to-add support is still not in. But it should be in before the experimental status is removed.

Nguyễn Thái Ngọc Duy (16):
checkout: split part of it to new command 'restore'
restore: take tree-ish from --source option instead
restore: make pathspec mandatory
restore: disable overlay mode by default
checkout: factor out worktree checkout code
restore: add --worktree and --staged
restore: reject invalid combinations with --staged
restore: default to --source=HEAD when only --staged is specified
restore: replace --force with --ignore-unmerged
restore: support --patch
t: add tests for restore
completion: support restore
user-manual.txt: prefer 'merge --abort' over 'reset --hard'
doc: promote "git restore"
help: move git-diff and git-reset to different groups Declare both git-switch and git-restore experimental

 .gitignore                             |   1 +
 Documentation/config/interactive.txt   |   3 +-
 Documentation/git-checkout.txt         |   3 +-
 Documentation/git-clean.txt            |   2 +-
 Documentation/git-commit.txt           |   2 +-
 Documentation/git-format-patch.txt     |   2 +-
 Documentation/git-reset.txt            |  13 +-
 Documentation/git-restore.txt (new)    | 185 +++++++++++++++
 Documentation/git-revert.txt           |   7 +-
 Documentation/git-switch.txt           |   2 +
 Documentation/git.txt                  |  20 ++
 Documentation/gitcli.txt               |  16 +-
 Documentation/giteveryday.txt          |   5 +-
 Documentation/gittutorial-2.txt        |   4 +-
 Documentation/gittutorial.txt          |   2 +-
 Documentation/user-manual.txt          |  14 +-
 Makefile                               |   1 +
 builtin.h                              |   1 +
 builtin/checkout.c                     | 299 +++++++++++++++++++------
 builtin/clone.c                        |   2 +-
 builtin/commit.c                       |   2 +-
 command-list.txt                       |   7 +-
 contrib/completion/git-completion.bash |  15 ++
 git-add--interactive.perl              |  52 +++++
 git.c                                  |   1 +
 t/lib-patch-mode.sh                    |  12 +
 t/t2070-restore.sh (new +x)            |  99 ++++++++
 t/t2071-restore-patch.sh (new +x)      | 110 +++++++++
 t/t7508-status.sh                      |  82 +++----
 t/t7512-status-help.sh                 |  20 +-
 wt-status.c                            |  26 ++-
 31 files changed, 850 insertions(+), 160 deletions(-)
 create mode 100644 Documentation/git-restore.txt
 create mode 100755 t/t2070-restore.sh
 create mode 100755 t/t2071-restore-patch.sh

Range-diff dựa trên v2:
1: 41788fc2d2 ! 1: 0d5ea2b7fe checkout: split part of it to new command 'restore'
@@ -342,6 +342,29 @@
Low-level commands (plumbing)
-----------------------------

+ diff --git a/Documentation/gitcli.txt b/Documentation/gitcli.txt
+ --- a/Documentation/gitcli.txt
+ +++ b/Documentation/gitcli.txt
+@@
+ http://marc.info/?l=git&m=119150393620273 for further
+ information.
+
++Some other commands that also work on files in the working tree and/or ++in the index can take --staged and/or --worktree.
++
++* --staged is exactly like --cached, which is used to ask a ++ command to only work on the index, not the working tree. ++
++* --worktree is the opposite, to ask a command to work on the ++ working tree only, not the index.
++
++* The two options can be specified together to ask a command to work ++ on both the index and the working tree.
++
+ GIT
+ ---
+ Part of the linkgit:git[1] suite
+
diff --git a/Makefile b/Makefile
--- a/Makefile
+++ b/Makefile

 2:  253dfb42ae =  2:  c3c6e7762a restore: take tree-ish from --source option instead
 3:  0266c4d982 =  3:  0fbf963e7d restore: make pathspec mandatory
 4:  ae4dd4c24e =  4:  2509bebf32 restore: disable overlay mode by default
 5:  c51dd232c0 =  5:  206c507f7d checkout: factor out worktree checkout code
 6:  6b19ddb1b3 =  6:  656bfcd659 restore: add --worktree and --staged
 7:  3f1031cc23 =  7:  f2d3aa1027 restore: reject invalid combinations with --staged
 8:  d6d9bed95c =  8:  57efad405d restore: default to --source=HEAD when only --staged is specified
 9:  fca91f3cca =  9:  3c6b32c223 restore: replace --force with --ignore-unmerged
10:  079273e2df = 10:  6665d7523b restore: support --patch
11:  9d28d167fa = 11:  d7bda0c0cc t: add tests for restore
12:  acd490f8b0 = 12:  e4622aff3d completion: support restore
13:  336a7d8921 = 13:  787b0e485e user-manual.txt: prefer 'merge --abort' over 'reset --hard'
14:  3b81b27255 = 14:  0df020c2c8 doc: promote "git restore"
15:  ce7e890524 <  -:  ---------- rm: add --staged as alias for --cached
16:  763aa1d6f1 = 15:  3302b1b0e1 help: move git-diff and git-reset to different groups
 -:  ---------- > 16:  ffeea858a7 Declare both git-switch and git-restore experimental
Signature · 1 line
2.21.0.854.ge34a79f761