Merge branch 'bc/hash-transition-16'
Conversion from unsigned char[20] to struct object_id continues. * bc/hash-transition-16: (35 commits) gitweb: make hash size independent Git.pm: make hash size independent read-cache: read data in a hash-independent way dir: make untracked cache extension hash size independent builtin/difftool: use parse_oid_hex refspec: make hash size independent archive: convert struct archiver_args to object_id builtin/get-tar-commit-id: make hash size independent get-tar-commit-id: parse comment record hash: add a function to lookup hash algorithm by length remote-curl: make hash size independent http: replace sha1_to_hex http: compute hash of downloaded objects using the_hash_algo http: replace hard-coded constant with the_hash_algo http-walker: replace sha1_to_hex http-push: remove remaining uses of sha1_to_hex http-backend: allow 64-character hex names http-push: convert to use the_hash_algo builtin/pull: make hash-size independent builtin/am: make hash size independent ...
This commit is contained in:
@ -29,6 +29,13 @@
|
||||
*/
|
||||
#define NO_DELTA S_ISUID
|
||||
|
||||
/*
|
||||
* The amount of additional space required in order to write an object into the
|
||||
* current pack. This is the hash lengths at the end of the pack, plus the
|
||||
* length of one object ID.
|
||||
*/
|
||||
#define PACK_SIZE_THRESHOLD (the_hash_algo->rawsz * 3)
|
||||
|
||||
struct object_entry {
|
||||
struct pack_idx_entry idx;
|
||||
struct object_entry *next;
|
||||
@ -742,7 +749,8 @@ static const char *create_index(void)
|
||||
if (c != last)
|
||||
die("internal consistency error creating the index");
|
||||
|
||||
tmpfile = write_idx_file(NULL, idx, object_count, &pack_idx_opts, pack_data->sha1);
|
||||
tmpfile = write_idx_file(NULL, idx, object_count, &pack_idx_opts,
|
||||
pack_data->hash);
|
||||
free(idx);
|
||||
return tmpfile;
|
||||
}
|
||||
@ -753,7 +761,7 @@ static char *keep_pack(const char *curr_index_name)
|
||||
struct strbuf name = STRBUF_INIT;
|
||||
int keep_fd;
|
||||
|
||||
odb_pack_name(&name, pack_data->sha1, "keep");
|
||||
odb_pack_name(&name, pack_data->hash, "keep");
|
||||
keep_fd = odb_pack_keep(name.buf);
|
||||
if (keep_fd < 0)
|
||||
die_errno("cannot create keep file");
|
||||
@ -761,11 +769,11 @@ static char *keep_pack(const char *curr_index_name)
|
||||
if (close(keep_fd))
|
||||
die_errno("failed to write keep file");
|
||||
|
||||
odb_pack_name(&name, pack_data->sha1, "pack");
|
||||
odb_pack_name(&name, pack_data->hash, "pack");
|
||||
if (finalize_object_file(pack_data->pack_name, name.buf))
|
||||
die("cannot store pack file");
|
||||
|
||||
odb_pack_name(&name, pack_data->sha1, "idx");
|
||||
odb_pack_name(&name, pack_data->hash, "idx");
|
||||
if (finalize_object_file(curr_index_name, name.buf))
|
||||
die("cannot store index file");
|
||||
free((void *)curr_index_name);
|
||||
@ -779,7 +787,7 @@ static void unkeep_all_packs(void)
|
||||
|
||||
for (k = 0; k < pack_id; k++) {
|
||||
struct packed_git *p = all_packs[k];
|
||||
odb_pack_name(&name, p->sha1, "keep");
|
||||
odb_pack_name(&name, p->hash, "keep");
|
||||
unlink_or_warn(name.buf);
|
||||
}
|
||||
strbuf_release(&name);
|
||||
@ -821,9 +829,9 @@ static void end_packfile(void)
|
||||
|
||||
close_pack_windows(pack_data);
|
||||
finalize_hashfile(pack_file, cur_pack_oid.hash, 0);
|
||||
fixup_pack_header_footer(pack_data->pack_fd, pack_data->sha1,
|
||||
pack_data->pack_name, object_count,
|
||||
cur_pack_oid.hash, pack_size);
|
||||
fixup_pack_header_footer(pack_data->pack_fd, pack_data->hash,
|
||||
pack_data->pack_name, object_count,
|
||||
cur_pack_oid.hash, pack_size);
|
||||
|
||||
if (object_count <= unpack_limit) {
|
||||
if (!loosen_small_pack(pack_data)) {
|
||||
@ -948,8 +956,9 @@ static int store_object(
|
||||
git_deflate_end(&s);
|
||||
|
||||
/* Determine if we should auto-checkpoint. */
|
||||
if ((max_packsize && (pack_size + 60 + s.total_out) > max_packsize)
|
||||
|| (pack_size + 60 + s.total_out) < pack_size) {
|
||||
if ((max_packsize
|
||||
&& (pack_size + PACK_SIZE_THRESHOLD + s.total_out) > max_packsize)
|
||||
|| (pack_size + PACK_SIZE_THRESHOLD + s.total_out) < pack_size) {
|
||||
|
||||
/* This new object needs to *not* have the current pack_id. */
|
||||
e->pack_id = pack_id + 1;
|
||||
@ -1044,8 +1053,9 @@ static void stream_blob(uintmax_t len, struct object_id *oidout, uintmax_t mark)
|
||||
int status = Z_OK;
|
||||
|
||||
/* Determine if we should auto-checkpoint. */
|
||||
if ((max_packsize && (pack_size + 60 + len) > max_packsize)
|
||||
|| (pack_size + 60 + len) < pack_size)
|
||||
if ((max_packsize
|
||||
&& (pack_size + PACK_SIZE_THRESHOLD + len) > max_packsize)
|
||||
|| (pack_size + PACK_SIZE_THRESHOLD + len) < pack_size)
|
||||
cycle_packfile();
|
||||
|
||||
hashfile_checkpoint(pack_file, &checkpoint);
|
||||
@ -1240,7 +1250,7 @@ static void load_tree(struct tree_entry *root)
|
||||
c += e->name->str_len + 1;
|
||||
hashcpy(e->versions[0].oid.hash, (unsigned char *)c);
|
||||
hashcpy(e->versions[1].oid.hash, (unsigned char *)c);
|
||||
c += GIT_SHA1_RAWSZ;
|
||||
c += the_hash_algo->rawsz;
|
||||
}
|
||||
free(buf);
|
||||
}
|
||||
@ -1287,7 +1297,7 @@ static void mktree(struct tree_content *t, int v, struct strbuf *b)
|
||||
strbuf_addf(b, "%o %s%c",
|
||||
(unsigned int)(e->versions[v].mode & ~NO_DELTA),
|
||||
e->name->str_dat, '\0');
|
||||
strbuf_add(b, e->versions[v].oid.hash, GIT_SHA1_RAWSZ);
|
||||
strbuf_add(b, e->versions[v].oid.hash, the_hash_algo->rawsz);
|
||||
}
|
||||
}
|
||||
|
||||
@ -2036,7 +2046,9 @@ static uintmax_t do_change_note_fanout(
|
||||
unsigned int i, tmp_hex_oid_len, tmp_fullpath_len;
|
||||
uintmax_t num_notes = 0;
|
||||
struct object_id oid;
|
||||
char realpath[60];
|
||||
/* hex oid + '/' between each pair of hex digits + NUL */
|
||||
char realpath[GIT_MAX_HEXSZ + ((GIT_MAX_HEXSZ / 2) - 1) + 1];
|
||||
const unsigned hexsz = the_hash_algo->hexsz;
|
||||
|
||||
if (!root->tree)
|
||||
load_tree(root);
|
||||
@ -2056,7 +2068,7 @@ static uintmax_t do_change_note_fanout(
|
||||
* of 2 chars.
|
||||
*/
|
||||
if (!e->versions[1].mode ||
|
||||
tmp_hex_oid_len > GIT_SHA1_HEXSZ ||
|
||||
tmp_hex_oid_len > hexsz ||
|
||||
e->name->str_len % 2)
|
||||
continue;
|
||||
|
||||
@ -2070,7 +2082,7 @@ static uintmax_t do_change_note_fanout(
|
||||
tmp_fullpath_len += e->name->str_len;
|
||||
fullpath[tmp_fullpath_len] = '\0';
|
||||
|
||||
if (tmp_hex_oid_len == GIT_SHA1_HEXSZ && !get_oid_hex(hex_oid, &oid)) {
|
||||
if (tmp_hex_oid_len == hexsz && !get_oid_hex(hex_oid, &oid)) {
|
||||
/* This is a note entry */
|
||||
if (fanout == 0xff) {
|
||||
/* Counting mode, no rename */
|
||||
@ -2348,7 +2360,7 @@ static void note_change_n(const char *p, struct branch *b, unsigned char *old_fa
|
||||
struct object_entry *oe;
|
||||
struct branch *s;
|
||||
struct object_id oid, commit_oid;
|
||||
char path[60];
|
||||
char path[GIT_MAX_RAWSZ * 3];
|
||||
uint16_t inline_data = 0;
|
||||
unsigned char new_fanout;
|
||||
|
||||
@ -2401,7 +2413,7 @@ static void note_change_n(const char *p, struct branch *b, unsigned char *old_fa
|
||||
char *buf = read_object_with_reference(&commit_oid,
|
||||
commit_type, &size,
|
||||
&commit_oid);
|
||||
if (!buf || size < 46)
|
||||
if (!buf || size < the_hash_algo->hexsz + 6)
|
||||
die("Not a valid commit: %s", p);
|
||||
free(buf);
|
||||
} else
|
||||
@ -2452,7 +2464,7 @@ static void file_change_deleteall(struct branch *b)
|
||||
|
||||
static void parse_from_commit(struct branch *b, char *buf, unsigned long size)
|
||||
{
|
||||
if (!buf || size < GIT_SHA1_HEXSZ + 6)
|
||||
if (!buf || size < the_hash_algo->hexsz + 6)
|
||||
die("Not a valid commit: %s", oid_to_hex(&b->oid));
|
||||
if (memcmp("tree ", buf, 5)
|
||||
|| get_oid_hex(buf + 5, &b->branch_tree.versions[1].oid))
|
||||
@ -2551,7 +2563,7 @@ static struct hash_list *parse_merge(unsigned int *count)
|
||||
char *buf = read_object_with_reference(&n->oid,
|
||||
commit_type,
|
||||
&size, &n->oid);
|
||||
if (!buf || size < 46)
|
||||
if (!buf || size < the_hash_algo->hexsz + 6)
|
||||
die("Not a valid commit: %s", from);
|
||||
free(buf);
|
||||
} else
|
||||
@ -2840,7 +2852,7 @@ static void parse_get_mark(const char *p)
|
||||
die("Unknown mark: %s", command_buf.buf);
|
||||
|
||||
xsnprintf(output, sizeof(output), "%s\n", oid_to_hex(&oe->idx.oid));
|
||||
cat_blob_write(output, GIT_SHA1_HEXSZ + 1);
|
||||
cat_blob_write(output, the_hash_algo->hexsz + 1);
|
||||
}
|
||||
|
||||
static void parse_cat_blob(const char *p)
|
||||
@ -2870,6 +2882,8 @@ static struct object_entry *dereference(struct object_entry *oe,
|
||||
{
|
||||
unsigned long size;
|
||||
char *buf = NULL;
|
||||
const unsigned hexsz = the_hash_algo->hexsz;
|
||||
|
||||
if (!oe) {
|
||||
enum object_type type = oid_object_info(the_repository, oid,
|
||||
NULL);
|
||||
@ -2903,12 +2917,12 @@ static struct object_entry *dereference(struct object_entry *oe,
|
||||
/* Peel one layer. */
|
||||
switch (oe->type) {
|
||||
case OBJ_TAG:
|
||||
if (size < GIT_SHA1_HEXSZ + strlen("object ") ||
|
||||
if (size < hexsz + strlen("object ") ||
|
||||
get_oid_hex(buf + strlen("object "), oid))
|
||||
die("Invalid SHA1 in tag: %s", command_buf.buf);
|
||||
break;
|
||||
case OBJ_COMMIT:
|
||||
if (size < GIT_SHA1_HEXSZ + strlen("tree ") ||
|
||||
if (size < hexsz + strlen("tree ") ||
|
||||
get_oid_hex(buf + strlen("tree "), oid))
|
||||
die("Invalid SHA1 in commit: %s", command_buf.buf);
|
||||
}
|
||||
@ -2940,7 +2954,7 @@ static struct object_entry *parse_treeish_dataref(const char **p)
|
||||
return e;
|
||||
}
|
||||
|
||||
static void print_ls(int mode, const unsigned char *sha1, const char *path)
|
||||
static void print_ls(int mode, const unsigned char *hash, const char *path)
|
||||
{
|
||||
static struct strbuf line = STRBUF_INIT;
|
||||
|
||||
@ -2960,7 +2974,7 @@ static void print_ls(int mode, const unsigned char *sha1, const char *path)
|
||||
/* mode SP type SP object_name TAB path LF */
|
||||
strbuf_reset(&line);
|
||||
strbuf_addf(&line, "%06o %s %s\t",
|
||||
mode & ~NO_DELTA, type, sha1_to_hex(sha1));
|
||||
mode & ~NO_DELTA, type, hash_to_hex(hash));
|
||||
quote_c_style(path, &line, NULL, 0);
|
||||
strbuf_addch(&line, '\n');
|
||||
}
|
||||
|
Reference in New Issue
Block a user