builtin/repack.c: provide pack locations to `generated_pack_install()`

Repeat what was done in the preceding commit for the
`generated_pack_install()` function, which needs both "packdir" and
"packtmp".

(As an aside, it is somewhat unfortunate that the final three parameters
to this function are all "const char *", making errors like passing
"packdir" and "packtmp" in the wrong order easy. We could define a new
structure here, but that may be too heavy-handed.)

Signed-off-by: Taylor Blau <me@ttaylorr.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/builtin/repack.c b/builtin/repack.c
index bed902addefcfd99488f9c5e45371ff2c9806e8b..966db27613e37d11503f164b8f9644caf99af529 100644 (file)
--- a/builtin/repack.c
+++ b/builtin/repack.c
@@ -185,7 +185,8 @@ static int generated_pack_has_ext(const struct generated_pack *pack,
 }
 
 static void generated_pack_install(struct generated_pack *pack,
-                                  const char *name)
+                                  const char *name,
+                                  const char *packdir, const char *packtmp)
 {
        int ext;
        for (ext = 0; ext < ARRAY_SIZE(exts); ext++) {
@@ -1468,7 +1469,8 @@ int cmd_repack(int argc,
         * Ok we have prepared all new packfiles.
         */
        for_each_string_list_item(item, &names)
-               generated_pack_install(item->util, item->string);
+               generated_pack_install(item->util, item->string, packdir,
+                                      packtmp);
        /* End of pack replacement. */
 
        if (delete_redundant && pack_everything & ALL_INTO_ONE)