delta/git.git/bulk-checkin.c, branch dw/subtree-split-do-not-drop-merge

use xsnprintf for generating git object headers

2015-09-25T17:18:18+00:00

We generally use 32-byte buffers to format git's "type size"
header fields. These should not generally overflow unless
you can produce some truly gigantic objects (and our types
come from our internal array of constant strings). But it is
a good idea to use xsnprintf to make sure this is the case.

Note that we slightly modify the interface to
write_sha1_file_prepare, which nows uses "hdrlen" as an "in"
parameter as well as an "out" (on the way in it stores the
allocated size of the header, and on the way out it returns
the ultimate size of the header).

Signed-off-by: Jeff King 
Signed-off-by: Junio C Hamano

Merge branch 'bc/object-id'

2015-05-06T04:00:23+00:00

Identify parts of the code that knows that we use SHA-1 hash to
name our objects too much, and use (1) symbolic constants instead
of hardcoded 20 as byte count and/or (2) use struct object_id
instead of unsigned char [20] for object names.

* bc/object-id:
  apply: convert threeway_stage to object_id
  patch-id: convert to use struct object_id
  commit: convert parts to struct object_id
  diff: convert struct combine_diff_path to object_id
  bulk-checkin.c: convert to use struct object_id
  zip: use GIT_SHA1_HEXSZ for trailers
  archive.c: convert to use struct object_id
  bisect.c: convert leaf functions to use struct object_id
  define utility functions for object IDs
  define a structure for object IDs

Merge branch 'rs/deflate-init-cleanup'

2015-03-17T23:01:26+00:00

Code simplification.

* rs/deflate-init-cleanup:
  zlib: initialize git_zstream in git_deflate_init{,_gzip,_raw}

bulk-checkin.c: convert to use struct object_id

2015-03-14T05:43:13+00:00

Signed-off-by: brian m. carlson 
Signed-off-by: Junio C Hamano

zlib: initialize git_zstream in git_deflate_init{,_gzip,_raw}

2015-03-05T23:46:03+00:00

Clear the git_zstream variable at the start of git_deflate_init() etc.
so that callers don't have to do that.

Signed-off-by: Rene Scharfe 
Signed-off-by: Junio C Hamano

cleanups: ensure that git-compat-util.h is included first

2014-09-15T19:05:14+00:00

CodingGuidelines states that the first #include in C files should be
git-compat-util.h or another header file that includes it, such as
cache.h or builtin.h.

Signed-off-by: David Aguilar 
Signed-off-by: Junio C Hamano

finish_tmp_packfile():use strbuf for pathname construction

2014-03-03T20:15:10+00:00

The old version fixes a maximum length on the buffer, which could be a problem
if one is not certain of the length of get_object_directory().
Using strbuf can avoid the protential bug.

Helped-by: Michael Haggerty 
Helped-by: Eric Sunshine 
Signed-off-by: Sun He 
Signed-off-by: Junio C Hamano

stream_to_pack: xread does not guarantee to read all requested bytes

2013-08-20T18:20:53+00:00

The deflate loop in bulk-checkin::stream_to_pack expects to get all bytes
from a file that it requests to read in a single function call. But it
used xread(), which does not give that guarantee. Replace it by
read_in_full().

Signed-off-by: Johannes Sixt 
Signed-off-by: Junio C Hamano

bulk-checkin: replace fast-import based implementation

2011-12-01T19:46:09+00:00

This extends the earlier approach to stream a large file directly from the
filesystem to its own packfile, and allows "git add" to send large files
directly into a single pack. Older code used to spawn fast-import, but the
new bulk-checkin API replaces it.

Signed-off-by: Junio C Hamano