From: Michał Kiedrowicz <michal.kiedrowicz@gmail.com>
Date: Sat, 25 Feb 2012 08:16:09 +0000 (+0100)
Subject: pack-objects: Fix compilation with NO_PTHREDS
X-Git-Tag: v1.7.10-rc0~48
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=2b34e486bc0ce1aabaa024ca97e8b005d9bc53ed;p=git.git

pack-objects: Fix compilation with NO_PTHREDS

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>
Acked-by: Nguyen Thai Ngoc Duy <pclouds@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
---

diff --git a/builtin/pack-objects.c b/builtin/pack-objects.c
index e21e5af8f..7b07c092c 100644
--- a/builtin/pack-objects.c
+++ b/builtin/pack-objects.c
@@ -2451,7 +2451,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;