From: Stefan Beller <stefanbeller@gmail.com>
To: "René Scharfe" <l.s.r@web.de>, "Git Mailing List" <git@vger.kernel.org>
Cc: Junio C Hamano <gitster@pobox.com>
Subject: Re: [PATCH] repack: call prune_packed_objects() and update_server_info() directly
Date: Sat, 13 Sep 2014 10:59:03 +0200 [thread overview]
Message-ID: <54140757.4010300@gmail.com> (raw)
In-Reply-To: <5413F201.8030005@web.de>
On 13.09.2014 09:28, René Scharfe wrote:
> Call the functions behind git prune-packed and git update-server-info
> directly instead of using run_command(). This is shorter, easier and
> quicker.
>
> Signed-off-by: Rene Scharfe <l.s.r@web.de>
Thanks for cleaning up the literal rewrite of the shell script
and making it look more like a C program.
Reviewed-by: Stefan Beller <stefanbeller@gmail.com>
> ---
> builtin/repack.c | 23 ++++++-----------------
> 1 file changed, 6 insertions(+), 17 deletions(-)
>
> diff --git a/builtin/repack.c b/builtin/repack.c
> index fc088db..2aae05d 100644
> --- a/builtin/repack.c
> +++ b/builtin/repack.c
> @@ -377,6 +377,7 @@ int cmd_repack(int argc, const char **argv, const char *prefix)
> /* End of pack replacement. */
>
> if (delete_redundant) {
> + int opts = 0;
> sort_string_list(&names);
> for_each_string_list_item(item, &existing_packs) {
> char *sha1;
> @@ -387,25 +388,13 @@ int cmd_repack(int argc, const char **argv, const char *prefix)
> if (!string_list_has_string(&names, sha1))
> remove_redundant_pack(packdir, item->string);
> }
> - argv_array_push(&cmd_args, "prune-packed");
> - if (quiet)
> - argv_array_push(&cmd_args, "--quiet");
> -
> - memset(&cmd, 0, sizeof(cmd));
> - cmd.argv = cmd_args.argv;
> - cmd.git_cmd = 1;
> - run_command(&cmd);
> - argv_array_clear(&cmd_args);
> + if (!quiet && isatty(2))
> + opts |= PRUNE_PACKED_VERBOSE;
> + prune_packed_objects(opts);
> }
>
> - if (!no_update_server_info) {
> - argv_array_push(&cmd_args, "update-server-info");
> - memset(&cmd, 0, sizeof(cmd));
> - cmd.argv = cmd_args.argv;
> - cmd.git_cmd = 1;
> - run_command(&cmd);
> - argv_array_clear(&cmd_args);
> - }
> + if (!no_update_server_info)
> + update_server_info(0);
> remove_temporary_files();
> string_list_clear(&names, 0);
> string_list_clear(&rollback, 0);
>
next prev parent reply other threads:[~2014-09-13 8:59 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-09-13 7:28 [PATCH] repack: call prune_packed_objects() and update_server_info() directly René Scharfe
2014-09-13 8:59 ` Stefan Beller [this message]
2014-09-13 20:15 ` Jeff King
2014-09-13 20:16 ` [PATCH 1/3] prune-packed: fix minor memory leak Jeff King
2014-09-13 20:19 ` [PATCH 2/3] make update-server-info more robust Jeff King
2014-09-14 17:38 ` René Scharfe
2014-09-15 18:39 ` Junio C Hamano
2014-09-15 23:56 ` Jeff King
2014-09-13 20:19 ` [PATCH 3/3] server-info: clean up after writing info/packs Jeff King
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=54140757.4010300@gmail.com \
--to=stefanbeller@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=l.s.r@web.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).