Code

pack-objects: Fix compilation with NO_PTHREDS
authorMichał Kiedrowicz <michal.kiedrowicz@gmail.com>
Sat, 25 Feb 2012 08:16:09 +0000 (09:16 +0100)
committerJunio C Hamano <gitster@pobox.com>
Mon, 27 Feb 2012 01:46:00 +0000 (17:46 -0800)
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>
builtin/pack-objects.c

index e21e5af8f9753ada34837df2c5d4c95234c7c00a..7b07c092cc5550d6784531c3137f05f54cfec258 100644 (file)
@@ -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;