Skip to contentSkip to conversation

doc: restore: remove note on --patch w/ pathspecs

PATCH Superseded Adam Johnson via GitGitGadget 4 participants 6 messages May 5, 2023 – Mar 17, 2025 Documentation

lore
Share & tools
lore

Adam Johnson via GitGitGadget

author
#0 lore raw

PATCH 1/1 doc: restore: remove note on --patch w/ pathspecs

From: Adam Johnson <[email protected]>

This note was added with the command in 46e91b663b (checkout: split part of it to new command 'restore', 2019-04-25), but it is now inaccurate. The underlying builtin add -i implementation, made default in 0527ccb1b5 (add -i: default to the built-in implementation, 2021-11-30), supports pathspecs, so git restore -p <pathspec>... has worked for all users since then. I bisected to verify this was the commit that added support.

Signed-off-by Adam Johnson <[email protected]>

---
doc: restore: remove note on --patch w/ pathspecs

This note was added with the command in 46e91b663b, but it is now inaccurate. The underlying builtin add -i implementation, made default in 0527ccb1b5, does support pathspecs, so git restore -p <pathspec>... has worked for all users since then. I bisected to verify this.

Published-As: https://github.com/gitgitgadget/git/releases/tag/pr-git-1504%2Fadamchainz%2Faj%2Fgit-restore-patch-docs-fix-v1
Fetch-It-Via: git fetch https://github.com/gitgitgadget/git pr-git-1504/adamchainz/aj/git-restore-patch-docs-fix-v1
Pull-Request: https://github.com/git/git/pull/1504

 Documentation/git-restore.txt | 3 ---
 1 file changed, 3 deletions(-)
Documentation/git-restore.txt +0 -3
index 5964810caa4..d31a06a673e 100644
@@ -51,9 +51,6 @@ leave out at most one of `A` and `B`, in which case it defaults to `HEAD`.
 	restore source and the restore location. See the ``Interactive
 	Mode'' section of linkgit:git-add[1] to learn how to operate
 	the `--patch` mode.
-+
-Note that `--patch` can accept no pathspec and will prompt to restore
-all modified paths.
 
 -W::
 --worktree::

base-commit: f285f68a132109c234d93490671c00218066ace9

Signature · 1 line
gitgitgadget
#1 lore raw

Hi, is there anything I can do to help with review?

Quoted 44 lines · Adam Johnson via GitGitGadget

From: Adam Johnson <[email protected]>

This note was added with the command in 46e91b663b (checkout: split part of it to new command 'restore', 2019-04-25), but it is now inaccurate. The underlying builtin add -i implementation, made default in 0527ccb1b5 (add -i: default to the built-in implementation, 2021-11-30), supports pathspecs, so git restore -p <pathspec>... has worked for all users since then. I bisected to verify this was the commit that added support.

Signed-off-by Adam Johnson <[email protected]>

---
doc: restore: remove note on --patch w/ pathspecs

This note was added with the command in 46e91b663b, but it is now inaccurate. The underlying builtin add -i implementation, made default in 0527ccb1b5, does support pathspecs, so git restore -p <pathspec>... has worked for all users since then. I bisected to verify this.

Published-As: https://github.com/gitgitgadget/git/releases/tag/pr-git-1504%2Fadamchainz%2Faj%2Fgit-restore-patch-docs-fix-v1
Fetch-It-Via: git fetch https://github.com/gitgitgadget/git pr-git-1504/adamchainz/aj/git-restore-patch-docs-fix-v1
Pull-Request: https://github.com/git/git/pull/1504

 Documentation/git-restore.txt | 3 ---
 1 file changed, 3 deletions(-)
Documentation/git-restore.txt +0 -3
index 5964810caa4..d31a06a673e 100644
@@ -51,9 +51,6 @@ leave out at most one of `A` and `B`, in which case it defaults to `HEAD`.
        restore source and the restore location. See the ``Interactive
        Mode'' section of linkgit:git-add[1] to learn how to operate
        the `--patch` mode.
-+
-Note that `--patch` can accept no pathspec and will prompt to restore
-all modified paths.
 
 -W::
 --worktree::

base-commit: f285f68a132109c234d93490671c00218066ace9 --
gitgitgadget

#2 lore raw
Quoted 1 line · Adam Johnson

Hi, is there anything I can do to help with review?

One good thing you can do is to ping like you did ;-)

I have been down/sick and will be a bit busy with release work but after that I may find time to review it myself, as it sounds like an easy change. But I'll comment on something I immediately spotted.

Quoted 7 lines
Quoted 4 lines · Adam Johnson via GitGitGadget

From: Adam Johnson <[email protected]>

This note was added with the command in 46e91b663b (checkout: split part of

"command" -> "commit", I think.

author
#3 lore raw

PATCH v2 1/1 doc: restore: remove note on --patch w/ pathspecs

In reply to Adam Johnson via GitGitGadget

From: Adam Johnson <[email protected]>

This note was added with the restore command docs in 46e91b663b (checkout: split part of it to new command 'restore', 2019-04-25), but it is now inaccurate. The underlying builtin add -i implementation, made default in 0527ccb1b5 (add -i: default to the built-in implementation, 2021-11-30), supports pathspecs, so git restore -p <pathspec>... has worked for all users since then. I bisected to verify this was the commit that added support.

Signed-off-by Adam Johnson <[email protected]>

---
doc: restore: remove note on --patch w/ pathspecs

This note was added with the command in 46e91b663b, but it is now inaccurate. The underlying builtin add -i implementation, made default in 0527ccb1b5, does support pathspecs, so git restore -p <pathspec>... has worked for all users since then. I bisected to verify this.

Published-As: https://github.com/gitgitgadget/git/releases/tag/pr-git-1504%2Fadamchainz%2Faj%2Fgit-restore-patch-docs-fix-v2
Fetch-It-Via: git fetch https://github.com/gitgitgadget/git pr-git-1504/adamchainz/aj/git-restore-patch-docs-fix-v2
Pull-Request: https://github.com/git/git/pull/1504

Range-diff vs v1:

1: 784143b9949 ! 1: 556f4323ce6 doc: restore: remove note on --patch w/ pathspecs
@@ Metadata
## Commit message ##
doc: restore: remove note on --patch w/ pathspecs

- This note was added with the command in 46e91b663b (checkout: split part of
- it to new command 'restore', 2019-04-25), but it is now inaccurate. The
- underlying builtin add -i implementation, made default in 0527ccb1b5 (add
- -i: default to the built-in implementation, 2021-11-30), supports pathspecs,
- so git restore -p <pathspec>... has worked for all users since then. I
- bisected to verify this was the commit that added support.
+ This note was added with the restore command docs in 46e91b663b
+ (checkout: split part of it to new command 'restore', 2019-04-25), but it is
+ now inaccurate. The underlying builtin add -i implementation, made default
+ in 0527ccb1b5 (add -i: default to the built-in implementation, 2021-11-30),
+ supports pathspecs, so git restore -p <pathspec>... has worked for all
+ users since then. I bisected to verify this was the commit that added
+ support.

Signed-off-by Adam Johnson <[email protected]>
 Documentation/git-restore.txt | 3 ---
 1 file changed, 3 deletions(-)
Documentation/git-restore.txt +0 -3
index 5964810caa4..d31a06a673e 100644
@@ -51,9 +51,6 @@ leave out at most one of `A` and `B`, in which case it defaults to `HEAD`.
 	restore source and the restore location. See the ``Interactive
 	Mode'' section of linkgit:git-add[1] to learn how to operate
 	the `--patch` mode.
-+
-Note that `--patch` can accept no pathspec and will prompt to restore
-all modified paths.
 
 -W::
 --worktree::

base-commit: f285f68a132109c234d93490671c00218066ace9

Signature · 1 line
gitgitgadget
#4 lore raw

Hi Adam,

Quoted 44 lines · Adam Johnson via GitGitGadget

From: Adam Johnson <[email protected]>

This note was added with the restore command docs in 46e91b663b (checkout: split part of it to new command 'restore', 2019-04-25), but it is now inaccurate. The underlying builtin add -i implementation, made default in 0527ccb1b5 (add -i: default to the built-in implementation, 2021-11-30), supports pathspecs, so git restore -p <pathspec>... has worked for all users since then. I bisected to verify this was the commit that added support.

Signed-off-by Adam Johnson <[email protected]>

---
doc: restore: remove note on --patch w/ pathspecs

This note was added with the command in 46e91b663b, but it is now inaccurate. The underlying builtin add -i implementation, made default in 0527ccb1b5, does support pathspecs, so git restore -p <pathspec>... has worked for all users since then. I bisected to verify this.

Published-As: https://github.com/gitgitgadget/git/releases/tag/pr-git-1504%2Fadamchainz%2Faj%2Fgit-restore-patch-docs-fix-v2
Fetch-It-Via: git fetch https://github.com/gitgitgadget/git pr-git-1504/adamchainz/aj/git-restore-patch-docs-fix-v2
Pull-Request: https://github.com/git/git/pull/1504

Range-diff vs v1:

1: 784143b9949 ! 1: 556f4323ce6 doc: restore: remove note on --patch w/ pathspecs
@@ Metadata
## Commit message ##
doc: restore: remove note on --patch w/ pathspecs

- This note was added with the command in 46e91b663b (checkout: split part of
- it to new command 'restore', 2019-04-25), but it is now inaccurate. The
- underlying builtin add -i implementation, made default in 0527ccb1b5 (add
- -i: default to the built-in implementation, 2021-11-30), supports pathspecs,
- so git restore -p <pathspec>... has worked for all users since then. I
- bisected to verify this was the commit that added support.
+ This note was added with the restore command docs in 46e91b663b
+ (checkout: split part of it to new command 'restore', 2019-04-25), but it is
+ now inaccurate. The underlying builtin add -i implementation, made default
+ in 0527ccb1b5 (add -i: default to the built-in implementation, 2021-11-30),
+ supports pathspecs, so git restore -p <pathspec>... has worked for all
+ users since then. I bisected to verify this was the commit that added
+ support.

Quoted 1 line
Signed-off-by Adam Johnson <[email protected]>

You clearly have addressed Junio's concern, and since the reasoning in the commit message is valid and the diff is trivially correct, this patch should be good to go.

Ciao,
Johannes

Quoted 25 lines


 Documentation/git-restore.txt | 3 ---
 1 file changed, 3 deletions(-)
Documentation/git-restore.txt +0 -3
index 5964810caa4..d31a06a673e 100644
@@ -51,9 +51,6 @@ leave out at most one of `A` and `B`, in which case it defaults to `HEAD`.
 	restore source and the restore location. See the ``Interactive
 	Mode'' section of linkgit:git-add[1] to learn how to operate
 	the `--patch` mode.
-+
-Note that `--patch` can accept no pathspec and will prompt to restore
-all modified paths.
 
 -W::
 --worktree::

base-commit: f285f68a132109c234d93490671c00218066ace9 --
gitgitgadget

#5 lore raw
Quoted 7 lines · Johannes Schindelin

Hi Adam,
...
commit message is valid and the diff is trivially correct, this patch should be good to go.

Ciao,
Johannes

Thanks, both. Will queue.