@matheusbsbs / matheus-bagliano / commits / 9d835df246
Fork 0

Keep track of whether a pack is local or not

If we want to re-pack just local packfiles, we need to know whether a particular object is local or not. Signed-off-by: Linus Torvalds <torvalds@osdl.org> Signed-off-by: Junio C Hamano <junkio@cox.net>

Linus Torvalds committed Oct 13, 2005 at 15:38 UTC 9d835df246e81a6a03e3f633280c45e683e4c673
3 files changed +10 -8
cache.h
+2 -1
@@ -313,6 +313,7 @@ extern struct packed_git {
313 void *pack_base;
314 unsigned int pack_last_used;
315 unsigned int pack_use_cnt;
316 + int pack_local;
317 unsigned char sha1[20];
318 char pack_name[0]; /* something like ".git/objects/pack/xxxxx.pack" */
319 } *packed_git;
@@ -352,7 +353,7 @@ extern struct packed_git *find_sha1_pack(const unsigned char *sha1,
353
354 extern int use_packed_git(struct packed_git *);
355 extern void unuse_packed_git(struct packed_git *);
355 -extern struct packed_git *add_packed_git(char *, int);
356 +extern struct packed_git *add_packed_git(char *, int, int);
357 extern int num_packed_objects(const struct packed_git *p);
358 extern int nth_packed_object_sha1(const struct packed_git *, int, unsigned char*);
359 extern int find_pack_entry_one(const unsigned char *, struct pack_entry *, struct packed_git *);
sha1_file.c
+6 -5
@@ -416,7 +416,7 @@ int use_packed_git(struct packed_git *p)
416 return 0;
417 }
418
419 -struct packed_git *add_packed_git(char *path, int path_len)
419 +struct packed_git *add_packed_git(char *path, int path_len, int local)
420 {
421 struct stat st;
422 struct packed_git *p;
@@ -444,6 +444,7 @@ struct packed_git *add_packed_git(char *path, int path_len)
444 p->pack_base = NULL;
445 p->pack_last_used = 0;
446 p->pack_use_cnt = 0;
447 + p->pack_local = local;
448 return p;
449 }
450
@@ -484,7 +485,7 @@ void install_packed_git(struct packed_git *pack)
485 packed_git = pack;
486 }
487
487 -static void prepare_packed_git_one(char *objdir)
488 +static void prepare_packed_git_one(char *objdir, int local)
489 {
490 char path[PATH_MAX];
491 int len;
@@ -506,7 +507,7 @@ static void prepare_packed_git_one(char *objdir)
507
508 /* we have .idx. Is it a file we can map? */
509 strcpy(path + len, de->d_name);
509 - p = add_packed_git(path, len + namelen);
510 + p = add_packed_git(path, len + namelen, local);
511 if (!p)
512 continue;
513 p->next = packed_git;
@@ -522,11 +523,11 @@ void prepare_packed_git(void)
523
524 if (run_once)
525 return;
525 - prepare_packed_git_one(get_object_directory());
526 + prepare_packed_git_one(get_object_directory(), 1);
527 prepare_alt_odb();
528 for (alt = alt_odb_list; alt; alt = alt->next) {
529 alt->name[0] = 0;
529 - prepare_packed_git_one(alt->base);
530 + prepare_packed_git_one(alt->base, 0);
531 }
532 run_once = 1;
533 }
verify-pack.c
+2 -2
@@ -15,12 +15,12 @@ static int verify_one_pack(char *arg, int verbose)
15 len--;
16 }
17 /* Should name foo.idx now */
18 - if ((g = add_packed_git(arg, len)))
18 + if ((g = add_packed_git(arg, len, 1)))
19 break;
20 /* No? did you name just foo? */
21 strcpy(arg + len, ".idx");
22 len += 4;
23 - if ((g = add_packed_git(arg, len)))
23 + if ((g = add_packed_git(arg, len, 1)))
24 break;
25 return error("packfile %s not found.", arg);
26 }