Re: [PATCH] pack-objects: Fix compilation with NO_PTHREDS

From: Junio C Hamano <gitster@pobox.com>
Date: Feb 25, 2012, 09:02 UTC
Message-ID: <7vty2fffpp.fsf@alter.siamese.dyndns.org>
In-Reply-To: <1330157769-7884-1-git-send-email-michal.kiedrowicz@gmail.com>

Michał Kiedrowicz <michal.kiedrowicz@gmail.com> writes:

Show 5 quoted lines

> It looks like commit 99fb6e04 (pack-objects: convert to use
> parse_options(), 2012-02-01) moved the #ifdef NO_PTHREDS around but
> hasn't noticed that the 'arg' variable no longer is available.
>
> Signed-off-by: Michał Kiedrowicz <michal.kiedrowicz@gmail.com>

Thanks.  Nguyễn, a quick double-check and an Ack?

Show 17 quoted lines

> ---
>  builtin/pack-objects.c |    2 +-
>  1 files changed, 1 insertions(+), 1 deletions(-)
>
> diff --git a/builtin/pack-objects.c b/builtin/pack-objects.c
> index db09cf7..71af246 100644
> --- a/builtin/pack-objects.c
> +++ b/builtin/pack-objects.c
> @@ -2449,7 +2449,7 @@ int cmd_pack_objects(int argc, const char **argv, const char *prefix)
>  		die("bad pack compression level %d", pack_compression_level);
>  #ifdef NO_PTHREADS
>  	if (delta_search_threads != 1)
> -		warning("no threads support, ignoring %s", arg);
> +		warning("no threads support, ignoring --threads");
>  #endif
>  	if (!pack_to_stdout && !pack_size_limit)
>  		pack_size_limit = pack_size_limit_cfg;