@matheusbsbs / matheus-bagliano / commits / 9d7fbfd204

repack.c: rename and unlink pack file if it exists

When a repo was fully repacked, and is repacked again, we may run into the situation that "new" packfiles have the same name as already existing ones (traditionally packfiles have been named after the list of names of objects in them, so repacking all the objects in a single pack would have produced a packfile with the same name). The logic is to rename the existing ones into filename like "old-XXX", create the new ones and then remove the "old-" ones. When something went wrong in the middle, this sequence is rolled back by renaming the "old-" files back. The renaming into "old-" did not work as intended, because file_exists() was done on "XXX", not "pack-XXX". Also when rolling back the change, the code tried to rename "old-pack-XXX" but the saved ones are named "old-XXX", so this couldn't have worked. Signed-off-by: Torsten Bögershausen <tboegi@web.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>

Torsten Bögershausen committed Feb 2, 2014 at 16:09 UTC 9d7fbfd20422cd23fdb346ac8d609b45b4d37001

1 file changed +2 -2

builtin/repack.c

+2 -2

@@ -260,7 +260,7 @@ int cmd_repack(int argc, const char **argv, const char *prefix)

260 for_each_string_list_item(item, &names) {

261 for (ext = 0; ext < 2; ext++) {

262 char *fname, *fname_old;

263 - fname = mkpathdup("%s/%s%s", packdir,

263 + fname = mkpathdup("%s/pack-%s%s", packdir,

264 item->string, exts[ext]);

265 if (!file_exists(fname)) {

266 free(fname);

@@ -337,7 +337,7 @@ int cmd_repack(int argc, const char **argv, const char *prefix)

337 for_each_string_list_item(item, &names) {

338 for (ext = 0; ext < 2; ext++) {

339 char *fname;

340 - fname = mkpath("%s/old-pack-%s%s",

340 + fname = mkpath("%s/old-%s%s",

341 packdir,

342 item->string,

343 exts[ext]);