delta/git.git, branch nd/stream-more

update-server-info: respect core.bigfilethreshold

2012-03-07T17:07:39+00:00

This command indirectly calls check_sha1_signature() (add_info_ref ->
deref_tag -> parse_object -> ..) , which may put whole blob in memory
if the blob's size is under core.bigfilethreshold. As config is not
read, the threshold is always 512MB. Respect user settings here.

Signed-off-by: Nguyễn Thái Ngọc Duy 
Signed-off-by: Junio C Hamano

fsck: use streaming API for writing lost-found blobs

2012-03-07T17:07:39+00:00

Signed-off-by: Nguyễn Thái Ngọc Duy 
Signed-off-by: Junio C Hamano

show: use streaming API for showing blobs

2012-03-07T17:07:38+00:00

Signed-off-by: Nguyễn Thái Ngọc Duy 
Signed-off-by: Junio C Hamano

parse_object: avoid putting whole blob in core

2012-03-07T17:07:38+00:00

Traditionally, all the callers of check_sha1_signature() first
called read_sha1_file() to prepare the whole object data in core,
and called this function.  The function is used to revalidate what
we read from the object database actually matches the object name we
used to ask for the data from the object database.

Update the API to allow callers to pass NULL as the object data, and
have the function read and hash the object data using streaming API
to recompute the object name, without having to hold everything in
core at the same time.  This is most useful in parse_object() that
parses a blob object, because this caller does not have to keep the
actual blob data around in memory after a "struct blob" is returned.

Signed-off-by: Nguyễn Thái Ngọc Duy 
Signed-off-by: Junio C Hamano

cat-file: use streaming API to print blobs

2012-03-07T17:07:38+00:00

Signed-off-by: Nguyễn Thái Ngọc Duy 
Signed-off-by: Junio C Hamano

Add more large blob test cases

2012-03-07T17:07:37+00:00

New test cases list commands that should work when memory is
limited. All memory allocation functions (*) learn to reject any
allocation larger than $GIT_ALLOC_LIMIT if set.

(*) Not exactly all. Some places do not use x* functions, but
malloc/calloc directly, notably diff-delta. These code path should
never be run on large blobs.

Signed-off-by: Nguyễn Thái Ngọc Duy 
Signed-off-by: Junio C Hamano

streaming: make streaming-write-entry to be more reusable

2012-03-07T17:07:37+00:00

The static function in entry.c takes a cache entry and streams its blob
contents to a file in the working tree.  Refactor the logic to a new API
function stream_blob_to_fd() that takes an object name and an open file
descriptor, so that it can be reused by other callers.

Signed-off-by: Nguyễn Thái Ngọc Duy 
Signed-off-by: Junio C Hamano

Sync with 1.7.9.3

2012-03-05T22:29:50+00:00

Git 1.7.9.3

2012-03-05T22:29:07+00:00

Signed-off-by: Junio C Hamano

Merge branch 'jc/doc-merge-options' into maint

2012-03-05T22:28:14+00:00

* jc/doc-merge-options:
  Documentation/merge-options.txt: group "ff" related options together