summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichał Kiedrowicz <michal.kiedrowicz@gmail.com>2012-02-25 09:16:09 +0100
committerJunio C Hamano <gitster@pobox.com>2012-02-26 17:46:00 -0800
commit2b34e486bc0ce1aabaa024ca97e8b005d9bc53ed (patch)
treee350baff8f8efcb7c12e24a75d3f073c1540f2c7
parent80809062452a65146d73ae483415acbc737fabf1 (diff)
downloadgit-2b34e486bc0ce1aabaa024ca97e8b005d9bc53ed.tar.gz
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>
-rw-r--r--builtin/pack-objects.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/builtin/pack-objects.c b/builtin/pack-objects.c
index e21e5af8f9..7b07c092cc 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;