diff options
| author | Junio C Hamano <junkio@cox.net> | 2006-03-01 22:08:12 -0800 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2006-03-01 22:08:12 -0800 |
| commit | b485db9896654b11c8a7bf64fd5cc3d0d8dc5b69 (patch) | |
| tree | 4b6a563b4e3dd22a1e5257bdcffac399370b096b /test-delta.c | |
| parent | 09a278e6b906d3902f3b75ec183a06b0c029d27b (diff) | |
| parent | 38fd0721d0a2a1a723bc28fc0817e3571987b1ef (diff) | |
| download | git-b485db9896654b11c8a7bf64fd5cc3d0d8dc5b69.tar.xz | |
Merge branch 'np/delta' into next
* np/delta:
diff-delta: allow reusing of the reference buffer index
diff-delta: bound hash list length to avoid O(m*n) behavior
diff-delta: produce optimal pack data
Merge branch 'kh/svnimport'
Merge branch 'js/refs'
annotate: fix -S parameter to take a string
annotate: Add a basic set of test cases.
annotate: handle \No newline at end of file.
gitview: Use horizontal scroll bar in the tree view
Diffstat (limited to 'test-delta.c')
| -rw-r--r-- | test-delta.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/test-delta.c b/test-delta.c index 1be8ee0c72..89eb68ed21 100644 --- a/test-delta.c +++ b/test-delta.c @@ -63,7 +63,7 @@ int main(int argc, char *argv[]) if (argv[1][1] == 'd') out_buf = diff_delta(from_buf, from_size, data_buf, data_size, - &out_size, 0); + &out_size, 0, NULL); else out_buf = patch_delta(from_buf, from_size, data_buf, data_size, |