kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity

diff-format.adoc: mode and hash are 0* for unmerged paths from index only 

In the "Raw output format" section, we mention that the 'mode' and
'sha1' for "src" and "dst" are 0* if "(creation|deletion) or unmerged".
For unmerged entries, 'mode' and 'sha1' are in fact 0* only when we are
looking at the index, i.e. on the left side for 'git diff-files' and on
the right side for 'git diff-index --cached'. Be more precise by
mentioning this, and while at it uniformize the wording of the "work
tree out of sync with the index" case.

Signed-off-by: Philippe Blain <levraiphilippeblain@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
main
Philippe Blain 2026-05-15 15:48:11 +00:00 committed by Junio C Hamano
parent 4cd5d8a3c8
commit 6d09e798bc
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Documentation/diff-format.adoc
View File

@ -37,13 +37,13 @@ unmerged :000000 000000 0000000 0000000 U file6
That is, from the left to the right:

. a colon.
. mode for "src"; 000000 if creation or unmerged.
. mode for "src"; 000000 if creation, or if "src" is from the index and is unmerged.
. a space.
. mode for "dst"; 000000 if deletion or unmerged.
. mode for "dst"; 000000 if deletion, or if "dst" is from the index and is unmerged.
. a space.
. sha1 for "src"; 0\{40\} if creation or unmerged.
. sha1 for "src"; 0\{40\} if creation, or if "src" is from the index and is unmerged.
. a space.
. sha1 for "dst"; 0\{40\} if deletion, unmerged or "work tree out of sync with the index".
. sha1 for "dst"; 0\{40\} if deletion, if "dst" is from the index and is unmerged, or if "dst" is from the work tree and is out of sync with the index.
. a space.
. status, followed by optional "score" number.
. a tab or a NUL when `-z` option is used.