diff options
author | Junio C Hamano <junkio@cox.net> | 2006-05-05 02:41:53 -0700 |
---|---|---|
committer | Junio C Hamano <junkio@cox.net> | 2006-05-05 15:24:32 -0700 |
commit | 0660626caff6ac3745cd7b7908a2ca540141a2ec (patch) | |
tree | ff3efcf56efaa6a04d0259164d6bf4ae2ac48ffd /cache.h | |
parent | 051308f6e9cebeb76b8fb4f52b7e9e7ce064445c (diff) | |
download | git-0660626caff6ac3745cd7b7908a2ca540141a2ec.tar.gz git-0660626caff6ac3745cd7b7908a2ca540141a2ec.tar.xz |
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>
Diffstat (limited to 'cache.h')
-rw-r--r-- | cache.h | 1 |
1 files changed, 1 insertions, 0 deletions
@@ -365,5 +365,6 @@ extern void setup_pager(void); /* base85 */ int decode_85(char *dst, char *line, int linelen); +void encode_85(char *buf, unsigned char *data, int bytes); #endif /* CACHE_H */ |