All of lore.kernel.org
 help / color / mirror / Atom feed
* [PATCH] pack-objects: Fix compilation with NO_PTHREDS
@ 2012-02-25  8:16 Michał Kiedrowicz
  2012-02-25  9:02 ` Junio C Hamano
  0 siblings, 1 reply; 3+ messages in thread
From: Michał Kiedrowicz @ 2012-02-25  8:16 UTC (permalink / raw)
  To: git; +Cc: Nguyễn Thái Ngọc Duy, Michał Kiedrowicz

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

^ permalink raw reply related	[flat|nested] 3+ messages in thread

* Re: [PATCH] pack-objects: Fix compilation with NO_PTHREDS
  2012-02-25  8:16 [PATCH] pack-objects: Fix compilation with NO_PTHREDS Michał Kiedrowicz
@ 2012-02-25  9:02 ` Junio C Hamano
  2012-02-25  9:24   ` Nguyen Thai Ngoc Duy
  0 siblings, 1 reply; 3+ messages in thread
From: Junio C Hamano @ 2012-02-25  9:02 UTC (permalink / raw)
  To: Michał Kiedrowicz; +Cc: git, Nguyễn Thái Ngọc Duy

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

> 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?

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

^ permalink raw reply	[flat|nested] 3+ messages in thread

* Re: [PATCH] pack-objects: Fix compilation with NO_PTHREDS
  2012-02-25  9:02 ` Junio C Hamano
@ 2012-02-25  9:24   ` Nguyen Thai Ngoc Duy
  0 siblings, 0 replies; 3+ messages in thread
From: Nguyen Thai Ngoc Duy @ 2012-02-25  9:24 UTC (permalink / raw)
  To: Junio C Hamano; +Cc: Michał Kiedrowicz, git

2012/2/25 Junio C Hamano <gitster@pobox.com>:
> Michał Kiedrowicz <michal.kiedrowicz@gmail.com> writes:
>
>> 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?

Tested and acked.
-- 
Duy

^ permalink raw reply	[flat|nested] 3+ messages in thread

end of thread, other threads:[~2012-02-25  9:25 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-02-25  8:16 [PATCH] pack-objects: Fix compilation with NO_PTHREDS Michał Kiedrowicz
2012-02-25  9:02 ` Junio C Hamano
2012-02-25  9:24   ` Nguyen Thai Ngoc Duy

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.