f3bf922409
Nico pointed out that having verify_pack.c and verify-pack.c was confusing. Rename verify_pack.c to pack-check.c as suggested, and enhances the verification done quite a bit. - Built-in sha1_file unpacking knows that a base object of a deltified object _must_ be in the same pack, and takes advantage of that fact. - Earlier verify-pack command only checked the SHA1 sum for the entire pack file and did not look into its contents. It now checks everything idx file claims to have unpacks correctly. - It now has a hook to give more detailed information for objects contained in the pack under -v flag. Signed-off-by: Junio C Hamano <junkio@cox.net> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
58 lines
1.1 KiB
C
58 lines
1.1 KiB
C
#include "cache.h"
|
|
#include "pack.h"
|
|
|
|
static int verify_one_pack(char *arg, int verbose)
|
|
{
|
|
int len = strlen(arg);
|
|
struct packed_git *g;
|
|
|
|
while (1) {
|
|
/* Should name foo.idx, but foo.pack may be named;
|
|
* convert it to foo.idx
|
|
*/
|
|
if (!strcmp(arg + len - 5, ".pack")) {
|
|
strcpy(arg + len - 5, ".idx");
|
|
len--;
|
|
}
|
|
/* Should name foo.idx now */
|
|
if ((g = add_packed_git(arg, len)))
|
|
break;
|
|
/* No? did you name just foo? */
|
|
strcpy(arg + len, ".idx");
|
|
len += 4;
|
|
if ((g = add_packed_git(arg, len)))
|
|
break;
|
|
return error("packfile %s not found.", arg);
|
|
}
|
|
return verify_pack(g, verbose);
|
|
}
|
|
|
|
static const char *verify_pack_usage = "git-verify-pack [-v] <pack>...";
|
|
|
|
int main(int ac, char **av)
|
|
{
|
|
int errs = 0;
|
|
int verbose = 0;
|
|
int no_more_options = 0;
|
|
|
|
while (1 < ac) {
|
|
char path[PATH_MAX];
|
|
|
|
if (!no_more_options && av[1][0] == '-') {
|
|
if (!strcmp("-v", av[1]))
|
|
verbose = 1;
|
|
else if (!strcmp("--", av[1]))
|
|
no_more_options = 1;
|
|
else
|
|
usage(verify_pack_usage);
|
|
}
|
|
else {
|
|
strcpy(path, av[1]);
|
|
if (verify_one_pack(path, verbose))
|
|
errs++;
|
|
}
|
|
ac--; av++;
|
|
}
|
|
return !!errs;
|
|
}
|