Re: [PATCH 1/3] diff-format.txt: fix ancient copy-paste error

From: Junio C Hamano <gitster@pobox.com>
Date: Jun 13, 2022, 18:23 UTC
Message-ID: <xmqq8rq07795.fsf@gitster.g>
In-Reply-To: <6eaf9b3829fa8f7300bc0123c916d5ffa7c7d80b.1655123383.git.gitgitgadget@gmail.com>

"Philippe Blain via GitGitGadget" <gitgitgadget@gmail.com> writes:

> From: Philippe Blain <levraiphilippeblain@gmail.com>
>
> Fix what is probably a copy-paste error dating back all the way to
> b6d8f309d9 ([PATCH] diff-raw format update take #2., 2005-05-23).

This indeed is an improvement.

"src" can legitimately be "0\{40\}" for a creation patch, e.g. when the stat information is stale, but we can argue that it falls into "look at work tree" case to justify removal of "creation", and use the space to add "deletion".

Show 18 quoted lines

> Signed-off-by: Philippe Blain <levraiphilippeblain@gmail.com>
> ---
>  Documentation/diff-format.txt | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/Documentation/diff-format.txt b/Documentation/diff-format.txt
> index 7a9c3b6ff4c..b8319eeb41d 100644
> --- a/Documentation/diff-format.txt
> +++ b/Documentation/diff-format.txt
> @@ -43,7 +43,7 @@ That is, from the left to the right:
>  . a space.
>  . sha1 for "src"; 0\{40\} if creation or unmerged.
>  . a space.
> -. sha1 for "dst"; 0\{40\} if creation, unmerged or "look at work tree".
> +. sha1 for "dst"; 0\{40\} if deletion, unmerged or "look at work tree".
>  . a space.
>  . status, followed by optional "score" number.
>  . a tab or a NUL when `-z` option is used.