From: Jeff King Date: Tue, 26 Feb 2008 09:33:01 GMT Subject: Re: [PATCH] pack-objects: Print a message describing the number of threads for packing Message-ID: <20080226093300.GA5812@coredump.intra.peff.net> In-Reply-To: <7vablo848d.fsf@gitster.siamese.dyndns.org> On Tue, Feb 26, 2008 at 01:19:14AM -0800, Junio C Hamano wrote: > But now you mention it, I tend to agree with you. This is > primarily of interest for git developers and I do not think the > end users would care. Maybe under --verbose or --debug option > (but I do not think we have --debug option anywhere). I wrote up a --verbose patch, but it just seemed silly. Who would actually turn it on? How about this instead? -- >8 -- pack-objects: show "using N threads" only when autodetected Every other case is uninteresting, since either: - it is the default of 1, in which case we are always just printing "using 1 thread" - it is whatever the user set it to, in which case they already know But with --threads=0, they might want to be informed of the number of CPUs detected. --- If we ever change the default to autodetect, this logic might change, but we can deal with that then. BTW, I seem to remember some work recently on coalescing hunks in merge conflicts separated by a small number of lines. It seems to me that the diff below would be easier to read with a similar tactic. builtin-pack-objects.c | 9 +++++---- 1 files changed, 5 insertions(+), 4 deletions(-) diff --git a/builtin-pack-objects.c b/builtin-pack-objects.c index b70b2e5..516eb24 100644 --- a/builtin-pack-objects.c +++ b/builtin-pack-objects.c @@ -2236,11 +2236,12 @@ int cmd_pack_objects(int argc, const char **argv, const char *prefix) die("--thin cannot be used to build an indexable pack."); #ifdef THREADED_DELTA_SEARCH - if (!delta_search_threads) /* --threads=0 means autodetect */ + if (!delta_search_threads) { /* --threads=0 means autodetect */ delta_search_threads = online_cpus(); - if (progress) - fprintf(stderr, "Using %d pack threads.\n", - delta_search_threads); + if (progress) + fprintf(stderr, "Using %d pack threads.\n", + delta_search_threads); + } #endif prepare_packed_git(); -- 1.5.4.3.340.gda2e.dirty