development/git
development/git
1
0
Fork 0
mirror of https://github.com/git/git synced 2024-08-28 03:59:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

Correct packfile edge output in fast-import.

Browse source 
Branches are only contained by a packfile if the branch actually
had its most recent commit in that packfile.  So new branches are
set to MAX_PACK_ID to ensure they don't cause their commit to list
as part of the first packfile when it closes out if the commit was
actually in existance before fast-import started.

Also corrected the type of last_commit to be umaxint_t to prevent
overflow and wraparound on very large imports.  Though that is
highly unlikely to occur as we're talking 4 billion commits, which
no real project has right now.

Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
This commit is contained in:
Shawn O. Pearce 2007-01-17 02:42:43 -05:00
parent fd99224eec
commit 69e74e7412
1 changed files with 15 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
fast-import.c
View file

@ -111,12 +111,15 @@ Format of STDIN stream:
#include "strbuf.h" #include "strbuf.h"
#include "quote.h" #include "quote.h"
#define PACK_ID_BITS 16
#define MAX_PACK_ID ((1<<PACK_ID_BITS)-1)
struct object_entry struct object_entry
{ {
struct object_entry *next; struct object_entry *next;
unsigned long offset; unsigned long offset;
unsigned type : TYPE_BITS; unsigned type : TYPE_BITS;
unsigned pack_id : 16; unsigned pack_id : PACK_ID_BITS;
unsigned char sha1[20]; unsigned char sha1[20];
}; };
@ -193,7 +196,7 @@ struct branch
struct branch *active_next_branch; struct branch *active_next_branch;
const char *name; const char *name;
struct tree_entry branch_tree; struct tree_entry branch_tree;
unsigned long last_commit; uintmax_t last_commit;
unsigned int pack_id; unsigned int pack_id;
unsigned char sha1[20]; unsigned char sha1[20];
}; };
@ -494,6 +497,7 @@ static struct branch* new_branch(const char *name)
b->table_next_branch = branch_table[hc]; b->table_next_branch = branch_table[hc];
b->branch_tree.versions[0].mode = S_IFDIR; b->branch_tree.versions[0].mode = S_IFDIR;
b->branch_tree.versions[1].mode = S_IFDIR; b->branch_tree.versions[1].mode = S_IFDIR;
b->pack_id = MAX_PACK_ID;
branch_table[hc] = b; branch_table[hc] = b;
branch_count++; branch_count++;
return b; return b;
@ -1696,11 +1700,11 @@ static void cmd_new_commit(void)
free(committer); free(committer);
free(msg); free(msg);
store_object(OBJ_COMMIT, if (!store_object(OBJ_COMMIT,
new_data.buffer, sp - (char*)new_data.buffer, new_data.buffer, sp - (char*)new_data.buffer,
NULL, b->sha1, next_mark); NULL, b->sha1, next_mark))
b->pack_id = pack_id;
b->last_commit = object_count_by_type[OBJ_COMMIT]; b->last_commit = object_count_by_type[OBJ_COMMIT];
b->pack_id = pack_id;
if (branch_log) { if (branch_log) {
int need_dq = quote_c_style(b->name, NULL, NULL, 0); int need_dq = quote_c_style(b->name, NULL, NULL, 0);
@ -1807,9 +1811,12 @@ static void cmd_new_tag(void)
free(tagger); free(tagger);
free(msg); free(msg);
store_object(OBJ_TAG, new_data.buffer, sp - (char*)new_data.buffer, if (store_object(OBJ_TAG, new_data.buffer,
NULL, t->sha1, 0); sp - (char*)new_data.buffer,
t->pack_id = pack_id; NULL, t->sha1, 0))
t->pack_id = MAX_PACK_ID;
else
t->pack_id = pack_id;
if (branch_log) { if (branch_log) {
int need_dq = quote_c_style(t->name, NULL, NULL, 0); int need_dq = quote_c_style(t->name, NULL, NULL, 0);