diff options
| author | Philippe Blain <levraiphilippeblain@gmail.com> | 2022-06-13 12:29:41 +0000 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2022-06-13 11:23:13 -0700 |
| commit | 7922a17d4da969c70d9382206244b6be0a7a3475 (patch) | |
| tree | fe19da2e50ef03f43031b289b0ef7b91c723c058 | |
| parent | Prepare for 2.36.2 (diff) | |
| download | git-7922a17d4da969c70d9382206244b6be0a7a3475.tar.gz git-7922a17d4da969c70d9382206244b6be0a7a3475.zip | |
diff-format.txt: dst can be 0* SHA-1 when path is deleted, too
"dst" can legitimately be "0\{40\}" for a creation patch, e.g. when
the stat information is stale, but it falls into "look at work tree"
case. The original description in b6d8f309 ([PATCH] diff-raw format
update take #2., 2005-05-23) forgot that deletion also makes the
"dst" 0* SHA-1.
Signed-off-by: Philippe Blain <levraiphilippeblain@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| -rw-r--r-- | Documentation/diff-format.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/diff-format.txt b/Documentation/diff-format.txt index 7a9c3b6ff4..b8319eeb41 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. |