Merge branch 'jc/merge-bases-paint-fix'

diff --git a/builtin/prune.c b/builtin/prune.c
index 9a03d24dadaaba8bc1fc0c778dbfe33b1651607e..8cb8b9186a3a268630680e4b224d3767017e1e38 100644 (file)
--- a/builtin/prune.c
+++ b/builtin/prune.c
@@ -169,7 +169,7 @@ int cmd_prune(int argc, const char **argv, const char *prefix)
 
        prune_packed_objects(show_only);
        remove_temporary_files(get_object_directory());
-       s = xstrdup(mkpath("%s/pack", get_object_directory()));
+       s = mkpathdup("%s/pack", get_object_directory());
        remove_temporary_files(s);
        free(s);
        return 0;