author | Junio C Hamano <junkio@cox.net> | |
Fri, 5 May 2006 09:41:53 +0000 (02:41 -0700) | ||
committer | Junio C Hamano <junkio@cox.net> | |
Fri, 5 May 2006 22:24:32 +0000 (15:24 -0700) | ||
commit | 0660626caff6ac3745cd7b7908a2ca540141a2ec | |
tree | ff3efcf56efaa6a04d0259164d6bf4ae2ac48ffd | tree | snapshot |
parent | 051308f6e9cebeb76b8fb4f52b7e9e7ce064445c | commit | diff |
binary diff: further updates.
This updates the user interface and generated diff data format.
* "diff --binary" is used to signal that we want an e-mailable
binary patch. It implies --full-index and -p.
* "apply --allow-binary-replacement" acquired a short synonym
"apply --binary".
* After the "GIT binary patch\n" header line there is a token
to record which binary patch mechanism was used, so that we
can extend it later. Currently there are two mechanisms
defined: "literal" and "delta". The former records the
deflated postimage and the latter records the deflated delta
from the preimage to postimage.
For purely implementation convenience, I added the deflated
length after these "literal/delta" tokens (otherwise the
decoding side needs to guess and reallocate the buffer while
inflating). Improvement patches are very welcomed.
Signed-off-by: Junio C Hamano <junkio@cox.net>
This updates the user interface and generated diff data format.
* "diff --binary" is used to signal that we want an e-mailable
binary patch. It implies --full-index and -p.
* "apply --allow-binary-replacement" acquired a short synonym
"apply --binary".
* After the "GIT binary patch\n" header line there is a token
to record which binary patch mechanism was used, so that we
can extend it later. Currently there are two mechanisms
defined: "literal" and "delta". The former records the
deflated postimage and the latter records the deflated delta
from the preimage to postimage.
For purely implementation convenience, I added the deflated
length after these "literal/delta" tokens (otherwise the
decoding side needs to guess and reallocate the buffer while
inflating). Improvement patches are very welcomed.
Signed-off-by: Junio C Hamano <junkio@cox.net>
apply.c | diff | blob | history | |
base85.c | [new file with mode: 0644] | blob |
cache.h | diff | blob | history | |
diff.c | diff | blob | history | |
diff.h | diff | blob | history |