kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity

Merge branch 'master' of git://repo.or.cz/git/fastimport 

* 'master' of git://repo.or.cz/git/fastimport:
  fast-import: size_t vs ssize_t
  fix importing of subversion tars
  Don't repack existing objects in fast-import
maint
Junio C Hamano 2007-04-24 22:02:38 -07:00
parent b9d14ffbf1 00be8dcc1a
commit 61397d4b8d
2 changed files with 15 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
contrib/fast-import/import-tars.perl
View File

@ -64,7 +64,12 @@ foreach my $tar_file (@ARGV)
} }
print FI "\n"; print FI "\n";


my $path = "$prefix$name"; my $path;
if ($prefix) {
$path = "$prefix/$name";
} else {
$path = "$name";
}
$files{$path} = [$next_mark++, $mode]; $files{$path} = [$next_mark++, $mode];


$commit_time = $mtime if $mtime > $commit_time; $commit_time = $mtime if $mtime > $commit_time;

10
fast-import.c
View File

@ -673,7 +673,7 @@ static void fixup_header_footer(void)


buf = xmalloc(buf_sz); buf = xmalloc(buf_sz);
for (;;) { for (;;) {
size_t n = xread(pack_fd, buf, buf_sz); ssize_t n = xread(pack_fd, buf, buf_sz);
if (!n) if (!n)
break; break;
if (n < 0) if (n < 0)
@ -904,6 +904,12 @@ static int store_object(
if (e->offset) { if (e->offset) {
duplicate_count_by_type[type]++; duplicate_count_by_type[type]++;
return 1; return 1;
} else if (find_sha1_pack(sha1, packed_git)) {
e->type = type;
e->pack_id = MAX_PACK_ID;
e->offset = 1; /* just not zero! */
duplicate_count_by_type[type]++;
return 1;
} }


if (last && last->data && last->depth < max_depth) { if (last && last->data && last->depth < max_depth) {
@ -2021,6 +2027,7 @@ static void import_marks(const char *input_file)
e = insert_object(sha1); e = insert_object(sha1);
e->type = type; e->type = type;
e->pack_id = MAX_PACK_ID; e->pack_id = MAX_PACK_ID;
e->offset = 1; /* just not zero! */
} }
insert_mark(mark, e); insert_mark(mark, e);
} }
@ -2086,6 +2093,7 @@ int main(int argc, const char **argv)
if (i != argc) if (i != argc)
usage(fast_import_usage); usage(fast_import_usage);


prepare_packed_git();
start_packfile(); start_packfile();
for (;;) { for (;;) {
read_next_command(); read_next_command();