Re: [PATCH v3 2/5] fmt-merge-msg: Make the number of log entries in commit message configurable

From: Ramkumar Ramachandra <artagnon@gmail.com>
Date: Aug 21, 2010, 05:55 UTC
Message-ID: <20100821055556.GI6211@kytes>
In-Reply-To: <20100821035403.GA2474@burratino>

Hi Jonathan,

Jonathan Nieder writes:

Show 21 quoted lines

> Hmm, this seems to be trying to have it both ways.  It would be simpler to
> either:
> 
> 	static int merge_summary;
> 	static int log_limit = 20;
> 
> providing independent internal "enabled" and "limit" knobs, so one could use,
> say,
> 
> 	[merge]
> 		log = 2
> 		log = false
> 		log = true
> 
> with the result being be a log_limit of 2, or
> 
> 	static int log_limit;
> 
> where 0 means disabled, so in that example the result would be a log_limit
> of 20.
>

[...]

> What happened to the merge_summary argument?

This patch is roughly equivalent to my original log_limit patch. Yes, I'm trying to have it both ways in this patch :) merge_summary is set by both the command-line option and the config option, while log_limit is set by the config option. As you noticed, the next patch removes merge_summary.

-- Ram