undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'np/pack'

Browse Source 
* np/pack:
  t5300: improve SHA1 collision test
  pack-objects: don't include missing preferred base objects
  sha1write: don't copy full sized buffers

Conflicts:
	t/t5300-pack-object.sh
This commit is contained in:
Junio C Hamano 2008-09-18 20:19:30 -07:00
commit c4398286fa
3 changed files with 27 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
builtin-pack-objects.c
View File

@ -1725,6 +1725,14 @@ static void prepare_pack(int window, int depth)
if (entry->type < 0) if (entry->type < 0)
die("unable to get type of object %s", die("unable to get type of object %s",
sha1_to_hex(entry->idx.sha1)); sha1_to_hex(entry->idx.sha1));
} else {
if (entry->type < 0) {
/*
* This object is not found, but we
* don't have to include it anyway.
*/
continue;
}
} }
delta_list[n++] = entry; delta_list[n++] = entry;

27
csum-file.c
View File

@ -11,10 +11,8 @@
#include "progress.h" #include "progress.h"
#include "csum-file.h" #include "csum-file.h"
static void sha1flush(struct sha1file *f, unsigned int count) static void sha1flush(struct sha1file *f, void *buf, unsigned int count)
{ {
void *buf = f->buffer;
for (;;) { for (;;) {
int ret = xwrite(f->fd, buf, count); int ret = xwrite(f->fd, buf, count);
if (ret > 0) { if (ret > 0) {
@ -39,7 +37,7 @@ int sha1close(struct sha1file *f, unsigned char *result, unsigned int flags)
if (offset) { if (offset) {
SHA1_Update(&f->ctx, f->buffer, offset); SHA1_Update(&f->ctx, f->buffer, offset);
sha1flush(f, offset); sha1flush(f, f->buffer, offset);
f->offset = 0; f->offset = 0;
} }
SHA1_Final(f->buffer, &f->ctx); SHA1_Final(f->buffer, &f->ctx);
@ -47,7 +45,7 @@ int sha1close(struct sha1file *f, unsigned char *result, unsigned int flags)
hashcpy(result, f->buffer); hashcpy(result, f->buffer);
if (flags & (CSUM_CLOSE | CSUM_FSYNC)) { if (flags & (CSUM_CLOSE | CSUM_FSYNC)) {
/* write checksum and close fd */ /* write checksum and close fd */
sha1flush(f, 20); sha1flush(f, f->buffer, 20);
if (flags & CSUM_FSYNC) if (flags & CSUM_FSYNC)
fsync_or_die(f->fd, f->name); fsync_or_die(f->fd, f->name);
if (close(f->fd)) if (close(f->fd))
@ -62,21 +60,30 @@ int sha1close(struct sha1file *f, unsigned char *result, unsigned int flags)
int sha1write(struct sha1file *f, void *buf, unsigned int count) int sha1write(struct sha1file *f, void *buf, unsigned int count)
{ {
if (f->do_crc)
f->crc32 = crc32(f->crc32, buf, count);
while (count) { while (count) {
unsigned offset = f->offset; unsigned offset = f->offset;
unsigned left = sizeof(f->buffer) - offset; unsigned left = sizeof(f->buffer) - offset;
unsigned nr = count > left ? left : count; unsigned nr = count > left ? left : count;
void *data;
if (f->do_crc)
f->crc32 = crc32(f->crc32, buf, nr);
if (nr == sizeof(f->buffer)) {
/* process full buffer directly without copy */
data = buf;
} else {
memcpy(f->buffer + offset, buf, nr);
data = f->buffer;
}
memcpy(f->buffer + offset, buf, nr);
count -= nr; count -= nr;
offset += nr; offset += nr;
buf = (char *) buf + nr; buf = (char *) buf + nr;
left -= nr; left -= nr;
if (!left) { if (!left) {
SHA1_Update(&f->ctx, f->buffer, offset); SHA1_Update(&f->ctx, data, offset);
sha1flush(f, offset); sha1flush(f, data, offset);
offset = 0; offset = 0;
} }
f->offset = offset; f->offset = offset;

3
t/t5300-pack-object.sh
View File

@ -272,7 +272,8 @@ test_expect_success \
test_expect_success \ test_expect_success \
'make sure index-pack detects the SHA1 collision' \ 'make sure index-pack detects the SHA1 collision' \
'test_must_fail git index-pack -o bad.idx test-3.pack' 'test_must_fail git index-pack -o bad.idx test-3.pack 2>msg &&
grep "SHA1 COLLISION FOUND" msg'
test_expect_success \ test_expect_success \
'honor pack.packSizeLimit' \ 'honor pack.packSizeLimit' \