diff options
| author | Junio C Hamano <junkio@cox.net> | 2006-05-06 14:42:08 -0700 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2006-05-06 14:42:59 -0700 |
| commit | c66b6c067e49c5ec80f1254daef79aa1c7f5ffce (patch) | |
| tree | 48367903de59ddef7aea7c8f20da4e07243e8d44 /diff-delta.c | |
| parent | 8ac80a5701780547404523a84f4b1ae67bfa6823 (diff) | |
| parent | bd886fd3ea49b726493255d4adf5d20b31681713 (diff) | |
| download | git-c66b6c067e49c5ec80f1254daef79aa1c7f5ffce.tar.gz | |
Merge branch 'master' into js/fmt-patch
* master: (109 commits)
t1300-repo-config: two new config parsing tests.
Another config file parsing fix.
update-index: plug memory leak from prefix_path()
checkout-index: plug memory leak from prefix_path()
update-index --unresolve: work from a subdirectory.
pack-object: squelch eye-candy on non-tty
core.prefersymlinkrefs: use symlinks for .git/HEAD
repo-config: trim white-space before comment
Fix for config file section parsing.
Clarify git-cherry documentation.
Update git-unpack-objects documentation.
Fix up docs where "--" isn't displayed correctly.
Several trivial documentation touch ups.
git-svn 1.0.0
git-svn: documentation updates
delta: stricter constness
Makefile: do not link rev-list any specially.
builtin-push: --all and --tags _are_ explicit refspecs
builtin-log/whatchanged/show: make them official.
show-branch: omit uninteresting merges.
...
Diffstat (limited to 'diff-delta.c')
| -rw-r--r-- | diff-delta.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/diff-delta.c b/diff-delta.c index 1188b31cd0..5bc22047f8 100644 --- a/diff-delta.c +++ b/diff-delta.c @@ -131,8 +131,8 @@ static struct index ** delta_index(const unsigned char *buf, /* the maximum size for any opcode */ #define MAX_OP_SIZE COPYOP_SIZE(0xffffffff, 0xffffffff) -void *diff_delta(void *from_buf, unsigned long from_size, - void *to_buf, unsigned long to_size, +void *diff_delta(const void *from_buf, unsigned long from_size, + const void *to_buf, unsigned long to_size, unsigned long *delta_size, unsigned long max_size) { |