git/list[1] front-page[2] threads[3] people[4] search[5] about
 

[PATCH 2/2] git-format-patch: Document format for binary patch

From
Bagas Sanjaya <bagasdotme@gmail.com>
Date
Mar 24, 2021, 12:30 UTC
Message-ID
<20210324123027.29460-3-bagasdotme@gmail.com>
In-Reply-To
<20210324123027.29460-1-bagasdotme@gmail.com>

Document binary file patch formats that are different from text file patch.

Signed-off-by: Bagas Sanjaya <bagasdotme@gmail.com>
---
 Documentation/git-format-patch.txt | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)
diff --git a/Documentation/git-format-patch.txt b/Documentation/git-format-patch.txt
index 247033f8fc..8de172b1f4 100644
--- a/Documentation/git-format-patch.txt
+++ b/Documentation/git-format-patch.txt
@@ -725,6 +725,28 @@ diff format is described as below:
 
 include::diff-generate-patch.txt[]
 
+Binary Files
+~~~~~~~~~~~~
+For binary files, the diff format have some differences compared to text
+files:
+
+1. Object hashes in index header line (`index <hash>..<hash> <mode>`)
+   are always given in full form, as binary patch is designed to be
+   applied only to an exact copy of original file. This is to ensure
+   that such patch don't apply to file with similar name but different
+   hash.
+
+2. There are additional extended header lines specific to binary files:
+
+        GIT binary patch
+        delta <bytes>
+        literal <bytes>
+
+3. The diff body can be either delta or full (literal) content,
+   whichever is the smallest size. It is encoded with base85 algorithm,
+   and emitted in 64 characters each line. All but the last line in
+   the body are prefixed with `z`.
+
 SEE ALSO
 --------
 linkgit:git-am[1], linkgit:git-send-email[1]
-- 
2.25.1
Previous: Junio C HamanoNext: Junio C Hamano
Message 4 of 7 in “Diff format documentation for git-format-patch”
  1. 0/2 Diff format documentation for git-format-patchBagas Sanjaya, Mar 24, 2021
  2. 1/2 git-format-patch: Include diff-generate-patch documentationBagas Sanjaya, Mar 24, 2021
  3. Junio C HamanoMar 24, 2021
  4. 2/2 git-format-patch: Document format for binary patchBagas Sanjaya, Mar 24, 2021
  5. Junio C HamanoMar 24, 2021
  6. Bagas SanjayaMar 25, 2021
  7. Junio C HamanoMar 25, 2021

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.