Web lists-archives.com

Re: [PATCH v1 01/11] checkout: split part of it to new command 'restore'




Hi Duy,

On Fri, 8 Mar 2019, Nguyễn Thái Ngọc Duy wrote:

> diff --git a/Documentation/git-restore.txt b/Documentation/git-restore.txt
> new file mode 100644
> index 0000000000..a667a5ced4
> --- /dev/null
> +++ b/Documentation/git-restore.txt
> @@ -0,0 +1,172 @@
> [...]
> +
> +To restore all files in the current directory
> +
> +------------
> +$ git restore .
> +------------
> +
> +or to restore all working tree files with 'top' pathspec magic (see
> +linkgit::gitglossary[7])

This has an extra colon, breaking the build:

https://dev.azure.com/git/git/_build/results?buildId=386

You need this squashed in:

diff --git a/Documentation/git-restore.txt b/Documentation/git-restore.txt
index a667a5ced4ec..1faeee50593e 100644
--- a/Documentation/git-restore.txt
+++ b/Documentation/git-restore.txt
@@ -144,7 +144,7 @@ $ git restore .
 ------------
 
 or to restore all working tree files with 'top' pathspec magic (see
-linkgit::gitglossary[7])
+linkgit:gitglossary[7])
 
 ------------
 $ git restore :/

Junio, could you please put this as a SQUASH??? on top of
nd/switch-and-restore, to unbreak the CI builds?

Thanks,
Dscho