Subject: Re: [PATCH] repack: call prune_packed_objects() and update_server_info() directly

From: Stefan Beller <[email-masked]>
Date: Sat, 13 Sep 2014 10:59:03 +0200

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 <[email-masked]>

Thanks for cleaning up the literal rewrite of the shell script
and making it look more like a C program.

Reviewed-by: Stefan Beller <[email-masked]>

> ---
>  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);
>