mirror of
https://github.com/git/git
synced 2024-08-27 11:39:22 +00:00
git-verify-pack: insist on .idx extension
git-verify-pack can be called with a filename without .idx extension. add_packed_git() on the other hand depends on its presence. So instead of trying to call it with whatever the user gave us check for that extension and add it if it's missing. That means that you can't name your index file "blah" and your pack file ".pack" anymore ("git-verify-pack blah" currently works in that case). I think this regression is a good change. ;-) Signed-off-by: Rene Scharfe <rene.scharfe@lsrfire.ath.cx> Signed-off-by: Junio C Hamano <junkio@cox.net>
This commit is contained in:
parent
ae9c86f2b6
commit
68f4c78b95
|
@ -18,13 +18,12 @@ static int verify_one_pack(const char *path, int verbose)
|
|||
if (has_extension(arg, len, ".pack")) {
|
||||
strcpy(arg + len - 5, ".idx");
|
||||
len--;
|
||||
} else if (!has_extension(arg, len, ".idx")) {
|
||||
if (len + 4 >= PATH_MAX)
|
||||
return error("name too long: %s.idx", arg);
|
||||
strcpy(arg + len, ".idx");
|
||||
len += 4;
|
||||
}
|
||||
/* Should name foo.idx now */
|
||||
if ((g = add_packed_git(arg, len, 1)))
|
||||
break;
|
||||
/* No? did you name just foo? */
|
||||
strcpy(arg + len, ".idx");
|
||||
len += 4;
|
||||
if ((g = add_packed_git(arg, len, 1)))
|
||||
break;
|
||||
return error("packfile %s not found.", arg);
|
||||
|
|
Loading…
Reference in a new issue