mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'np/pack'

Browse Source 
* np/pack:
  pack-objects: get rid of an ugly cast
  make the pack index version configurable

Conflicts:

	builtin-pack-objects.c
This commit is contained in:
Junio C Hamano
2007-11-04 01:11:17 -07:00
parent 2dfffd3e09 79814f425c
commit e091653951
3 changed files with 34 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
index-pack.c
View File

@ -683,6 +683,17 @@ static void final(const char *final_pack_name, const char *curr_pack_name,
}
}
static int git_index_pack_config(const char *k, const char *v)
{
if (!strcmp(k, "pack.indexversion")) {
pack_idx_default_version = git_config_int(k, v);
if (pack_idx_default_version > 2)
die("bad pack.indexversion=%d", pack_idx_default_version);
return 0;
}
return git_default_config(k, v);
}
int main(int argc, char **argv)
{
int i, fix_thin_pack = 0;
@ -693,6 +704,8 @@ int main(int argc, char **argv)
struct pack_idx_entry **idx_objects;
unsigned char sha1[20];
git_config(git_index_pack_config);
for (i = 1; i < argc; i++) {
char *arg = argv[i];